> LONG_COMPATIBLE_CLASSES = new HashSet<>(Arrays.asList(
Long.class, Integer.class, Short.class, Byte.class));
@@ -78,8 +79,6 @@ public void setDataStorageFromInt(@Nonnegative int storage) {
this.storage = state;
}
- @Since("1.4.0.0-PN")
- @PowerNukkitOnly
@Override
@API(definition = INTERNAL, usage = INCUBATING)
void setDataStorageWithoutValidation(Number storage) {
@@ -90,6 +89,7 @@ void setDataStorageWithoutValidation(Number storage) {
}
}
+ @PowerNukkitOnly
@Override
public void validate() {
validate(storage);
@@ -123,6 +123,7 @@ private void validate(BigInteger state) {
@Deprecated
@DeprecationDetails(reason = "Can't store all data, exists for backward compatibility reasons", since = "1.4.0.0-PN", replaceWith = "getDataStorage()")
@Override
+ @PowerNukkitOnly
public int getLegacyDamage() {
return storage.and(BigInteger.valueOf(Block.DATA_MASK)).intValue();
}
@@ -131,6 +132,7 @@ public int getLegacyDamage() {
@Deprecated
@DeprecationDetails(reason = "Can't store all data, exists for backward compatibility reasons", since = "1.4.0.0-PN", replaceWith = "getDataStorage()")
@Override
+ @PowerNukkitOnly
public int getBigDamage() {
return storage.and(BigInteger.valueOf(BlockStateRegistry.BIG_META_MASK)).intValue();
}
@@ -154,6 +156,7 @@ public BigInteger getHugeDamage() {
return storage;
}
+ @PowerNukkitOnly
@Nonnegative
@Nonnull
@Override
@@ -191,15 +194,18 @@ public void setIntValue(String propertyName, int value) {
@Nonnull
@Override
+ @PowerNukkitOnly
public Serializable getPropertyValue(String propertyName) {
return properties.getValue(storage, propertyName);
}
+ @PowerNukkitOnly
@Override
public int getIntValue(String propertyName) {
return properties.getIntValue(storage, propertyName);
}
+ @PowerNukkitOnly
@Override
public boolean getBooleanValue(String propertyName) {
return properties.getBooleanValue(storage, propertyName);
@@ -211,10 +217,12 @@ public boolean getBooleanValue(String propertyName) {
*/
@Nonnull
@Override
+ @PowerNukkitOnly
public String getPersistenceValue(String propertyName) {
return properties.getPersistenceValue(storage, propertyName);
}
+ @PowerNukkitOnly
@Nonnull
@Override
public BlockState getCurrentState() {
@@ -228,6 +236,7 @@ public int getExactIntStorage() {
return storage.intValueExact();
}
+ @PowerNukkitOnly
@Nonnull
@Override
public BigIntegerMutableBlockState copy() {
diff --git a/src/main/java/cn/nukkit/blockstate/BlockState.java b/src/main/java/cn/nukkit/blockstate/BlockState.java
index 5cf42cdaad8..20caf6c9bba 100644
--- a/src/main/java/cn/nukkit/blockstate/BlockState.java
+++ b/src/main/java/cn/nukkit/blockstate/BlockState.java
@@ -154,8 +154,86 @@ public static BlockState of(@Nonnegative int blockId, @Nonnegative Number blockD
throw new InvalidBlockStateDataTypeException(blockData);
}
}
+
+ /**
+ * Returns the {@link BlockState} object that represents the given {@code persistedStateId}.
+ *
+ *
Same as {@code of(persistedStateid, true}.
+ *
+ * @param persistedStateId Must follow the same syntax returned by {@link #getStateId()} or {@link #getLegacyStateId()}
+ * @throws InvalidBlockPropertyValueException If any property value in the given {@code persistedStateId} is not valid for the state.
+ *
+ * @return The block state, never null
+ */
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ @Nonnull
+ public static BlockState of(@Nonnull String persistedStateId) {
+ return of(persistedStateId, true);
+ }
+
+ /**
+ * Returns the {@link BlockState} object that represents the given {@code persistedStateId}.
+ *
+ * @param persistedStateId Must follow the same syntax returned by {@link #getStateId()} or {@link #getLegacyStateId()}
+ * @param useDefaultPropertyValues When {@code true}, the default value will be used for any missing {@link BlockProperty}
+ * in {@code persistedStateId}.
+ * @throws IllegalArgumentException If {@code useDefaultPropertyValues} is false and there are missing properties
+ * @throws InvalidBlockPropertyValueException If any property value in the given {@code persistedStateId} is not valid for the state.
+ * @throws NoSuchElementException If there are no block registered with the given id.
+ *
+ * @return The block state, never null
+ */
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ @Nonnull
+ public static BlockState of(@Nonnull String persistedStateId, boolean useDefaultPropertyValues) {
+ String[] stateParts = persistedStateId.split(";");
+ String namespacedId = stateParts[0];
+ int id = Optional.ofNullable(BlockStateRegistry.getBlockId(namespacedId))
+ .map(OptionalInt::of)
+ .orElse(OptionalInt.empty())
+ .orElseThrow(()-> new NoSuchElementException("Block " + namespacedId + " not found."));
+
+ // Fast path
+ BlockState state = BlockState.of(id);
+ if (stateParts.length == 1 && useDefaultPropertyValues) {
+ return state;
+ }
+
+ if (stateParts.length == 2 && (stateParts[1].startsWith("nukkit-unknown=") || stateParts[1].startsWith("unknown="))) {
+ BigInteger damage = new BigInteger(stateParts[1].split("=", 2)[1]);
+ return BlockState.of(id, damage);
+ }
+
+ if (stateParts.length == 1 && state.getPropertyNames().isEmpty()) {
+ return state;
+ }
+
+ if (useDefaultPropertyValues) {
+ for (int i = 1; i < stateParts.length; i++) {
+ String[] propertyKeyValue = stateParts[i].split("=", 2);
+ state = state.withProperty(propertyKeyValue[0], propertyKeyValue[1]);
+ }
+ return state;
+ } else {
+ Set defined = new LinkedHashSet<>();
+ Set needed = new LinkedHashSet<>(state.getPropertyNames());
+ for (int i = 1; i < stateParts.length; i++) {
+ String[] propertyKeyValue = stateParts[i].split("=", 2);
+ state = state.withProperty(propertyKeyValue[0], propertyKeyValue[1]);
+ defined.add(propertyKeyValue[0]);
+ }
+ needed.removeAll(defined);
+ if (needed.isEmpty()) {
+ return state;
+ }
+ throw new IllegalArgumentException(
+ "The state id " + persistedStateId + " is missing the following properties: " + needed
+ );
+ }
+ }
- @Getter
@Nonnegative
private final int blockId;
@@ -218,6 +296,14 @@ private BlockState(@Nonnegative int blockId, @Nonnegative BigInteger blockData)
}
}
+ @PowerNukkitOnly
+ @Since("1.4.0.0-PN")
+ @Nonnegative
+ @Override
+ public int getBlockId() {
+ return blockId;
+ }
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
@Nonnull
@@ -397,12 +483,14 @@ public ItemBlock asItemBlock(int count) {
@Nonnegative
@Nonnull
@Override
+ @PowerNukkitOnly
public Number getDataStorage() {
return storage.getNumber();
}
@Nonnull
@Override
+ @PowerNukkitOnly
public BlockProperties getProperties() {
return BlockStateRegistry.getProperties(blockId);
}
@@ -411,6 +499,7 @@ public BlockProperties getProperties() {
@Deprecated
@DeprecationDetails(reason = "Can't store all data, exists for backward compatibility reasons", since = "1.4.0.0-PN", replaceWith = "getDataStorage()")
@Override
+ @PowerNukkitOnly
public int getLegacyDamage() {
return storage.getLegacyDamage();
}
@@ -418,6 +507,7 @@ public int getLegacyDamage() {
@Unsigned
@Deprecated
@DeprecationDetails(reason = "Can't store all data, exists for backward compatibility reasons", since = "1.4.0.0-PN", replaceWith = "getDataStorage()")
+ @PowerNukkitOnly
@Override
public int getBigDamage() {
return storage.getBigDamage();
@@ -444,15 +534,18 @@ public BigInteger getHugeDamage() {
@Nonnull
@Override
+ @PowerNukkitOnly
public Serializable getPropertyValue(String propertyName) {
return storage.getPropertyValue(getProperties(), propertyName);
}
@Override
+ @PowerNukkitOnly
public int getIntValue(String propertyName) {
return storage.getIntValue(getProperties(), propertyName);
}
+ @PowerNukkitOnly
@Override
public boolean getBooleanValue(String propertyName) {
return storage.getBooleanValue(getProperties(), propertyName);
@@ -460,16 +553,19 @@ public boolean getBooleanValue(String propertyName) {
@Nonnull
@Override
+ @PowerNukkitOnly
public String getPersistenceValue(String propertyName) {
return storage.getPersistenceValue(getProperties(), propertyName);
}
@Nonnull
@Override
+ @PowerNukkitOnly
public BlockState getCurrentState() {
return this;
}
+ @PowerNukkitOnly
@Override
public int getBitSize() {
return storage.getBitSize();
@@ -497,7 +593,7 @@ public boolean isDefaultState() {
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(@Nullable Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
@@ -580,6 +676,7 @@ public OptionalBoolean getCachedValidation() {
@Nonnull
@Override
+ @PowerNukkitOnly
public Block getBlock() {
try {
Block block = IBlockState.super.getBlock();
@@ -593,6 +690,7 @@ public Block getBlock() {
@Nonnull
@Override
+ @PowerNukkitOnly
public Block getBlock(@Nullable Level level, int x, int y, int z, int layer, boolean repair, @Nullable Consumer callback) {
if (valid == OptionalBoolean.TRUE) {
Block block = IBlockState.super.getBlock();
diff --git a/src/main/java/cn/nukkit/blockstate/BlockStateRegistry.java b/src/main/java/cn/nukkit/blockstate/BlockStateRegistry.java
index 0a555fd04c6..8010780454a 100644
--- a/src/main/java/cn/nukkit/blockstate/BlockStateRegistry.java
+++ b/src/main/java/cn/nukkit/blockstate/BlockStateRegistry.java
@@ -8,6 +8,7 @@
import cn.nukkit.block.BlockID;
import cn.nukkit.block.BlockUnknown;
import cn.nukkit.blockproperty.BlockProperties;
+import cn.nukkit.blockproperty.exception.BlockPropertyNotFoundException;
import cn.nukkit.blockstate.exception.InvalidBlockStateException;
import cn.nukkit.nbt.NBTIO;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -15,6 +16,7 @@
import cn.nukkit.utils.BinaryStream;
import cn.nukkit.utils.HumanStringComparator;
import com.google.common.base.Preconditions;
+import io.netty.util.internal.EmptyArrays;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import lombok.AllArgsConstructor;
@@ -58,6 +60,8 @@ public class BlockStateRegistry {
private final byte[] blockPaletteBytes;
+ private final List knownStateIds;
+
//
static {
@@ -95,6 +99,7 @@ public class BlockStateRegistry {
//
List tags = new ArrayList<>();
+ List loadingKnownStateIds = new ArrayList<>();
try (InputStream stream = Server.class.getClassLoader().getResourceAsStream("canonical_block_states.nbt")) {
if (stream == null) {
throw new AssertionError("Unable to locate block state nbt");
@@ -107,14 +112,18 @@ public class BlockStateRegistry {
tag.putInt("runtimeId", runtimeId++);
tag.putInt("blockId", persistenceNameToBlockId.getOrDefault(tag.getString("name").toLowerCase(), -1));
tags.add(tag);
+ loadingKnownStateIds.add(getStateId(tag));
}
}
+ knownStateIds = Arrays.asList(loadingKnownStateIds.toArray(EmptyArrays.EMPTY_STRINGS));
} catch (IOException e) {
throw new AssertionError(e);
}
//
Integer infoUpdateRuntimeId = null;
-
+
+ Set warned = new HashSet<>();
+
for (CompoundTag state : tags) {
int blockId = state.getInt("blockId");
int runtimeId = state.getInt("runtimeId");
@@ -128,6 +137,11 @@ public class BlockStateRegistry {
if (isNameOwnerOfId(name, blockId)) {
registerPersistenceName(blockId, name);
registerStateId(state, runtimeId);
+ } else if (blockId == -1) {
+ if (warned.add(name)) {
+ log.warn("Unknown block id for the block named {}", name);
+ }
+ registerStateId(state, runtimeId);
}
}
@@ -145,9 +159,9 @@ public class BlockStateRegistry {
}
//
-
+
private boolean isNameOwnerOfId(String name, int blockId) {
- return !name.equals("minecraft:wood") || blockId == BlockID.WOOD_BARK;
+ return blockId != -1 && !name.equals("minecraft:wood") || blockId == BlockID.WOOD_BARK;
}
@Nonnull
@@ -169,6 +183,33 @@ private static Registration findRegistrationByRuntimeId(int runtimeId) {
return runtimeIdRegistration.get(runtimeId);
}
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ @Nullable
+ public String getKnownBlockStateIdByRuntimeId(int runtimeId) {
+ if (runtimeId >= 0 && runtimeId < knownStateIds.size()) {
+ return knownStateIds.get(runtimeId);
+ }
+ return null;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public int getKnownRuntimeIdByBlockStateId(String stateId) {
+ int result = knownStateIds.indexOf(stateId);
+ if (result != -1) {
+ return result;
+ }
+ BlockState state;
+ try {
+ state = BlockState.of(stateId);
+ } catch (NoSuchElementException|IllegalStateException|IllegalArgumentException ignored) {
+ return -1;
+ }
+ String fullStateId = state.getStateId();
+ return knownStateIds.indexOf(fullStateId);
+ }
+
/**
* @return {@code null} if the runtime id does not matches any known block state.
*/
@@ -213,10 +254,61 @@ private BlockState buildStateFromCompound(CompoundTag block) {
return state;
}
+ private static NoSuchElementException runtimeIdNotRegistered(int runtimeId) {
+ return new NoSuchElementException("The block id for the runtime id "+runtimeId+" is not registered");
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public int getBlockIdByRuntimeId(int runtimeId) {
+ Registration registration = findRegistrationByRuntimeId(runtimeId);
+ if (registration == null) {
+ throw runtimeIdNotRegistered(runtimeId);
+ }
+ BlockState state = registration.state;
+ if (state != null) {
+ return state.getBlockId();
+ }
+ CompoundTag originalBlock = registration.originalBlock;
+ if (originalBlock == null) {
+ throw runtimeIdNotRegistered(runtimeId);
+ }
+ try {
+ state = buildStateFromCompound(originalBlock);
+ } catch (BlockPropertyNotFoundException e) {
+ String name = originalBlock.getString("name").toLowerCase(Locale.ENGLISH);
+ Integer id = getBlockId(name);
+ if (id == null) {
+ throw runtimeIdNotRegistered(runtimeId);
+ }
+ return id;
+ }
+ if (state != null) {
+ registration.state = state;
+ registration.originalBlock = null;
+ } else {
+ throw runtimeIdNotRegistered(runtimeId);
+ }
+ return state.getBlockId();
+ }
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getRuntimeId(BlockState state) {
- return getRegistration(state).runtimeId;
+ return getRegistration(convertToNewState(state)).runtimeId;
+ }
+
+ private BlockState convertToNewState(BlockState oldState) {
+ // Check OldWoodBarkUpdater.java and https://minecraft.fandom.com/wiki/Log#Metadata
+ // The Only bark variant is replaced in the client side to minecraft:wood with the same wood type
+ if (oldState.getBitSize() == 4 && (oldState.getBlockId() == BlockID.LOG || oldState.getBlockId() == BlockID.LOG2)) {
+ int exactInt = oldState.getExactIntStorage();
+ if ((exactInt & 0b1100) == 0b1100) {
+ int increment = oldState.getBlockId() == BlockID.LOG ? 0b000 : 0b100;
+ return BlockState.of(BlockID.WOOD_BARK, (exactInt & 0b11) + increment);
+ }
+ }
+ return oldState;
}
private Registration getRegistration(BlockState state) {
@@ -413,7 +505,7 @@ public void copyBlockPaletteBytes(byte[] target, int targetIndex) {
public BlockProperties getProperties(int blockId) {
int fullId = blockId << Block.DATA_BITS;
Block block;
- if (fullId >= Block.fullList.length || (block = Block.fullList[fullId]) == null) {
+ if (fullId >= Block.fullList.length || fullId < 0 || (block = Block.fullList[fullId]) == null) {
return BlockUnknown.PROPERTIES;
}
return block.getProperties();
diff --git a/src/main/java/cn/nukkit/blockstate/BlockStateRepair.java b/src/main/java/cn/nukkit/blockstate/BlockStateRepair.java
index 8ff784d484b..2b0edf28971 100644
--- a/src/main/java/cn/nukkit/blockstate/BlockStateRepair.java
+++ b/src/main/java/cn/nukkit/blockstate/BlockStateRepair.java
@@ -5,6 +5,8 @@
import cn.nukkit.blockproperty.BlockProperties;
import cn.nukkit.blockproperty.BlockProperty;
import cn.nukkit.blockproperty.exception.InvalidBlockPropertyException;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
import lombok.Value;
import lombok.experimental.NonFinal;
@@ -18,6 +20,8 @@
@PowerNukkitOnly
@Since("1.4.0.0-PN")
@Value
+@AllArgsConstructor(onConstructor = @__(@PowerNukkitOnly))
+@Getter(onMethod = @__(@PowerNukkitOnly))
public class BlockStateRepair {
/**
* The block ID of the block state that is being repaired.
diff --git a/src/main/java/cn/nukkit/blockstate/ByteMutableBlockState.java b/src/main/java/cn/nukkit/blockstate/ByteMutableBlockState.java
index 3cc5487725b..37240c2404a 100644
--- a/src/main/java/cn/nukkit/blockstate/ByteMutableBlockState.java
+++ b/src/main/java/cn/nukkit/blockstate/ByteMutableBlockState.java
@@ -66,6 +66,7 @@ public ByteMutableBlockState(int blockId, BlockProperties properties) {
this(blockId, properties, (byte)0);
}
+ @PowerNukkitOnly
@Nonnegative
@Deprecated
@DeprecationDetails(reason = "Can't store all data, exists for backward compatibility reasons", since = "1.4.0.0-PN", replaceWith = "getDataStorage()")
@@ -78,6 +79,7 @@ public int getLegacyDamage() {
@Deprecated
@DeprecationDetails(reason = "Can't store all data, exists for backward compatibility reasons", since = "1.4.0.0-PN", replaceWith = "getDataStorage()")
@Override
+ @PowerNukkitOnly
public int getBigDamage() {
return storage;
}
@@ -94,6 +96,7 @@ public BigInteger getHugeDamage() {
@Nonnegative
@Nonnull
@Override
+ @PowerNukkitOnly
public Byte getDataStorage() {
return storage;
}
@@ -132,14 +135,13 @@ public void setDataStorageFromInt(@Nonnegative int storage) {
this.storage = (byte)storage;
}
- @Since("1.4.0.0-PN")
- @PowerNukkitOnly
@Override
@API(definition = INTERNAL, usage = INCUBATING)
void setDataStorageWithoutValidation(Number storage) {
this.storage = storage.byteValue();
}
+ @PowerNukkitOnly
@Override
public void validate() {
validate(storage);
@@ -197,28 +199,33 @@ public void setIntValue(String propertyName, int value) {
storage = (byte)properties.setIntValue(storage, propertyName, value);
}
+ @PowerNukkitOnly
@Nonnull
@Override
public Serializable getPropertyValue(String propertyName) {
return properties.getValue(storage, propertyName);
}
+ @PowerNukkitOnly
@Override
public int getIntValue(String propertyName) {
return properties.getIntValue(storage, propertyName);
}
+ @PowerNukkitOnly
@Override
public boolean getBooleanValue(String propertyName) {
return properties.getBooleanValue(storage, propertyName);
}
+ @PowerNukkitOnly
@Nonnull
@Override
public String getPersistenceValue(String propertyName) {
return properties.getPersistenceValue(storage, propertyName);
}
+ @PowerNukkitOnly
@Nonnull
@Override
public BlockState getCurrentState() {
@@ -232,6 +239,7 @@ public int getExactIntStorage() {
return storage;
}
+ @PowerNukkitOnly
@Nonnull
@Override
public ByteMutableBlockState copy() {
diff --git a/src/main/java/cn/nukkit/blockstate/IBlockState.java b/src/main/java/cn/nukkit/blockstate/IBlockState.java
index 0b321c58faa..1755372160f 100644
--- a/src/main/java/cn/nukkit/blockstate/IBlockState.java
+++ b/src/main/java/cn/nukkit/blockstate/IBlockState.java
@@ -29,6 +29,7 @@
import java.io.Serializable;
import java.math.BigInteger;
import java.util.*;
+import java.util.AbstractMap.SimpleEntry;
import java.util.function.Consumer;
import static cn.nukkit.blockstate.Loggers.logIBlockState;
@@ -205,6 +206,29 @@ default String getStateId() {
return stateId.toString();
}
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ default String getMinimalistStateId() {
+ if (isDefaultState()) {
+ return getPersistenceName();
+ }
+ BlockProperties properties = getProperties();
+ Map propertyMap = new TreeMap<>(HumanStringComparator.getInstance());
+ try {
+ properties.getNames().stream()
+ .map(name -> new SimpleEntry<>(properties.getBlockProperty(name), getPersistenceValue(name)))
+ .filter(entry -> !entry.getKey().isDefaultPersistentValue(entry.getValue()))
+ .forEach(entry -> propertyMap.put(entry.getKey().getPersistenceName(), entry.getValue()));
+ } catch (InvalidBlockPropertyException e) {
+ logIBlockState.debug("Attempted to get the stateId of an invalid state {}:{}\nProperties: {}", getBlockId(), getDataStorage(), properties, e);
+ return getLegacyStateId();
+ }
+
+ StringBuilder stateId = new StringBuilder(getPersistenceName());
+ propertyMap.forEach((name, value) -> stateId.append(';').append(name).append('=').append(value));
+ return stateId.toString();
+ }
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
@Nonnull
@@ -225,8 +249,7 @@ default String getLegacyStateId() {
@Nonnull
default Block getBlock() {
Block block = Block.get(getBlockId());
- block.setState(this);
- return block;
+ return block.forState(this);
}
/**
@@ -275,8 +298,7 @@ default Block getBlock(@Nullable Level level, int x, int y, int z, int layer, bo
BlockState currentState = getCurrentState();
try {
if (currentState.isCachedValidationValid()) {
- block.setState(currentState);
- return block;
+ return block.forState(currentState);
}
} catch (Exception e) {
logIBlockState.error("Unexpected error while trying to set the cached valid state to the block. State: {}, Block: {}", currentState, block, e);
@@ -420,6 +442,7 @@ default int getFullId() {
return (getBlockId() << Block.DATA_BITS) | (getLegacyDamage() & Block.DATA_MASK);
}
+ @PowerNukkitOnly
@Deprecated
@DeprecationDetails(reason = "Can't store all data, exists for backward compatibility reasons", since = "1.4.0.0-PN", replaceWith = "the BlockState itself")
default long getBigId() {
diff --git a/src/main/java/cn/nukkit/blockstate/IMutableBlockState.java b/src/main/java/cn/nukkit/blockstate/IMutableBlockState.java
index c785f4d41d8..c60fbb3637d 100644
--- a/src/main/java/cn/nukkit/blockstate/IMutableBlockState.java
+++ b/src/main/java/cn/nukkit/blockstate/IMutableBlockState.java
@@ -44,6 +44,28 @@ default void setState(IBlockState state) throws InvalidBlockStateException {
throw new UnsupportedOperationException();
}
}
+
+ /**
+ * Replace all matching states of this block state with the same states of the given block state.
+ * But giving opportunity to return a new instance of this mutable state if needed.
+ *
+ * States that doesn't exists in the other state are ignored.
+ *
Only properties that matches each other will be copied, for example, if this state have an age property
+ * going from 0 to 7 and the other have an age from 0 to 15, the age property won't change.
+ *
If the implementation recognizes that the given state does not match the current set of properties
+ * and needs an update, it may update and return a new state with a different block id and different set
+ * of properties that represent the expected visual state. The this change can be detected with an {@code ==} operation.
+ * @throws UnsupportedOperationException If the state is from a different block id and property copying isn't supported by the implementation
+ * @throws InvalidBlockStateException If the given storage has invalid data properties
+ * @param state The states that will have the properties copied.
+ */
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Nonnull
+ default IMutableBlockState forState(@Nonnull IBlockState state) throws InvalidBlockStateException {
+ setState(state);
+ return this;
+ }
/**
* @throws InvalidBlockStateException If the given storage has invalid data properties
diff --git a/src/main/java/cn/nukkit/blockstate/IntMutableBlockState.java b/src/main/java/cn/nukkit/blockstate/IntMutableBlockState.java
index 69bd9532b6f..e6c13b15561 100644
--- a/src/main/java/cn/nukkit/blockstate/IntMutableBlockState.java
+++ b/src/main/java/cn/nukkit/blockstate/IntMutableBlockState.java
@@ -48,6 +48,7 @@ public IntMutableBlockState(int blockId, BlockProperties properties) {
@Deprecated
@DeprecationDetails(reason = "Can't store all data, exists for backward compatibility reasons", since = "1.4.0.0-PN", replaceWith = "getDataStorage()")
@Override
+ @PowerNukkitOnly
public int getLegacyDamage() {
return storage & Block.DATA_MASK;
}
@@ -56,6 +57,7 @@ public int getLegacyDamage() {
@Deprecated
@DeprecationDetails(reason = "Can't store all data, exists for backward compatibility reasons", since = "1.4.0.0-PN", replaceWith = "getDataStorage()")
@Override
+ @PowerNukkitOnly
public int getBigDamage() {
return storage;
}
@@ -71,6 +73,7 @@ public BigInteger getHugeDamage() {
@Nonnegative
@Nonnull
+ @PowerNukkitOnly
@Override
public Integer getDataStorage() {
return storage;
@@ -109,14 +112,13 @@ public void setDataStorageFromInt(@Nonnegative int storage) {
this.storage = storage;
}
- @Since("1.4.0.0-PN")
- @PowerNukkitOnly
@Override
@API(definition = INTERNAL, usage = INCUBATING)
void setDataStorageWithoutValidation(Number storage) {
this.storage = storage.intValue();
}
+ @PowerNukkitOnly
@Override
public void validate() {
validate(storage);
@@ -169,22 +171,26 @@ public void setIntValue(String propertyName, int value) {
storage = properties.setIntValue(storage, propertyName, value);
}
+ @PowerNukkitOnly
@Nonnull
@Override
public Serializable getPropertyValue(String propertyName) {
return properties.getValue(storage, propertyName);
}
+ @PowerNukkitOnly
@Override
public int getIntValue(String propertyName) {
return properties.getIntValue(storage, propertyName);
}
+ @PowerNukkitOnly
@Override
public boolean getBooleanValue(String propertyName) {
return properties.getBooleanValue(storage, propertyName);
}
+ @PowerNukkitOnly
@Nonnull
@Override
public String getPersistenceValue(String propertyName) {
@@ -193,6 +199,7 @@ public String getPersistenceValue(String propertyName) {
@Nonnull
@Override
+ @PowerNukkitOnly
public BlockState getCurrentState() {
return BlockState.of(blockId, storage);
}
@@ -204,6 +211,7 @@ public int getExactIntStorage() {
return storage;
}
+ @PowerNukkitOnly
@Nonnull
@Override
public IntMutableBlockState copy() {
diff --git a/src/main/java/cn/nukkit/blockstate/LongMutableBlockState.java b/src/main/java/cn/nukkit/blockstate/LongMutableBlockState.java
index e6f38c8eff9..d53df31a76a 100644
--- a/src/main/java/cn/nukkit/blockstate/LongMutableBlockState.java
+++ b/src/main/java/cn/nukkit/blockstate/LongMutableBlockState.java
@@ -74,13 +74,12 @@ public void setDataStorageFromInt(@Nonnegative int storage) {
this.storage = state;
}
- @Since("1.4.0.0-PN")
- @PowerNukkitOnly
@Override
void setDataStorageWithoutValidation(Number storage) {
this.storage = storage.longValue();
}
+ @PowerNukkitOnly
@Override
public void validate() {
validate(storage);
@@ -116,6 +115,7 @@ private void validate(long state) {
@Deprecated
@DeprecationDetails(reason = "Can't store all data, exists for backward compatibility reasons", since = "1.4.0.0-PN", replaceWith = "getDataStorage()")
@Override
+ @PowerNukkitOnly
public int getLegacyDamage() {
return (int) (storage & Block.DATA_MASK);
}
@@ -124,6 +124,7 @@ public int getLegacyDamage() {
@Deprecated
@DeprecationDetails(reason = "Can't store all data, exists for backward compatibility reasons", since = "1.4.0.0-PN", replaceWith = "getDataStorage()")
@Override
+ @PowerNukkitOnly
public int getBigDamage() {
return (int) (storage & BlockStateRegistry.BIG_META_MASK);
}
@@ -150,6 +151,7 @@ public BigInteger getHugeDamage() {
@Nonnegative
@Nonnull
@Override
+ @PowerNukkitOnly
public Number getDataStorage() {
return storage;
}
@@ -182,22 +184,26 @@ public void setIntValue(String propertyName, int value) {
storage = properties.setIntValue(storage, propertyName, value);
}
+ @PowerNukkitOnly
@Nonnull
@Override
public Serializable getPropertyValue(String propertyName) {
return properties.getValue(storage, propertyName);
}
+ @PowerNukkitOnly
@Override
public int getIntValue(String propertyName) {
return properties.getIntValue(storage, propertyName);
}
+ @PowerNukkitOnly
@Override
public boolean getBooleanValue(String propertyName) {
return properties.getBooleanValue(storage, propertyName);
}
+ @PowerNukkitOnly
@Nonnull
@Override
public String getPersistenceValue(String propertyName) {
@@ -206,6 +212,7 @@ public String getPersistenceValue(String propertyName) {
@Nonnull
@Override
+ @PowerNukkitOnly
public BlockState getCurrentState() {
return BlockState.of(blockId, storage);
}
@@ -221,6 +228,7 @@ public int getExactIntStorage() {
return (int) storage;
}
+ @PowerNukkitOnly
@Nonnull
@Override
public LongMutableBlockState copy() {
diff --git a/src/main/java/cn/nukkit/blockstate/MutableBlockState.java b/src/main/java/cn/nukkit/blockstate/MutableBlockState.java
index f496362d179..8a4f93aed92 100644
--- a/src/main/java/cn/nukkit/blockstate/MutableBlockState.java
+++ b/src/main/java/cn/nukkit/blockstate/MutableBlockState.java
@@ -35,8 +35,6 @@ public abstract class MutableBlockState implements IMutableBlockState {
this.properties = properties;
}
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
@API(definition = INTERNAL, usage = INCUBATING)
void setDataStorageWithoutValidation(Number storage) {
setDataStorage(storage);
@@ -57,18 +55,21 @@ public void setState(IBlockState state) throws InvalidBlockStateException {
}
}
+ @PowerNukkitOnly
@Nonnull
@Override
public final BlockProperties getProperties() {
return properties;
}
+ @PowerNukkitOnly
@Nonnegative
@Override
public final int getBlockId() {
return blockId;
}
+ @PowerNukkitOnly
@Override
@Deprecated
@DeprecationDetails(reason = "Can't store all data, exists for backward compatibility reasons", since = "1.4.0.0-PN", replaceWith = "the BlockState itself")
@@ -79,10 +80,12 @@ public final int getFullId() {
@Override
@Deprecated
@DeprecationDetails(reason = "Can't store all data, exists for backward compatibility reasons", since = "1.4.0.0-PN", replaceWith = "the BlockState itself")
+ @PowerNukkitOnly
public final long getBigId() {
return IMutableBlockState.super.getBigId();
}
+ @PowerNukkitOnly
@Override
public final int getBitSize() {
return getProperties().getBitSize();
diff --git a/src/main/java/cn/nukkit/blockstate/ZeroMutableBlockState.java b/src/main/java/cn/nukkit/blockstate/ZeroMutableBlockState.java
index f9263a5a0ef..20537a9926f 100644
--- a/src/main/java/cn/nukkit/blockstate/ZeroMutableBlockState.java
+++ b/src/main/java/cn/nukkit/blockstate/ZeroMutableBlockState.java
@@ -51,13 +51,15 @@ public ZeroMutableBlockState(int blockId, BlockProperties properties) {
state = BlockState.of(blockId);
}
+ @PowerNukkitOnly
@Override
public void validate() {
}
+ @PowerNukkitOnly
@Nonnull
@Override
- public MutableBlockState copy() {
+ public ZeroMutableBlockState copy() {
return this;
}
@@ -137,8 +139,8 @@ public int getLegacyDamage() {
@Unsigned
@Since("1.4.0.0-PN")
- @PowerNukkitOnly
@Override
+ @PowerNukkitOnly
public int getBigDamage() {
return 0;
}
diff --git a/src/main/java/cn/nukkit/command/CapturingCommandSender.java b/src/main/java/cn/nukkit/command/CapturingCommandSender.java
index ce032506817..fdcca3d68d3 100644
--- a/src/main/java/cn/nukkit/command/CapturingCommandSender.java
+++ b/src/main/java/cn/nukkit/command/CapturingCommandSender.java
@@ -1,65 +1,91 @@
package cn.nukkit.command;
import cn.nukkit.Server;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.lang.TextContainer;
import cn.nukkit.permission.*;
import cn.nukkit.plugin.Plugin;
import cn.nukkit.utils.TextFormat;
import lombok.AllArgsConstructor;
-import lombok.Getter;
import lombok.NonNull;
-import lombok.Setter;
+import javax.annotation.Nonnull;
import java.util.Map;
import java.util.function.Function;
/**
* @since 1.2.1.0-PN
*/
-@AllArgsConstructor
+@PowerNukkitOnly
+@AllArgsConstructor(onConstructor = @__(@PowerNukkitOnly))
public class CapturingCommandSender implements CommandSender {
private final StringBuilder captured = new StringBuilder();
@NonNull
- @Getter
- @Setter
private String name;
- @Getter @Setter
private boolean isOp;
@NonNull
private final Permissible perms;
+ @PowerNukkitOnly
public CapturingCommandSender() {
this("System");
}
-
+
+ @PowerNukkitOnly
public CapturingCommandSender(@NonNull String name) {
this.name = name;
this.perms = new PermissibleBase(this);
}
+ @PowerNukkitOnly
public CapturingCommandSender(@NonNull String name, boolean isOp) {
this.name = name;
- this.isOp = true;
+ this.isOp = isOp;
this.perms = new PermissibleBase(this);
}
+ @PowerNukkitOnly
public CapturingCommandSender(@NonNull String name, boolean isOp, @NonNull Function permissibleFactory) {
this.name = name;
- this.isOp = true;
+ this.isOp = isOp;
this.perms = permissibleFactory.apply(this);
}
-
+
+ @Nonnull
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @PowerNukkitOnly
+ public void setName(@Nonnull String name) {
+ this.name = name;
+ }
+
+ @Override
+ public boolean isOp() {
+ return isOp;
+ }
+
+ @Override
+ public void setOp(boolean op) {
+ isOp = op;
+ }
+
+ @PowerNukkitOnly
public void resetCapture() {
captured.setLength(0);
}
-
+
+ @PowerNukkitOnly
public synchronized String getRawCapture() {
return captured.toString();
}
-
+
+ @PowerNukkitOnly
public synchronized String getCleanCapture() {
return TextFormat.clean(captured.toString());
}
diff --git a/src/main/java/cn/nukkit/command/Command.java b/src/main/java/cn/nukkit/command/Command.java
index f9307be8ccb..8f2cd25f6c5 100644
--- a/src/main/java/cn/nukkit/command/Command.java
+++ b/src/main/java/cn/nukkit/command/Command.java
@@ -2,6 +2,9 @@
import cn.nukkit.Player;
import cn.nukkit.Server;
+import cn.nukkit.api.DeprecationDetails;
+import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.command.data.*;
import cn.nukkit.lang.TextContainer;
import cn.nukkit.lang.TranslationContainer;
@@ -18,8 +21,6 @@
*/
public abstract class Command {
- private static CommandData defaultDataTemplate;
-
protected CommandData commandData;
private final String name;
@@ -134,7 +135,8 @@ public CommandDataVersions generateCustomCommandData(Player player) {
public Map getOverloads() {
return this.commandData.overloads;
}
-
+
+ @PowerNukkitOnly
protected double parseTilde(String arg, double pos) {
if (arg.equals("~")) {
return pos;
@@ -263,11 +265,17 @@ public void setUsage(String usageMessage) {
this.usageMessage = usageMessage;
}
+ @Deprecated
+ @DeprecationDetails(
+ by = "PowerNukkit",
+ since = "1.5.2.0-PN",
+ reason = "Unused and always throws an exception even in Cloudburst Nukkit")
+ @PowerNukkitDifference(
+ since = "1.5.2.0-PN",
+ info = "Throws UnsupportedOperationException instead of NullPointerException"
+ )
public static CommandData generateDefaultData() {
- if (defaultDataTemplate == null) {
- //defaultDataTemplate = new Gson().fromJson(new InputStreamReader(Server.class.getClassLoader().getResourceAsStream("command_default.json")));
- }
- return defaultDataTemplate.clone();
+ throw new UnsupportedOperationException();
}
public static void broadcastCommandMessage(CommandSender source, String message) {
diff --git a/src/main/java/cn/nukkit/command/ConsoleCommandSender.java b/src/main/java/cn/nukkit/command/ConsoleCommandSender.java
index f6ff12ae348..0ab510a0514 100644
--- a/src/main/java/cn/nukkit/command/ConsoleCommandSender.java
+++ b/src/main/java/cn/nukkit/command/ConsoleCommandSender.java
@@ -73,6 +73,7 @@ public Map getEffectivePermissions() {
return this.perm.getEffectivePermissions();
}
+ @Override
public boolean isPlayer() {
return false;
}
diff --git a/src/main/java/cn/nukkit/command/data/CommandEnum.java b/src/main/java/cn/nukkit/command/data/CommandEnum.java
index c14cf314688..ae11813cf2b 100644
--- a/src/main/java/cn/nukkit/command/data/CommandEnum.java
+++ b/src/main/java/cn/nukkit/command/data/CommandEnum.java
@@ -62,6 +62,7 @@ public List getValues() {
return values;
}
+ @Override
public int hashCode() {
return name.hashCode();
}
diff --git a/src/main/java/cn/nukkit/command/defaults/EnchantCommand.java b/src/main/java/cn/nukkit/command/defaults/EnchantCommand.java
index 82ee3f5f040..e155830fd7f 100644
--- a/src/main/java/cn/nukkit/command/defaults/EnchantCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/EnchantCommand.java
@@ -34,7 +34,7 @@ public EnchantCommand(String name) {
"protection", "fire_protection", "feather_falling", "blast_protection", "projectile_projection", "thorns", "respiration",
"aqua_affinity", "depth_strider", "sharpness", "smite", "bane_of_arthropods", "knockback", "fire_aspect", "looting", "efficiency",
"silk_touch", "durability", "fortune", "power", "punch", "flame", "infinity", "luck_of_the_sea", "lure", "frost_walker", "mending",
- "binding_curse", "vanishing_curse", "impaling", "loyality", "riptide", "channeling", "multishot", "piercing", "quick_charge",
+ "binding_curse", "vanishing_curse", "impaling", "loyalty", "riptide", "channeling", "multishot", "piercing", "quick_charge",
"soul_speed")),
CommandParameter.newType("level", true, CommandParamType.INT)
});
@@ -86,11 +86,12 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
inventory.setItemInHand(clone);
player.giveItem(enchanted);
}
- Command.broadcastCommandMessage(sender, new TranslationContainer("%commands.enchant.success"));
+ Command.broadcastCommandMessage(sender, new TranslationContainer("%commands.enchant.success", args[1]));
return true;
}
public int getIdByName(String value) throws NumberFormatException {
+ value = value.toLowerCase();
switch (value) {
case "protection":
return 0;
@@ -127,6 +128,7 @@ public int getIdByName(String value) throws NumberFormatException {
case "silk_touch":
return 16;
case "durability":
+ case "unbreaking":
return 17;
case "fortune":
return 18;
@@ -152,9 +154,9 @@ public int getIdByName(String value) throws NumberFormatException {
return 28;
case "impaling":
return 29;
- case "loyality":
- return 30;
case "riptide":
+ return 30;
+ case "loyalty":
return 31;
case "channeling":
return 32;
diff --git a/src/main/java/cn/nukkit/command/defaults/GameruleCommand.java b/src/main/java/cn/nukkit/command/defaults/GameruleCommand.java
index 1015a4cc662..c00cc5d0d39 100644
--- a/src/main/java/cn/nukkit/command/defaults/GameruleCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/GameruleCommand.java
@@ -29,6 +29,9 @@ public GameruleCommand(String name) {
List unknownGameRules = new ArrayList<>();
rules.getGameRules().forEach((rule, value) -> {
+ if (rule.isDeprecated()) {
+ return;
+ }
switch (value.getType()) {
case BOOLEAN:
boolGameRules.add(rule.getName().toLowerCase());
diff --git a/src/main/java/cn/nukkit/command/defaults/KillCommand.java b/src/main/java/cn/nukkit/command/defaults/KillCommand.java
index 141e2623ce5..dc2328b9c1e 100644
--- a/src/main/java/cn/nukkit/command/defaults/KillCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/KillCommand.java
@@ -60,7 +60,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
for (Level level : Server.getInstance().getLevels().values()) {
for (Entity entity : level.getEntities()) {
if (!(entity instanceof Player)) {
- joiner.add(entity.getName());
+ joiner.add(entity.getVisibleName());
entity.close();
}
}
diff --git a/src/main/java/cn/nukkit/command/defaults/SetBlockCommand.java b/src/main/java/cn/nukkit/command/defaults/SetBlockCommand.java
index f1f7890bfcc..d1be38ee3ec 100644
--- a/src/main/java/cn/nukkit/command/defaults/SetBlockCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/SetBlockCommand.java
@@ -1,6 +1,7 @@
package cn.nukkit.command.defaults;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockID;
import cn.nukkit.command.CommandSender;
@@ -14,7 +15,9 @@
import java.util.Arrays;
+@PowerNukkitOnly
public class SetBlockCommand extends VanillaCommand {
+ @PowerNukkitOnly
public SetBlockCommand(String name) {
super(name, "%nukkit.command.setblock.description", "%nukkit.command.setblock.usage");
this.setPermission("nukkit.command.setblock");
diff --git a/src/main/java/cn/nukkit/command/defaults/SetWorldSpawnCommand.java b/src/main/java/cn/nukkit/command/defaults/SetWorldSpawnCommand.java
index 713e92d85a7..a113047aa8b 100644
--- a/src/main/java/cn/nukkit/command/defaults/SetWorldSpawnCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/SetWorldSpawnCommand.java
@@ -20,7 +20,8 @@ public SetWorldSpawnCommand(String name) {
super(name, "%nukkit.command.setworldspawn.description", "%commands.setworldspawn.usage");
this.setPermission("nukkit.command.setworldspawn");
this.commandParameters.clear();
- this.commandParameters.put("default", new CommandParameter[]{
+ this.commandParameters.put("default", CommandParameter.EMPTY_ARRAY);
+ this.commandParameters.put("spawnPoint", new CommandParameter[]{
CommandParameter.newType("spawnPoint", true, CommandParamType.POSITION)
});
}
diff --git a/src/main/java/cn/nukkit/command/defaults/WhitelistCommand.java b/src/main/java/cn/nukkit/command/defaults/WhitelistCommand.java
index da06292064c..a4f560da794 100644
--- a/src/main/java/cn/nukkit/command/defaults/WhitelistCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/WhitelistCommand.java
@@ -15,7 +15,7 @@
public class WhitelistCommand extends VanillaCommand {
public WhitelistCommand(String name) {
- super(name, "%nukkit.command.whitelist.description", "%commands.whitelist.usage");
+ super(name, "%nukkit.command.whitelist.description", "%commands.whitelist.usage", new String[]{"allowlist"}); // In Minecraft Bedrock v1.18.10 the whitelist was renamed to allowlist
this.setPermission(
"nukkit.command.whitelist.reload;" +
"nukkit.command.whitelist.enable;" +
@@ -52,17 +52,17 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
switch (args[0].toLowerCase()) {
case "reload":
sender.getServer().reloadWhitelist();
- Command.broadcastCommandMessage(sender, new TranslationContainer("commands.whitelist.reloaded"));
+ Command.broadcastCommandMessage(sender, new TranslationContainer("commands.allowlist.reloaded"));
return true;
case "on":
sender.getServer().setPropertyBoolean("white-list", true);
- Command.broadcastCommandMessage(sender, new TranslationContainer("commands.whitelist.enabled"));
+ Command.broadcastCommandMessage(sender, new TranslationContainer("commands.allowlist.enabled"));
return true;
case "off":
sender.getServer().setPropertyBoolean("white-list", false);
- Command.broadcastCommandMessage(sender, new TranslationContainer("commands.whitelist.disabled"));
+ Command.broadcastCommandMessage(sender, new TranslationContainer("commands.allowlist.disabled"));
return true;
case "list":
@@ -72,17 +72,17 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
result.append(player).append(", ");
++count;
}
- sender.sendMessage(new TranslationContainer("commands.whitelist.list", String.valueOf(count), String.valueOf(count)));
+ sender.sendMessage(new TranslationContainer("commands.allowlist.list", String.valueOf(count), String.valueOf(count)));
sender.sendMessage(result.length() > 0 ? result.substring(0, result.length() - 2) : "");
return true;
case "add":
- sender.sendMessage(new TranslationContainer("commands.generic.usage", "%commands.whitelist.add.usage"));
+ sender.sendMessage(new TranslationContainer("commands.generic.usage", this.usageMessage));
return true;
case "remove":
- sender.sendMessage(new TranslationContainer("commands.generic.usage", "%commands.whitelist.remove.usage"));
+ sender.sendMessage(new TranslationContainer("commands.generic.usage", this.usageMessage));
return true;
}
} else if (args.length == 2) {
@@ -92,12 +92,12 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
switch (args[0].toLowerCase()) {
case "add":
sender.getServer().getOfflinePlayer(args[1]).setWhitelisted(true);
- Command.broadcastCommandMessage(sender, new TranslationContainer("commands.whitelist.add.success", args[1]));
+ Command.broadcastCommandMessage(sender, new TranslationContainer("commands.allowlist.add.success", args[1]));
return true;
case "remove":
sender.getServer().getOfflinePlayer(args[1]).setWhitelisted(false);
- Command.broadcastCommandMessage(sender, new TranslationContainer("commands.whitelist.remove.success", args[1]));
+ Command.broadcastCommandMessage(sender, new TranslationContainer("commands.allowlist.remove.success", args[1]));
return true;
}
diff --git a/src/main/java/cn/nukkit/dispenser/BoatDispenseBehavior.java b/src/main/java/cn/nukkit/dispenser/BoatDispenseBehavior.java
index bbae7c027b4..d252a9db1a7 100644
--- a/src/main/java/cn/nukkit/dispenser/BoatDispenseBehavior.java
+++ b/src/main/java/cn/nukkit/dispenser/BoatDispenseBehavior.java
@@ -1,5 +1,6 @@
package cn.nukkit.dispenser;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockDispenser;
import cn.nukkit.block.BlockID;
@@ -7,12 +8,18 @@
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.item.EntityBoat;
import cn.nukkit.item.Item;
-import cn.nukkit.item.ItemBoat;
import cn.nukkit.math.BlockFace;
import cn.nukkit.math.Vector3;
+@PowerNukkitOnly
public class BoatDispenseBehavior extends DefaultDispenseBehavior {
+ @PowerNukkitOnly
+ public BoatDispenseBehavior() {
+ super();
+ }
+
+ @PowerNukkitOnly
@Override
public Item dispense(BlockDispenser block, BlockFace face, Item item) {
Vector3 pos = block.getSide(face).multiply(1.125);
@@ -29,7 +36,7 @@ public Item dispense(BlockDispenser block, BlockFace face, Item item) {
EntityBoat boat = new EntityBoat(block.level.getChunk(target.getChunkX(), target.getChunkZ()),
Entity.getDefaultNBT(pos)
- .putByte("woodID", ((ItemBoat)item).getLegacyBoatDamage().orElse(0))
+ .putInt("Variant", item.getDamage())
);
boat.spawnToAll();
diff --git a/src/main/java/cn/nukkit/dispenser/BucketDispenseBehavior.java b/src/main/java/cn/nukkit/dispenser/BucketDispenseBehavior.java
index 31fec412b77..a8bd23033c7 100644
--- a/src/main/java/cn/nukkit/dispenser/BucketDispenseBehavior.java
+++ b/src/main/java/cn/nukkit/dispenser/BucketDispenseBehavior.java
@@ -1,5 +1,6 @@
package cn.nukkit.dispenser;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.*;
import cn.nukkit.item.Item;
import cn.nukkit.item.ItemBucket;
@@ -11,6 +12,7 @@
*/
public class BucketDispenseBehavior extends DefaultDispenseBehavior {
+ @PowerNukkitOnly
@Override
public Item dispense(BlockDispenser block, BlockFace face, Item item) {
if (!(item instanceof ItemBucket)) {
diff --git a/src/main/java/cn/nukkit/dispenser/DefaultDispenseBehavior.java b/src/main/java/cn/nukkit/dispenser/DefaultDispenseBehavior.java
index e24a39006b2..8f17cc7179f 100644
--- a/src/main/java/cn/nukkit/dispenser/DefaultDispenseBehavior.java
+++ b/src/main/java/cn/nukkit/dispenser/DefaultDispenseBehavior.java
@@ -1,5 +1,6 @@
package cn.nukkit.dispenser;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.BlockDispenser;
import cn.nukkit.item.Item;
import cn.nukkit.math.BlockFace;
@@ -14,8 +15,10 @@
*/
public class DefaultDispenseBehavior implements DispenseBehavior {
+ @PowerNukkitOnly
public boolean success = true;
+ @PowerNukkitOnly
@Override
public Item dispense(BlockDispenser block, BlockFace face, Item item) {
Vector3 dispensePos = block.getDispensePosition();
diff --git a/src/main/java/cn/nukkit/dispenser/DispenseBehavior.java b/src/main/java/cn/nukkit/dispenser/DispenseBehavior.java
index ebb94f2c36a..04ecaa2b323 100644
--- a/src/main/java/cn/nukkit/dispenser/DispenseBehavior.java
+++ b/src/main/java/cn/nukkit/dispenser/DispenseBehavior.java
@@ -1,5 +1,6 @@
package cn.nukkit.dispenser;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.BlockDispenser;
import cn.nukkit.item.Item;
import cn.nukkit.math.BlockFace;
@@ -9,6 +10,7 @@
*/
public interface DispenseBehavior {
+ @PowerNukkitOnly
Item dispense(BlockDispenser block, BlockFace face, Item item);
}
diff --git a/src/main/java/cn/nukkit/dispenser/DispenseBehaviorRegister.java b/src/main/java/cn/nukkit/dispenser/DispenseBehaviorRegister.java
index e57d7fa5ee9..42d10e6b4e3 100644
--- a/src/main/java/cn/nukkit/dispenser/DispenseBehaviorRegister.java
+++ b/src/main/java/cn/nukkit/dispenser/DispenseBehaviorRegister.java
@@ -1,5 +1,6 @@
package cn.nukkit.dispenser;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.BlockID;
import cn.nukkit.item.ItemID;
@@ -26,6 +27,7 @@ public static void removeDispenseBehavior(int id) {
behaviors.remove(id);
}
+ @PowerNukkitOnly
public static void init() {
registerBehavior(ItemID.BOAT, new BoatDispenseBehavior());
registerBehavior(ItemID.BUCKET, new BucketDispenseBehavior());
@@ -68,7 +70,17 @@ protected double getMotion() {
return super.getMotion() * 1.25;
}
});
-// registerBehavior(ItemID.LINGERING_POTION, new ProjectileDispenseBehavior("LingeringPotion")); //TODO
+ registerBehavior(ItemID.LINGERING_POTION, new ProjectileDispenseBehavior("LingeringPotion") {
+ @Override
+ protected float getAccuracy() {
+ return super.getAccuracy() * 0.5f;
+ }
+
+ @Override
+ protected double getMotion() {
+ return super.getMotion() * 1.25;
+ }
+ });
registerBehavior(ItemID.TRIDENT, new ProjectileDispenseBehavior("ThrownTrident") {
@Override
protected float getAccuracy() {
diff --git a/src/main/java/cn/nukkit/dispenser/DropperDispenseBehavior.java b/src/main/java/cn/nukkit/dispenser/DropperDispenseBehavior.java
index 2ec3460bb2a..d38318adbce 100644
--- a/src/main/java/cn/nukkit/dispenser/DropperDispenseBehavior.java
+++ b/src/main/java/cn/nukkit/dispenser/DropperDispenseBehavior.java
@@ -1,6 +1,5 @@
package cn.nukkit.dispenser;
-import cn.nukkit.api.PowerNukkitDifference;
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockDispenser;
@@ -10,9 +9,15 @@
import cn.nukkit.level.Sound;
import cn.nukkit.math.BlockFace;
-@PowerNukkitDifference(info = "Spend items in container, the dropper faces to (if there is one).", since = "1.4.0.0-PN")
@PowerNukkitOnly
public class DropperDispenseBehavior extends DefaultDispenseBehavior {
+
+ @PowerNukkitOnly
+ public DropperDispenseBehavior() {
+ super();
+ }
+
+ @PowerNukkitOnly
@Override
public Item dispense(BlockDispenser block, BlockFace face, Item item) {
Block target = block.getSide(face);
diff --git a/src/main/java/cn/nukkit/dispenser/DyeDispenseBehavior.java b/src/main/java/cn/nukkit/dispenser/DyeDispenseBehavior.java
index 4229683e00c..638cc0de850 100644
--- a/src/main/java/cn/nukkit/dispenser/DyeDispenseBehavior.java
+++ b/src/main/java/cn/nukkit/dispenser/DyeDispenseBehavior.java
@@ -1,11 +1,19 @@
package cn.nukkit.dispenser;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.*;
import cn.nukkit.item.Item;
import cn.nukkit.math.BlockFace;
+@PowerNukkitOnly
public class DyeDispenseBehavior extends DefaultDispenseBehavior {
+ @PowerNukkitOnly
+ public DyeDispenseBehavior() {
+ super();
+ }
+
+ @PowerNukkitOnly
@Override
public Item dispense(BlockDispenser block, BlockFace face, Item item) {
Block target = block.getSide(face);
diff --git a/src/main/java/cn/nukkit/dispenser/EmptyBucketDispenseBehavior.java b/src/main/java/cn/nukkit/dispenser/EmptyBucketDispenseBehavior.java
index 088a356afaa..a664478b2cb 100644
--- a/src/main/java/cn/nukkit/dispenser/EmptyBucketDispenseBehavior.java
+++ b/src/main/java/cn/nukkit/dispenser/EmptyBucketDispenseBehavior.java
@@ -1,5 +1,6 @@
package cn.nukkit.dispenser;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.*;
import cn.nukkit.item.Item;
import cn.nukkit.item.MinecraftItemID;
@@ -10,6 +11,7 @@
*/
public class EmptyBucketDispenseBehavior extends DefaultDispenseBehavior {
+ @PowerNukkitOnly
@Override
public Item dispense(BlockDispenser block, BlockFace face, Item item) {
Block target = block.getSide(face);
diff --git a/src/main/java/cn/nukkit/dispenser/FireChargeDispenseBehavior.java b/src/main/java/cn/nukkit/dispenser/FireChargeDispenseBehavior.java
deleted file mode 100644
index 6edfaa09655..00000000000
--- a/src/main/java/cn/nukkit/dispenser/FireChargeDispenseBehavior.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.nukkit.dispenser;
-
-import cn.nukkit.block.BlockDispenser;
-import cn.nukkit.item.Item;
-import cn.nukkit.math.BlockFace;
-
-public class FireChargeDispenseBehavior extends DefaultDispenseBehavior {
-
- @Override
- public Item dispense(BlockDispenser block, BlockFace face, Item item) {
- //TODO: firecharge
- return null;
- }
-}
diff --git a/src/main/java/cn/nukkit/dispenser/FireworksDispenseBehavior.java b/src/main/java/cn/nukkit/dispenser/FireworksDispenseBehavior.java
index bcc55074a09..f7c80d2a8e1 100644
--- a/src/main/java/cn/nukkit/dispenser/FireworksDispenseBehavior.java
+++ b/src/main/java/cn/nukkit/dispenser/FireworksDispenseBehavior.java
@@ -1,5 +1,6 @@
package cn.nukkit.dispenser;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.BlockDispenser;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.item.EntityFirework;
@@ -9,8 +10,15 @@
import cn.nukkit.nbt.NBTIO;
import cn.nukkit.nbt.tag.CompoundTag;
+@PowerNukkitOnly
public class FireworksDispenseBehavior extends DefaultDispenseBehavior {
+ @PowerNukkitOnly
+ public FireworksDispenseBehavior() {
+ super();
+ }
+
+ @PowerNukkitOnly
@Override
public Item dispense(BlockDispenser block, BlockFace face, Item item) {
BlockFace opposite = face.getOpposite();
diff --git a/src/main/java/cn/nukkit/dispenser/FlintAndSteelDispenseBehavior.java b/src/main/java/cn/nukkit/dispenser/FlintAndSteelDispenseBehavior.java
index 54dec1b0eef..fd88e362bc3 100644
--- a/src/main/java/cn/nukkit/dispenser/FlintAndSteelDispenseBehavior.java
+++ b/src/main/java/cn/nukkit/dispenser/FlintAndSteelDispenseBehavior.java
@@ -1,19 +1,25 @@
package cn.nukkit.dispenser;
import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockDispenser;
import cn.nukkit.block.BlockID;
import cn.nukkit.item.Item;
-import cn.nukkit.item.ItemFlintSteel;
import cn.nukkit.level.Sound;
import cn.nukkit.math.BlockFace;
+@PowerNukkitOnly
public class FlintAndSteelDispenseBehavior extends DefaultDispenseBehavior {
+ @PowerNukkitOnly
+ public FlintAndSteelDispenseBehavior() {
+ super();
+ }
+
@Override
@PowerNukkitDifference(info = "Reduce flint and steel usage instead of clearing.", since = "1.4.0.0-PN")
- public Item dispense(BlockDispenser block, BlockFace face, Item item) {
+ public @PowerNukkitOnly Item dispense(BlockDispenser block, BlockFace face, Item item) {
Block target = block.getSide(face);
item = item.clone();
diff --git a/src/main/java/cn/nukkit/dispenser/ProjectileDispenseBehavior.java b/src/main/java/cn/nukkit/dispenser/ProjectileDispenseBehavior.java
index a6d083d4921..fb193923b6a 100644
--- a/src/main/java/cn/nukkit/dispenser/ProjectileDispenseBehavior.java
+++ b/src/main/java/cn/nukkit/dispenser/ProjectileDispenseBehavior.java
@@ -1,15 +1,21 @@
package cn.nukkit.dispenser;
import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.block.BlockDispenser;
import cn.nukkit.entity.Entity;
+import cn.nukkit.entity.item.EntityPotion;
import cn.nukkit.entity.projectile.EntityProjectile;
import cn.nukkit.item.Item;
+import cn.nukkit.item.ItemID;
import cn.nukkit.level.Sound;
import cn.nukkit.math.BlockFace;
import cn.nukkit.math.Vector3;
import cn.nukkit.nbt.tag.CompoundTag;
+import javax.annotation.Nullable;
+
/**
* @author CreeperFace
*/
@@ -23,11 +29,11 @@ public ProjectileDispenseBehavior(String entity) {
@Override
@PowerNukkitDifference(info = "Implement sound.", since = "1.4.0.0-PN")
- public Item dispense(BlockDispenser source, BlockFace face, Item item) {
+ public @PowerNukkitOnly Item dispense(BlockDispenser source, BlockFace face, Item item) {
Vector3 dispensePos = source.getDispensePosition();
CompoundTag nbt = Entity.getDefaultNBT(dispensePos);
- this.correctNBT(nbt);
+ this.correctNBT(nbt, item);
Entity projectile = Entity.createEntity(getEntityType(), source.level.getChunk(dispensePos.getChunkX(), dispensePos.getChunkZ()), nbt);
@@ -50,10 +56,12 @@ public Item dispense(BlockDispenser source, BlockFace face, Item item) {
return null;
}
+ @PowerNukkitOnly
protected double getMotion() {
return 1.1;
}
+ @PowerNukkitOnly
protected float getAccuracy() {
return 6;
}
@@ -68,6 +76,16 @@ protected String getEntityType() {
* @param nbt tag
*/
protected void correctNBT(CompoundTag nbt) {
+ this.correctNBT(nbt, null);
+ }
+ @PowerNukkitOnly
+ @Since("FUTURE")
+ protected void correctNBT(CompoundTag nbt, @Nullable Item item) {
+ if (item != null) {
+ if (item.getId() == ItemID.SPLASH_POTION || item.getId() == ItemID.LINGERING_POTION) {
+ nbt.putInt(EntityPotion.NBT_POTION_ID, item.getDamage());
+ }
+ }
}
}
diff --git a/src/main/java/cn/nukkit/dispenser/PumpkinDispenseBehavior.java b/src/main/java/cn/nukkit/dispenser/PumpkinDispenseBehavior.java
deleted file mode 100644
index 0803372fa92..00000000000
--- a/src/main/java/cn/nukkit/dispenser/PumpkinDispenseBehavior.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cn.nukkit.dispenser;
-
-import cn.nukkit.block.Block;
-import cn.nukkit.block.BlockDispenser;
-import cn.nukkit.item.Item;
-import cn.nukkit.math.BlockFace;
-
-public class PumpkinDispenseBehavior extends DefaultDispenseBehavior {
-
- @Override
- public Item dispense(BlockDispenser block, BlockFace face, Item item) {
- Block target = block.getSide(face);
-
- //TODO: snowman / golem
- return null;
- }
-}
diff --git a/src/main/java/cn/nukkit/dispenser/ShulkerBoxDispenseBehavior.java b/src/main/java/cn/nukkit/dispenser/ShulkerBoxDispenseBehavior.java
index 1a878802fcc..4c6f5d9072c 100644
--- a/src/main/java/cn/nukkit/dispenser/ShulkerBoxDispenseBehavior.java
+++ b/src/main/java/cn/nukkit/dispenser/ShulkerBoxDispenseBehavior.java
@@ -1,13 +1,21 @@
package cn.nukkit.dispenser;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockDispenser;
import cn.nukkit.block.BlockUndyedShulkerBox;
import cn.nukkit.item.Item;
import cn.nukkit.math.BlockFace;
+@PowerNukkitOnly
public class ShulkerBoxDispenseBehavior extends DefaultDispenseBehavior {
+ @PowerNukkitOnly
+ public ShulkerBoxDispenseBehavior() {
+ super();
+ }
+
+ @PowerNukkitOnly
@Override
public Item dispense(BlockDispenser block, BlockFace face, Item item) {
Block target = block.getSide(face);
diff --git a/src/main/java/cn/nukkit/dispenser/SpawnEggDispenseBehavior.java b/src/main/java/cn/nukkit/dispenser/SpawnEggDispenseBehavior.java
index 349453a8b35..27ff98de721 100644
--- a/src/main/java/cn/nukkit/dispenser/SpawnEggDispenseBehavior.java
+++ b/src/main/java/cn/nukkit/dispenser/SpawnEggDispenseBehavior.java
@@ -1,5 +1,6 @@
package cn.nukkit.dispenser;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.BlockDispenser;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.EntityLiving;
@@ -8,8 +9,15 @@
import cn.nukkit.math.BlockFace;
import cn.nukkit.math.Vector3;
+@PowerNukkitOnly
public class SpawnEggDispenseBehavior extends DefaultDispenseBehavior {
+ @PowerNukkitOnly
+ public SpawnEggDispenseBehavior() {
+ super();
+ }
+
+ @PowerNukkitOnly
@Override
public Item dispense(BlockDispenser block, BlockFace face, Item item) {
Vector3 pos = block.getSide(face).add(0.5, 0.7, 0.5);
diff --git a/src/main/java/cn/nukkit/dispenser/TNTDispenseBehavior.java b/src/main/java/cn/nukkit/dispenser/TNTDispenseBehavior.java
index bbdb9aaf266..5f6abc7ce91 100644
--- a/src/main/java/cn/nukkit/dispenser/TNTDispenseBehavior.java
+++ b/src/main/java/cn/nukkit/dispenser/TNTDispenseBehavior.java
@@ -1,5 +1,6 @@
package cn.nukkit.dispenser;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.BlockDispenser;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.item.EntityPrimedTNT;
@@ -7,8 +8,15 @@
import cn.nukkit.math.BlockFace;
import cn.nukkit.math.Vector3;
+@PowerNukkitOnly
public class TNTDispenseBehavior extends DefaultDispenseBehavior {
+ @PowerNukkitOnly
+ public TNTDispenseBehavior() {
+ super();
+ }
+
+ @PowerNukkitOnly
@Override
public Item dispense(BlockDispenser block, BlockFace face, Item item) {
Vector3 pos = block.getSide(face).add(0.5, 0, 0.5);
diff --git a/src/main/java/cn/nukkit/entity/Attribute.java b/src/main/java/cn/nukkit/entity/Attribute.java
index 1ab060eb7f9..611424a073c 100644
--- a/src/main/java/cn/nukkit/entity/Attribute.java
+++ b/src/main/java/cn/nukkit/entity/Attribute.java
@@ -9,13 +9,11 @@
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.utils.ServerException;
-import lombok.ToString;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
-@ToString
public class Attribute implements Cloneable {
@PowerNukkitOnly
@Since("1.4.0.0-PN")
@@ -177,4 +175,14 @@ public Attribute clone() {
return null;
}
}
+
+ @Override
+ public String toString() {
+ return name + "{" +
+ "min=" + minValue +
+ ", max=" + maxValue +
+ ", def=" + defaultValue +
+ ", val=" + currentValue +
+ '}';
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/Entity.java b/src/main/java/cn/nukkit/entity/Entity.java
index a8308beb055..49b3c39e951 100644
--- a/src/main/java/cn/nukkit/entity/Entity.java
+++ b/src/main/java/cn/nukkit/entity/Entity.java
@@ -20,6 +20,8 @@
import cn.nukkit.event.player.PlayerTeleportEvent;
import cn.nukkit.item.Item;
import cn.nukkit.item.ItemID;
+import cn.nukkit.item.enchantment.Enchantment;
+import cn.nukkit.item.enchantment.sideeffect.SideEffect;
import cn.nukkit.level.*;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.math.*;
@@ -35,10 +37,14 @@
import cn.nukkit.potion.Effect;
import cn.nukkit.scheduler.Task;
import cn.nukkit.utils.ChunkException;
+import cn.nukkit.utils.TextFormat;
+import cn.nukkit.utils.Utils;
import co.aikar.timings.Timing;
import co.aikar.timings.Timings;
import co.aikar.timings.TimingsHistory;
import com.google.common.collect.Iterables;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntCollection;
import lombok.extern.log4j.Log4j2;
import javax.annotation.Nonnull;
@@ -124,16 +130,7 @@ public abstract class Entity extends Location implements Metadatable {
public static final int DATA_POTION_AUX_VALUE = dynamic(36); //short
public static final int DATA_LEAD_HOLDER_EID = dynamic(37); //long
public static final int DATA_SCALE = dynamic(38); //float
- @Since("1.4.0.0-PN") public static final int DATA_INTERACTIVE_TAG = dynamic(39); //string (button text)
-
- @PowerNukkitOnly @Since("1.2.0.0-PN")
- @Deprecated @DeprecationDetails(
- by = "PowerNukkit", since = "1.4.0.0-PN",
- reason = "This is not only for NPC, it's used to display any interactive button text " +
- "and Nukkit added this constant with a different name",
- replaceWith = "DATA_INTERACTIVE_TAG")
- public static final int DATA_HAS_NPC_COMPONENT = dynamic(DATA_INTERACTIVE_TAG); //byte
-
+ @Since("1.2.0.0-PN") public static final int DATA_HAS_NPC_COMPONENT = dynamic(39); //byte
public static final int DATA_NPC_SKIN_ID = dynamic(40); //string
public static final int DATA_URL_TAG = dynamic(41); //string
public static final int DATA_MAX_AIR = dynamic(42); //short
@@ -194,7 +191,14 @@ public abstract class Entity extends Location implements Metadatable {
@Since("1.2.0.0-PN") public static final int DATA_CHANGE_RATE = dynamic(97); //float
@Since("1.2.0.0-PN") public static final int DATA_CHANGE_ON_PICKUP = dynamic(98); //float
@Since("1.2.0.0-PN") public static final int DATA_PICKUP_COUNT = dynamic(99); //int
- @Since("1.2.0.0-PN") public static final int DATA_INTERACT_TEXT = dynamic(100); //string
+ @Since("1.4.0.0-PN") public static final int DATA_INTERACTIVE_TAG = dynamic(100); //string (button text)
+
+ @PowerNukkitOnly("Removed from Cloudburst Nukkit")
+ @Deprecated
+ @DeprecationDetails(by = "Cloudburst Nukkit", reason = "Duplicated and removed", replaceWith = "DATA_INTERACTIVE_TAG", since = "1.6.0.0-PN")
+ @Since("1.2.0.0-PN")
+ public static final int DATA_INTERACT_TEXT = dynamic(DATA_INTERACTIVE_TAG); //string
+
public static final int DATA_TRADE_TIER = dynamic(101); //int
public static final int DATA_MAX_TRADE_TIER = dynamic(102); //int
@Since("1.2.0.0-PN") public static final int DATA_TRADE_EXPERIENCE = dynamic(103); //int
@@ -214,11 +218,11 @@ public abstract class Entity extends Location implements Metadatable {
@Since("1.3.0.0-PN") public static final int DATA_NEARBY_CURED_DISCOUNT_TIMESTAMP = dynamic(117); //int
@Since("1.3.0.0-PN") public static final int DATA_HITBOX = dynamic(118); //NBT
@Since("1.3.0.0-PN") public static final int DATA_IS_BUOYANT = dynamic(119); //byte
- @Since("1.5.0.0-PN") @PowerNukkitOnly public static final int DATA_BASE_RUNTIME_ID = dynamic(120); // ???
- @Since("1.4.0.0-PN") public static final int DATA_FREEZING_EFFECT_STRENGTH = dynamic(121);
+ @Since("1.5.0.0-PN") public static final int DATA_BASE_RUNTIME_ID = dynamic(120); // ???
+ @Since("1.4.0.0-PN") public static final int DATA_FREEZING_EFFECT_STRENGTH = dynamic(121); // ???
@Since("1.3.0.0-PN") public static final int DATA_BUOYANCY_DATA = dynamic(122); //string
@Since("1.4.0.0-PN") public static final int DATA_GOAT_HORN_COUNT = dynamic(123); // ???
- @Since("1.5.0.0-PN") @PowerNukkitOnly public static final int DATA_UPDATE_PROPERTIES = dynamic(124); // ???
+ @Since("1.5.0.0-PN") public static final int DATA_UPDATE_PROPERTIES = dynamic(124); // ???
// Flags
public static final int DATA_FLAG_ONFIRE = dynamic(0);
@@ -268,22 +272,23 @@ public abstract class Entity extends Location implements Metadatable {
public static final int DATA_FLAG_CHARGE_ATTACK = dynamic(43);
public static final int DATA_FLAG_WASD_CONTROLLED = dynamic(44);
public static final int DATA_FLAG_CAN_POWER_JUMP = dynamic(45);
- public static final int DATA_FLAG_LINGER = dynamic(46);
- public static final int DATA_FLAG_HAS_COLLISION = dynamic(47);
- public static final int DATA_FLAG_GRAVITY = dynamic(48);
- public static final int DATA_FLAG_FIRE_IMMUNE = dynamic(49);
- public static final int DATA_FLAG_DANCING = dynamic(50);
- public static final int DATA_FLAG_ENCHANTED = dynamic(51);
- public static final int DATA_FLAG_SHOW_TRIDENT_ROPE = dynamic(52); // tridents show an animated rope when enchanted with loyalty after they are thrown and return to their owner. To be combined with DATA_OWNER_EID
- public static final int DATA_FLAG_CONTAINER_PRIVATE = dynamic(53); //inventory is private, doesn't drop contents when killed if true
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_IS_TRANSFORMING = dynamic(54);
- public static final int DATA_FLAG_SPIN_ATTACK = dynamic(55);
- public static final int DATA_FLAG_SWIMMING = dynamic(56);
- public static final int DATA_FLAG_BRIBED = dynamic(57); //dolphins have this set when they go to find treasure for the player
- public static final int DATA_FLAG_PREGNANT = dynamic(58);
- public static final int DATA_FLAG_LAYING_EGG = dynamic(59);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_RIDER_CAN_PICK = dynamic(60);
- @PowerNukkitOnly @Since("1.2.0.0-PN") public static final int DATA_FLAG_TRANSITION_SITTING = dynamic(61); // PowerNukkit but without typo
+ public static final int DATA_FLAG_CAN_DASH = dynamic(46);
+ public static final int DATA_FLAG_LINGER = dynamic(47);
+ public static final int DATA_FLAG_HAS_COLLISION = dynamic(48);
+ public static final int DATA_FLAG_GRAVITY = dynamic(49);
+ public static final int DATA_FLAG_FIRE_IMMUNE = dynamic(50);
+ public static final int DATA_FLAG_DANCING = dynamic(51);
+ public static final int DATA_FLAG_ENCHANTED = dynamic(52);
+ public static final int DATA_FLAG_SHOW_TRIDENT_ROPE = dynamic(53); // tridents show an animated rope when enchanted with loyalty after they are thrown and return to their owner. To be combined with DATA_OWNER_EID
+ public static final int DATA_FLAG_CONTAINER_PRIVATE = dynamic(54); //inventory is private, doesn't drop contents when killed if true
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_IS_TRANSFORMING = dynamic(55);
+ public static final int DATA_FLAG_SPIN_ATTACK = dynamic(56);
+ public static final int DATA_FLAG_SWIMMING = dynamic(57);
+ public static final int DATA_FLAG_BRIBED = dynamic(58); //dolphins have this set when they go to find treasure for the player
+ public static final int DATA_FLAG_PREGNANT = dynamic(59);
+ public static final int DATA_FLAG_LAYING_EGG = dynamic(60);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_RIDER_CAN_PICK = dynamic(61);
+ @PowerNukkitOnly @Since("1.2.0.0-PN") public static final int DATA_FLAG_TRANSITION_SITTING = dynamic(62); // PowerNukkit but without typo
/**
* @deprecated This is from NukkitX but it has a typo which we can't remove unless NukkitX removes from their side.
@@ -295,41 +300,53 @@ public abstract class Entity extends Location implements Metadatable {
replaceWith = "DATA_FLAG_TRANSITION_SITTING")
@Since("1.2.0.0-PN") public static final int DATA_FLAG_TRANSITION_SETTING = DATA_FLAG_TRANSITION_SITTING; // NukkitX with the same typo
- public static final int DATA_FLAG_EATING = dynamic(62);
- public static final int DATA_FLAG_LAYING_DOWN = dynamic(63);
- public static final int DATA_FLAG_SNEEZING = dynamic(64);
- public static final int DATA_FLAG_TRUSTING = dynamic(65);
- public static final int DATA_FLAG_ROLLING = dynamic(66);
- public static final int DATA_FLAG_SCARED = dynamic(67);
- public static final int DATA_FLAG_IN_SCAFFOLDING = dynamic(68);
- public static final int DATA_FLAG_OVER_SCAFFOLDING = dynamic(69);
- public static final int DATA_FLAG_FALL_THROUGH_SCAFFOLDING = dynamic(70);
- public static final int DATA_FLAG_BLOCKING = dynamic(71); //shield
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_TRANSITION_BLOCKING = dynamic(72);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_BLOCKED_USING_SHIELD = dynamic(73);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_BLOCKED_USING_DAMAGED_SHIELD = dynamic(74);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_SLEEPING = dynamic(75);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_WANTS_TO_WAKE = dynamic(76);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_TRADE_INTEREST = dynamic(77);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_DOOR_BREAKER = dynamic(78);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_BREAKING_OBSTRUCTION = dynamic(79);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_DOOR_OPENER = dynamic(80);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_IS_ILLAGER_CAPTAIN = dynamic(81);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_STUNNED = dynamic(82);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_ROARING = dynamic(83);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_DELAYED_ATTACK = dynamic(84);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_IS_AVOIDING_MOBS = dynamic(85);
- @Since("1.3.0.0-PN") public static final int DATA_FLAG_IS_AVOIDING_BLOCKS = dynamic(86);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_FACING_TARGET_TO_RANGE_ATTACK = dynamic(87);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_HIDDEN_WHEN_INVISIBLE = dynamic(88);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_IS_IN_UI = dynamic(89);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_STALKING = dynamic(90);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_EMOTING = dynamic(91);
- @Since("1.2.0.0-PN") public static final int DATA_FLAG_CELEBRATING = dynamic(92);
- @Since("1.3.0.0-PN") public static final int DATA_FLAG_ADMIRING = dynamic(93);
- @Since("1.3.0.0-PN") public static final int DATA_FLAG_CELEBRATING_SPECIAL = dynamic(94);
- @Since("1.4.0.0-PN") public static final int DATA_FLAG_RAM_ATTACK = dynamic(96);
- @Since("1.5.0.0-PN") @PowerNukkitOnly public static final int DATA_FLAG_PLAYING_DEAD = dynamic(97);
+ public static final int DATA_FLAG_EATING = dynamic(63);
+ public static final int DATA_FLAG_LAYING_DOWN = dynamic(64);
+ public static final int DATA_FLAG_SNEEZING = dynamic(65);
+ public static final int DATA_FLAG_TRUSTING = dynamic(66);
+ public static final int DATA_FLAG_ROLLING = dynamic(67);
+ public static final int DATA_FLAG_SCARED = dynamic(68);
+ public static final int DATA_FLAG_IN_SCAFFOLDING = dynamic(69);
+ public static final int DATA_FLAG_OVER_SCAFFOLDING = dynamic(70);
+ public static final int DATA_FLAG_FALL_THROUGH_SCAFFOLDING = dynamic(71);
+ public static final int DATA_FLAG_BLOCKING = dynamic(72); //shield
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_TRANSITION_BLOCKING = dynamic(73);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_BLOCKED_USING_SHIELD = dynamic(74);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_BLOCKED_USING_DAMAGED_SHIELD = dynamic(75);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_SLEEPING = dynamic(76);
+ @Since("1.6.0.0-PN") public static final int DATA_FLAG_ENTITY_GROW_UP = dynamic(77);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_TRADE_INTEREST = dynamic(78);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_DOOR_BREAKER = dynamic(79);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_BREAKING_OBSTRUCTION = dynamic(80);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_DOOR_OPENER = dynamic(81);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_IS_ILLAGER_CAPTAIN = dynamic(82);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_STUNNED = dynamic(83);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_ROARING = dynamic(84);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_DELAYED_ATTACK = dynamic(85);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_IS_AVOIDING_MOBS = dynamic(86);
+ @Since("1.3.0.0-PN") public static final int DATA_FLAG_IS_AVOIDING_BLOCKS = dynamic(87);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_FACING_TARGET_TO_RANGE_ATTACK = dynamic(88);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_HIDDEN_WHEN_INVISIBLE = dynamic(89);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_IS_IN_UI = dynamic(90);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_STALKING = dynamic(91);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_EMOTING = dynamic(92);
+ @Since("1.2.0.0-PN") public static final int DATA_FLAG_CELEBRATING = dynamic(93);
+ @Since("1.3.0.0-PN") public static final int DATA_FLAG_ADMIRING = dynamic(94);
+ @Since("1.3.0.0-PN") public static final int DATA_FLAG_CELEBRATING_SPECIAL = dynamic(95);
+ public static final int DATA_FLAG_OUT_OF_CONTROL = dynamic(96);
+ @Since("1.4.0.0-PN") public static final int DATA_FLAG_RAM_ATTACK = dynamic(97);
+ @Since("1.5.0.0-PN") public static final int DATA_FLAG_PLAYING_DEAD = dynamic(98);
+ @Since("1.6.0.0-PN") public static final int DATA_FLAG_IN_ASCENDABLE_BLOCK = dynamic(99);
+ @Since("1.6.0.0-PN") public static final int DATA_FLAG_OVER_DESCENDABLE_BLOCK = dynamic(100);
+ public static final int DATA_FLAG_CROAKING = dynamic(101);
+ public static final int DATA_FLAG_EAT_MOB = dynamic(102);
+ public static final int DATA_FLAG_JUMP_GOAL_JUMP = dynamic(103);
+ public static final int DATA_FLAG_EMERGING = dynamic(104);
+ public static final int DATA_FLAG_SNIFFING = dynamic(105);
+ public static final int DATA_FLAG_DIGGING = dynamic(106);
+ public static final int DATA_FLAG_SONIC_BOOM = dynamic(107);
+ public static final int DATA_FLAG_HAS_DASH_COOLDOWN = dynamic(108);
+ public static final int DATA_FLAG_PUSH_TOWARDS_CLOSEST_SPACE = dynamic(109);
public static long entityCount = 1;
@@ -377,11 +394,13 @@ public abstract class Entity extends Location implements Metadatable {
public double lastMotionY;
public double lastMotionZ;
- public double lastYaw;
public double lastPitch;
+ @Since("1.6.0.0-PN") public double lastYaw;
+ @Since("1.6.0.0-PN") public double lastHeadYaw;
public double pitchDelta;
- public double yawDelta;
+ @Since("1.6.0.0-PN") public double yawDelta;
+ @Since("1.6.0.0-PN") public double headYawDelta;
public double entityCollisionReduction = 0; // Higher than 0.9 will result a fast collisions
public AxisAlignedBB boundingBox;
@@ -446,8 +465,18 @@ public float getHeight() {
return 0;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public float getCurrentHeight() {
+ if (isSwimming()) {
+ return getSwimmingHeight();
+ } else {
+ return getHeight();
+ }
+ }
+
public float getEyeHeight() {
- return this.getHeight() / 2 + 0.1f;
+ return getCurrentHeight() / 2 + 0.1f;
}
public float getWidth() {
@@ -680,12 +709,24 @@ public boolean isSwimming() {
return this.getDataFlag(DATA_FLAGS, DATA_FLAG_SWIMMING);
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public float getSwimmingHeight() {
+ return getHeight();
+ }
+
public void setSwimming() {
this.setSwimming(true);
}
public void setSwimming(boolean value) {
+ if (isSwimming() == value) {
+ return;
+ }
this.setDataFlag(DATA_FLAGS, DATA_FLAG_SWIMMING, value);
+ if (Float.compare(getSwimmingHeight(), getHeight()) != 0) {
+ recalculateBoundingBox(true);
+ }
}
public boolean isSprinting() {
@@ -832,11 +873,20 @@ public void recalculateBoundingBox() {
}
public void recalculateBoundingBox(boolean send) {
- float height = this.getHeight() * this.scale;
+ float entityHeight = getCurrentHeight();
+ float height = entityHeight * this.scale;
double radius = (this.getWidth() * this.scale) / 2d;
- this.boundingBox.setBounds(x - radius, y, z - radius, x + radius, y + height, z + radius);
+ this.boundingBox.setBounds(
+ x - radius,
+ y,
+ z - radius,
+
+ x + radius,
+ y + height,
+ z + radius
+ );
- FloatEntityData bbH = new FloatEntityData(DATA_BOUNDING_BOX_HEIGHT, this.getHeight());
+ FloatEntityData bbH = new FloatEntityData(DATA_BOUNDING_BOX_HEIGHT, entityHeight);
FloatEntityData bbW = new FloatEntityData(DATA_BOUNDING_BOX_WIDTH, this.getWidth());
this.dataProperties.put(bbH);
this.dataProperties.put(bbW);
@@ -966,6 +1016,50 @@ public static boolean registerEntity(String name, Class clazz,
return true;
}
+ @Nonnull
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public static IntCollection getKnownEntityIds() {
+ return knownEntities.keySet().stream()
+ .filter(Utils::isInteger)
+ .mapToInt(Integer::parseInt)
+ .collect(IntArrayList::new, IntArrayList::add, IntArrayList::addAll);
+ }
+
+ @Nonnull
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public static List getSaveIds() {
+ return new ArrayList<>(shortNames.values());
+ }
+
+ @Nonnull
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public static OptionalInt getSaveId(String id) {
+ Class entityClass = knownEntities.get(id);
+ if (entityClass == null) {
+ return OptionalInt.empty();
+ }
+ return knownEntities.entrySet().stream()
+ .filter(entry -> entry.getValue().equals(entityClass))
+ .map(Map.Entry::getKey)
+ .filter(Utils::isInteger)
+ .mapToInt(Integer::parseInt)
+ .findFirst();
+ }
+
+ @Nullable
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public static String getSaveId(int id) {
+ Class entityClass = knownEntities.get(Integer.toString(id));
+ if (entityClass == null) {
+ return null;
+ }
+ return shortNames.get(entityClass.getSimpleName());
+ }
+
@Nonnull
public static CompoundTag getDefaultNBT(@Nonnull Vector3 pos) {
return getDefaultNBT(pos, null);
@@ -1054,12 +1148,38 @@ public void saveNBT() {
}
}
+ /**
+ * The name that English name of the type of this entity.
+ */
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public String getOriginalName() {
+ return this.getSaveId();
+ }
+
+ /**
+ * Similar to {@link #getName()}, but if the name is blank or empty it returns the static name instead.
+ */
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public final String getVisibleName() {
+ String name = getName();
+ if (!TextFormat.clean(name).trim().isEmpty()) {
+ return name;
+ } else {
+ return getOriginalName();
+ }
+ }
+
+ /**
+ * The current name used by this entity in the name tag, or the static name if the entity don't have nametag.
+ */
@Nonnull
public String getName() {
if (this.hasCustomName()) {
return this.getNameTag();
} else {
- return this.getSaveId();
+ return this.getOriginalName();
}
}
@@ -1182,6 +1302,17 @@ public boolean attack(EntityDamageEvent source) {
if (source.isCancelled()) {
return false;
}
+
+ // Make fire aspect to set the target in fire before dealing any damage so the target is in fire on death even if killed by the first hit
+ if (source instanceof EntityDamageByEntityEvent) {
+ Enchantment[] enchantments = ((EntityDamageByEntityEvent) source).getWeaponEnchantments();
+ if (enchantments != null) {
+ for (Enchantment enchantment : enchantments) {
+ enchantment.doAttack(((EntityDamageByEntityEvent) source).getDamager(), this);
+ }
+ }
+ }
+
if (this.absorption > 0) { // Damage Absorption
this.setAbsorption(Math.max(0, this.getAbsorption() + source.getDamage(EntityDamageEvent.DamageModifier.ABSORPTION)));
}
@@ -1221,7 +1352,10 @@ public boolean attack(EntityDamageEvent source) {
}
}
}
-
+ Entity attacker = source instanceof EntityDamageByEntityEvent? ((EntityDamageByEntityEvent) source).getDamager() : null;
+ for (SideEffect sideEffect : source.getSideEffects()) {
+ sideEffect.doPreHealthChange(this, source, attacker);
+ }
setHealth(newHealth);
return true;
}
@@ -1305,13 +1439,13 @@ protected boolean checkObstruction(double x, double y, double z) {
double diffY = y - j;
double diffZ = z - k;
- if (!Block.transparent[this.level.getBlockIdAt(i, j, k)]) {
- boolean flag = Block.transparent[this.level.getBlockIdAt(i - 1, j, k)];
- boolean flag1 = Block.transparent[this.level.getBlockIdAt(i + 1, j, k)];
- boolean flag2 = Block.transparent[this.level.getBlockIdAt(i, j - 1, k)];
- boolean flag3 = Block.transparent[this.level.getBlockIdAt(i, j + 1, k)];
- boolean flag4 = Block.transparent[this.level.getBlockIdAt(i, j, k - 1)];
- boolean flag5 = Block.transparent[this.level.getBlockIdAt(i, j, k + 1)];
+ if (!Block.isTransparent(this.level.getBlockIdAt(i, j, k))) {
+ boolean flag = Block.isTransparent(this.level.getBlockIdAt(i - 1, j, k));
+ boolean flag1 = Block.isTransparent(this.level.getBlockIdAt(i + 1, j, k));
+ boolean flag2 = Block.isTransparent(this.level.getBlockIdAt(i, j - 1, k));
+ boolean flag3 = Block.isTransparent(this.level.getBlockIdAt(i, j + 1, k));
+ boolean flag4 = Block.isTransparent(this.level.getBlockIdAt(i, j, k - 1));
+ boolean flag5 = Block.isTransparent(this.level.getBlockIdAt(i, j, k + 1));
int direction = -1;
double limit = 9999;
@@ -1557,9 +1691,11 @@ public void updateMovement() {
this.lastY = this.y;
this.lastZ = this.z;
- this.lastYaw = this.yaw;
this.lastPitch = this.pitch;
+ this.lastYaw = this.yaw;
+ this.lastHeadYaw = this.headYaw;
+ // If you want to achieve headYaw in movement. You can override it by yourself. Changing would break some mob plugins.
this.addMovement(this.x, this.y + this.getBaseOffset(), this.z, this.yaw, this.pitch, this.yaw);
this.positionChanged = true;
} else {
@@ -1589,6 +1725,7 @@ public void addMotion(double motionX, double motionY, double motionZ) {
Server.broadcastPacket(this.hasSpawned.values(), pk);
}
+ @Override
public Vector3 getDirectionVector() {
Vector3 vector = super.getDirectionVector();
return this.temporalVector.setComponents(vector.x, vector.y, vector.z);
@@ -1761,6 +1898,7 @@ public void setAbsorption(float absorption) {
}
}
+ @PowerNukkitOnly
public boolean canBePushed() {
return true;
}
@@ -1819,17 +1957,18 @@ public void fall(float fallDistance) {
return;
}
- float damage = (float) Math.floor(fallDistance - 3 - (this.hasEffect(Effect.JUMP) ? this.getEffect(Effect.JUMP).getAmplifier() + 1 : 0));
Location floorLocation = this.floor();
Block down = this.level.getBlock(floorLocation.down());
- if (damage > 0) {
- if(down instanceof BlockHayBale) {
- damage -= (damage * 0.8f);
- }
- if (down.getId() == BlockID.HONEY_BLOCK) {
+
+ if (!this.isPlayer || level.getGameRules().getBoolean(GameRule.FALL_DAMAGE)) {
+ int jumpBoost = this.hasEffect(Effect.JUMP_BOOST)? (getEffect(Effect.JUMP_BOOST).getAmplifier() + 1) : 0;
+ float damage = (float) Math.floor(fallDistance - 3 - jumpBoost);
+
+ if(down instanceof BlockHayBale || down instanceof BlockHoney) {
damage *= 0.2F;
}
- if (!this.isPlayer || level.getGameRules().getBoolean(GameRule.FALL_DAMAGE)) {
+
+ if (damage > 0) {
this.attack(new EntityDamageEvent(this, DamageCause.FALL, damage));
}
}
@@ -1934,6 +2073,7 @@ public void onStruckByLightning(Entity entity) {
}
}
+ @PowerNukkitOnly
public void onPushByPiston(BlockEntityPistonArm piston) {
}
@@ -1976,11 +2116,13 @@ public Position getPosition() {
return new Position(this.x, this.y, this.z, this.level);
}
+ @Override
@Nonnull
public Location getLocation() {
- return new Location(this.x, this.y, this.z, this.yaw, this.pitch, this.level);
+ return new Location(this.x, this.y, this.z, this.yaw, this.pitch, this.headYaw, this.level);
}
+ @PowerNukkitOnly
public boolean isTouchingWater() {
return hasWaterAt(0) || hasWaterAt(this.getEyeHeight());
}
@@ -2351,12 +2493,30 @@ public boolean setPositionAndRotation(Vector3 pos, double yaw, double pitch) {
return false;
}
+ @Since("1.6.0.0-PN")
+ public boolean setPositionAndRotation(Vector3 pos, double yaw, double pitch, double headYaw) {
+ if (this.setPosition(pos)) {
+ this.setRotation(yaw, pitch, headYaw);
+ return true;
+ }
+
+ return false;
+ }
+
public void setRotation(double yaw, double pitch) {
this.yaw = yaw;
this.pitch = pitch;
this.scheduleUpdate();
}
+ @Since("1.6.0.0-PN")
+ public void setRotation(double yaw, double pitch, double headYaw) {
+ this.yaw = yaw;
+ this.pitch = pitch;
+ this.headYaw = headYaw;
+ this.scheduleUpdate();
+ }
+
/**
* Whether the entity can active pressure plates.
* Used for {@link cn.nukkit.entity.passive.EntityBat}s only.
@@ -2465,7 +2625,7 @@ public boolean teleport(Vector3 pos) {
}
public boolean teleport(Vector3 pos, PlayerTeleportEvent.TeleportCause cause) {
- return this.teleport(Location.fromObject(pos, this.level, this.yaw, this.pitch), cause);
+ return this.teleport(Location.fromObject(pos, this.level, this.yaw, this.pitch, this.headYaw), cause);
}
public boolean teleport(Position pos) {
@@ -2473,7 +2633,7 @@ public boolean teleport(Position pos) {
}
public boolean teleport(Position pos, PlayerTeleportEvent.TeleportCause cause) {
- return this.teleport(Location.fromObject(pos, pos.level, this.yaw, this.pitch), cause);
+ return this.teleport(Location.fromObject(pos, pos.level, this.yaw, this.pitch, this.headYaw), cause);
}
public boolean teleport(Location location) {
@@ -2495,6 +2655,11 @@ public boolean teleport(Location location, PlayerTeleportEvent.TeleportCause cau
to = ev.getTo();
}
+ Entity currentRide = getRiding();
+ if (currentRide != null && !currentRide.dismountEntity(this)) {
+ return false;
+ }
+
this.ySize = 0;
this.setMotion(this.temporalVector.setComponents(0, 0, 0));
@@ -2516,10 +2681,12 @@ public long getId() {
}
public void respawnToAll() {
- for (Player player : this.hasSpawned.values()) {
+ Player[] players = this.hasSpawned.values().toArray(Player.EMPTY_ARRAY);
+ this.hasSpawned.clear();
+
+ for (Player player : players) {
this.spawnTo(player);
}
- this.hasSpawned.clear();
}
public void spawnToAll() {
@@ -2603,14 +2770,20 @@ public boolean setDataProperty(EntityData data) {
}
public boolean setDataProperty(EntityData data, boolean send) {
- if (!Objects.equals(data, this.getDataProperties().get(data.getId()))) {
- this.getDataProperties().put(data);
- if (send) {
- this.sendData(this.hasSpawned.values().toArray(Player.EMPTY_ARRAY), new EntityMetadata().put(this.dataProperties.get(data.getId())));
+ if (Objects.equals(data, this.dataProperties.get(data.getId()))) {
+ return false;
+ }
+
+ this.dataProperties.put(data);
+ if (send) {
+ EntityMetadata metadata = new EntityMetadata();
+ metadata.put(this.dataProperties.get(data.getId()));
+ if (data.getId() == DATA_FLAGS_EXTENDED) {
+ metadata.put(this.dataProperties.get(DATA_FLAGS));
}
- return true;
+ this.sendData(this.hasSpawned.values().toArray(Player.EMPTY_ARRAY), metadata);
}
- return false;
+ return true;
}
public EntityMetadata getDataProperties() {
@@ -2712,6 +2885,7 @@ public Server getServer() {
return server;
}
+ @PowerNukkitOnly
public boolean isUndead() {
return false;
}
diff --git a/src/main/java/cn/nukkit/entity/EntityCreature.java b/src/main/java/cn/nukkit/entity/EntityCreature.java
index 5a57a7a4ff8..8e20e723525 100644
--- a/src/main/java/cn/nukkit/entity/EntityCreature.java
+++ b/src/main/java/cn/nukkit/entity/EntityCreature.java
@@ -23,7 +23,7 @@ public EntityCreature(FullChunk chunk, CompoundTag nbt) {
// Armor stands, when implemented, should also check this.
@Override
public boolean onInteract(Player player, Item item, Vector3 clickedPos) {
- if (item.getId() == Item.NAME_TAG) {
+ if (item.getId() == Item.NAME_TAG && !player.isAdventure()) {
return applyNameTag(player, item);
}
return false;
diff --git a/src/main/java/cn/nukkit/entity/EntityHuman.java b/src/main/java/cn/nukkit/entity/EntityHuman.java
index 240314f7a29..07db9539922 100644
--- a/src/main/java/cn/nukkit/entity/EntityHuman.java
+++ b/src/main/java/cn/nukkit/entity/EntityHuman.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.data.IntPositionEntityData;
import cn.nukkit.entity.data.Skin;
import cn.nukkit.item.Item;
@@ -50,14 +52,21 @@ public float getHeight() {
return 1.8f;
}
+ @Since("1.5.1.0-PN")
+ @PowerNukkitOnly
+ @Override
+ public float getSwimmingHeight() {
+ return getWidth();
+ }
+
@Override
public float getEyeHeight() {
- return 1.62f;
+ return (float)(boundingBox.getMaxY() - boundingBox.getMinY() - 0.18);
}
@Override
protected float getBaseOffset() {
- return this.getEyeHeight();
+ return 1.62f;
}
protected Skin skin;
@@ -210,6 +219,13 @@ protected void initEntity() {
super.initEntity();
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Human";
+ }
+
@Override
public String getName() {
return this.getNameTag();
@@ -361,6 +377,7 @@ public void close() {
}
}
+ @PowerNukkitOnly
@Override
protected void onBlock(Entity entity, boolean animate) {
super.onBlock(entity, animate);
diff --git a/src/main/java/cn/nukkit/entity/EntityLiving.java b/src/main/java/cn/nukkit/entity/EntityLiving.java
index f243aab244a..4b5ba5d1a6d 100644
--- a/src/main/java/cn/nukkit/entity/EntityLiving.java
+++ b/src/main/java/cn/nukkit/entity/EntityLiving.java
@@ -448,16 +448,19 @@ protected boolean blockedByShield(EntityDamageEvent source) {
return true;
}
+ @PowerNukkitOnly
protected void onBlock(Entity entity, boolean animate) {
if (animate) {
getLevel().addSound(this, Sound.ITEM_SHIELD_BLOCK);
}
}
+ @PowerNukkitOnly
public boolean isBlocking() {
return this.getDataFlag(DATA_FLAGS_EXTENDED, DATA_FLAG_BLOCKING);
}
+ @PowerNukkitOnly
public void setBlocking(boolean value) {
this.setDataFlag(DATA_FLAGS_EXTENDED, DATA_FLAG_BLOCKING, value);
}
diff --git a/src/main/java/cn/nukkit/entity/EntityNameable.java b/src/main/java/cn/nukkit/entity/EntityNameable.java
index 0786f1ca83a..2498555eb11 100644
--- a/src/main/java/cn/nukkit/entity/EntityNameable.java
+++ b/src/main/java/cn/nukkit/entity/EntityNameable.java
@@ -58,7 +58,7 @@ default boolean playerApplyNameTag(@Nonnull Player player, @Nonnull Item item, b
this.setNameTagVisible(true);
if(consume && !player.isCreative()) {
- player.getInventory().removeItem(item);
+ item.decrement(1);
}
// Set entity as persistent.
return true;
diff --git a/src/main/java/cn/nukkit/entity/data/ByteEntityData.java b/src/main/java/cn/nukkit/entity/data/ByteEntityData.java
index d20d3a0426c..49cad2581a0 100644
--- a/src/main/java/cn/nukkit/entity/data/ByteEntityData.java
+++ b/src/main/java/cn/nukkit/entity/data/ByteEntityData.java
@@ -13,10 +13,12 @@ public ByteEntityData(int id, int data) {
this.data = data;
}
+ @Override
public Integer getData() {
return data;
}
+ @Override
public void setData(Integer data) {
if (data == null) {
this.data = 0;
@@ -29,4 +31,9 @@ public void setData(Integer data) {
public int getType() {
return Entity.DATA_TYPE_BYTE;
}
+
+ @Override
+ public String toString() {
+ return data + "b";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/data/EntityMetadata.java b/src/main/java/cn/nukkit/entity/data/EntityMetadata.java
index 47dcacc56e2..ffe87dff381 100644
--- a/src/main/java/cn/nukkit/entity/data/EntityMetadata.java
+++ b/src/main/java/cn/nukkit/entity/data/EntityMetadata.java
@@ -5,7 +5,7 @@
import cn.nukkit.math.Vector3;
import cn.nukkit.math.Vector3f;
import cn.nukkit.nbt.tag.CompoundTag;
-import lombok.ToString;
+import lombok.extern.log4j.Log4j2;
import java.util.HashMap;
import java.util.Map;
@@ -13,7 +13,7 @@
/**
* @author MagicDroidX (Nukkit Project)
*/
-@ToString
+@Log4j2
public class EntityMetadata {
private final Map map = new HashMap<>();
@@ -38,6 +38,7 @@ public boolean exists(int id) {
public EntityMetadata put(EntityData data) {
this.map.put(data.getId(), data);
+ //log.info("Updated entity data {}", this::toString);
return this;
}
@@ -121,4 +122,9 @@ public EntityMetadata putString(int id, String value) {
public Map getMap() {
return new HashMap<>(map);
}
+
+ @Override
+ public String toString() {
+ return map.toString();
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/data/FloatEntityData.java b/src/main/java/cn/nukkit/entity/data/FloatEntityData.java
index 12c62f00d45..52aceeb1db1 100644
--- a/src/main/java/cn/nukkit/entity/data/FloatEntityData.java
+++ b/src/main/java/cn/nukkit/entity/data/FloatEntityData.java
@@ -13,10 +13,12 @@ public FloatEntityData(int id, float data) {
this.data = data;
}
+ @Override
public Float getData() {
return data;
}
+ @Override
public void setData(Float data) {
if (data == null) {
this.data = 0;
@@ -30,4 +32,9 @@ public void setData(Float data) {
public int getType() {
return Entity.DATA_TYPE_FLOAT;
}
+
+ @Override
+ public String toString() {
+ return data + "f";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/data/IntEntityData.java b/src/main/java/cn/nukkit/entity/data/IntEntityData.java
index 87dbf695e24..0cafe48ff4d 100644
--- a/src/main/java/cn/nukkit/entity/data/IntEntityData.java
+++ b/src/main/java/cn/nukkit/entity/data/IntEntityData.java
@@ -13,10 +13,12 @@ public IntEntityData(int id, int data) {
this.data = data;
}
+ @Override
public Integer getData() {
return data;
}
+ @Override
public void setData(Integer data) {
if (data == null) {
this.data = 0;
@@ -29,4 +31,9 @@ public void setData(Integer data) {
public int getType() {
return Entity.DATA_TYPE_INT;
}
+
+ @Override
+ public String toString() {
+ return data + "i";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/data/IntPositionEntityData.java b/src/main/java/cn/nukkit/entity/data/IntPositionEntityData.java
index f00b7b391dd..4f37cf0f0a0 100644
--- a/src/main/java/cn/nukkit/entity/data/IntPositionEntityData.java
+++ b/src/main/java/cn/nukkit/entity/data/IntPositionEntityData.java
@@ -41,4 +41,9 @@ public void setData(BlockVector3 data) {
public int getType() {
return Entity.DATA_TYPE_POS;
}
+
+ @Override
+ public String toString() {
+ return "(" + x + ", " + y + ", " + z + ")";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/data/LongEntityData.java b/src/main/java/cn/nukkit/entity/data/LongEntityData.java
index 595c9440a92..25c636b59dc 100644
--- a/src/main/java/cn/nukkit/entity/data/LongEntityData.java
+++ b/src/main/java/cn/nukkit/entity/data/LongEntityData.java
@@ -13,10 +13,12 @@ public LongEntityData(int id, long data) {
this.data = data;
}
+ @Override
public Long getData() {
return data;
}
+ @Override
public void setData(Long data) {
this.data = data;
}
@@ -25,4 +27,9 @@ public void setData(Long data) {
public int getType() {
return Entity.DATA_TYPE_LONG;
}
+
+ @Override
+ public String toString() {
+ return data + "l";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/data/NBTEntityData.java b/src/main/java/cn/nukkit/entity/data/NBTEntityData.java
index 14f5931996d..57507721754 100644
--- a/src/main/java/cn/nukkit/entity/data/NBTEntityData.java
+++ b/src/main/java/cn/nukkit/entity/data/NBTEntityData.java
@@ -28,4 +28,9 @@ public void setData(CompoundTag tag) {
public int getType() {
return Entity.DATA_TYPE_NBT;
}
+
+ @Override
+ public String toString() {
+ return tag.toString();
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/data/ShortEntityData.java b/src/main/java/cn/nukkit/entity/data/ShortEntityData.java
index 0d7ec96758d..9d21779a658 100644
--- a/src/main/java/cn/nukkit/entity/data/ShortEntityData.java
+++ b/src/main/java/cn/nukkit/entity/data/ShortEntityData.java
@@ -13,10 +13,12 @@ public ShortEntityData(int id, int data) {
this.data = data;
}
+ @Override
public Integer getData() {
return data;
}
+ @Override
public void setData(Integer data) {
if (data == null) {
this.data = 0;
@@ -29,4 +31,9 @@ public void setData(Integer data) {
public int getType() {
return Entity.DATA_TYPE_SHORT;
}
+
+ @Override
+ public String toString() {
+ return data + "s";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/data/Skin.java b/src/main/java/cn/nukkit/entity/data/Skin.java
index d0fecd599f5..60272e9aae9 100644
--- a/src/main/java/cn/nukkit/entity/data/Skin.java
+++ b/src/main/java/cn/nukkit/entity/data/Skin.java
@@ -4,9 +4,10 @@
import cn.nukkit.nbt.stream.FastByteArrayOutputStream;
import cn.nukkit.utils.*;
import com.google.common.base.Preconditions;
+import com.nimbusds.jose.shaded.json.JSONObject;
+import com.nimbusds.jose.shaded.json.JSONValue;
+import lombok.EqualsAndHashCode;
import lombok.ToString;
-import net.minidev.json.JSONObject;
-import net.minidev.json.JSONValue;
import java.awt.*;
import java.awt.image.BufferedImage;
@@ -20,6 +21,7 @@
* @author MagicDroidX (Nukkit Project)
*/
@ToString(exclude = {"geometryData", "animationData"})
+@EqualsAndHashCode(exclude = {"fullSkinId", "trusted"})
public class Skin {
private static final int PIXEL_SIZE = 4;
@@ -45,10 +47,12 @@ public class Skin {
private boolean premium;
private boolean persona;
private boolean capeOnClassic;
+ private boolean primaryUser = true;
private String capeId;
private String skinColor = "#0";
private String armSize = "wide";
private boolean trusted = false;
+ private String geometryDataEngineVersion = "";
public boolean isValid() {
return isValidSkin() && isValidResourcePatch();
@@ -235,6 +239,26 @@ public void setCapeOnClassic(boolean capeOnClassic) {
this.capeOnClassic = capeOnClassic;
}
+ @Since("1.5.2.0-PN")
+ public void setPrimaryUser(boolean primaryUser) {
+ this.primaryUser = primaryUser;
+ }
+
+ @Since("1.5.2.0-PN")
+ public boolean isPrimaryUser() {
+ return primaryUser;
+ }
+
+ @Since("1.5.2.0-PN")
+ public void setGeometryDataEngineVersion(String geometryDataEngineVersion) {
+ this.geometryDataEngineVersion = geometryDataEngineVersion;
+ }
+
+ @Since("1.5.2.0-PN")
+ public String getGeometryDataEngineVersion() {
+ return geometryDataEngineVersion;
+ }
+
public boolean isTrusted() {
return trusted;
}
diff --git a/src/main/java/cn/nukkit/entity/data/StringEntityData.java b/src/main/java/cn/nukkit/entity/data/StringEntityData.java
index 0385acdcb6d..a8a4feb88fd 100644
--- a/src/main/java/cn/nukkit/entity/data/StringEntityData.java
+++ b/src/main/java/cn/nukkit/entity/data/StringEntityData.java
@@ -13,10 +13,12 @@ public StringEntityData(int id, String data) {
this.data = data;
}
+ @Override
public String getData() {
return data;
}
+ @Override
public void setData(String data) {
this.data = data;
}
diff --git a/src/main/java/cn/nukkit/entity/data/Vector3fEntityData.java b/src/main/java/cn/nukkit/entity/data/Vector3fEntityData.java
index 07a9cde4fd5..7bdb91e5a66 100644
--- a/src/main/java/cn/nukkit/entity/data/Vector3fEntityData.java
+++ b/src/main/java/cn/nukkit/entity/data/Vector3fEntityData.java
@@ -40,4 +40,9 @@ public void setData(Vector3f data) {
public int getType() {
return Entity.DATA_TYPE_VECTOR3F;
}
+
+ @Override
+ public String toString() {
+ return "(" + x + ", " + y + ", " + z + ")";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityAreaEffectCloud.java b/src/main/java/cn/nukkit/entity/item/EntityAreaEffectCloud.java
index 8b6172f3047..4d5ea81bc0d 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityAreaEffectCloud.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityAreaEffectCloud.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.item;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.EntityLiving;
import cn.nukkit.entity.data.FloatEntityData;
@@ -19,49 +21,60 @@
import java.util.ArrayList;
import java.util.List;
+@PowerNukkitOnly
public class EntityAreaEffectCloud extends Entity {
- public static final int NETWORK_ID = 95;
-
- protected int reapplicationDelay;
- protected int durationOnUse;
- protected float initialRadius;
- protected float radiusOnUse;
- protected int nextApply;
- public List cloudEffects;
+
+ @PowerNukkitOnly public static final int NETWORK_ID = 95;
+
+ @PowerNukkitOnly protected int reapplicationDelay;
+ @PowerNukkitOnly protected int durationOnUse;
+ @PowerNukkitOnly protected float initialRadius;
+ @PowerNukkitOnly protected float radiusOnUse;
+ @PowerNukkitOnly protected int nextApply;
+ @PowerNukkitOnly public List cloudEffects;
private int lastAge;
-
+
+ @PowerNukkitOnly
public EntityAreaEffectCloud(FullChunk chunk, CompoundTag nbt) {
super(chunk, nbt);
}
-
+
+ @PowerNukkitOnly
public int getWaitTime() {
return this.getDataPropertyInt(DATA_AREA_EFFECT_CLOUD_WAITING);
}
-
+
+ @PowerNukkitOnly
public void setWaitTime(int waitTime) {
setWaitTime(waitTime, true);
}
-
+
+ @PowerNukkitOnly
public void setWaitTime(int waitTime, boolean send) {
this.setDataProperty(new IntEntityData(DATA_AREA_EFFECT_CLOUD_WAITING, waitTime), send);
}
-
+
+ @PowerNukkitOnly
public int getPotionId() {
return this.getDataPropertyShort(DATA_POTION_AUX_VALUE);
}
-
+
+ @PowerNukkitOnly
public void setPotionId(int potionId) {
setPotionId(potionId, true);
}
-
+
+ @PowerNukkitOnly
public void setPotionId(int potionId, boolean send) {
this.setDataProperty(new ShortEntityData(DATA_POTION_AUX_VALUE, potionId & 0xFFFF), send);
}
-
+
+ @PowerNukkitOnly
public void recalculatePotionColor() {
recalculatePotionColor(true);
}
-
+
+ @PowerNukkitOnly
public void recalculatePotionColor(boolean send) {
int a;
int r;
@@ -92,103 +105,128 @@ public void recalculatePotionColor(boolean send) {
setPotionColor(a, r, g, b, send);
}
-
+
+ @PowerNukkitOnly
public int getPotionColor() {
return this.getDataPropertyInt(DATA_POTION_COLOR);
}
-
+
+ @PowerNukkitOnly
public void setPotionColor(int alpha, int red, int green, int blue, boolean send) {
setPotionColor(((alpha & 0xff) << 24) | ((red & 0xff) << 16) | ((green & 0xff) << 8) | (blue & 0xff), send);
}
-
+
+ @PowerNukkitOnly
public void setPotionColor(int argp) {
setPotionColor(argp, true);
}
-
+
+ @PowerNukkitOnly
public void setPotionColor(int argp, boolean send) {
this.setDataProperty(new IntEntityData(DATA_POTION_COLOR, argp), send);
}
-
+
+ @PowerNukkitOnly
public int getPickupCount() {
return this.getDataPropertyInt(DATA_PICKUP_COUNT);
}
-
+
+ @PowerNukkitOnly
public void setPickupCount(int pickupCount) {
setPickupCount(pickupCount, true);
}
-
+
+ @PowerNukkitOnly
public void setPickupCount(int pickupCount, boolean send) {
this.setDataProperty(new IntEntityData(DATA_PICKUP_COUNT, pickupCount), send);
- }
-
+ }
+
+ @PowerNukkitOnly
public float getRadiusChangeOnPickup() {
return this.getDataPropertyFloat(DATA_CHANGE_ON_PICKUP);
}
-
+
+ @PowerNukkitOnly
public void setRadiusChangeOnPickup(float radiusChangeOnPickup) {
setRadiusChangeOnPickup(radiusChangeOnPickup, true);
}
-
+
+ @PowerNukkitOnly
public void setRadiusChangeOnPickup(float radiusChangeOnPickup, boolean send) {
this.setDataProperty(new FloatEntityData(DATA_CHANGE_ON_PICKUP, radiusChangeOnPickup), send);
}
-
+
+ @PowerNukkitOnly
public float getRadiusPerTick() {
return this.getDataPropertyFloat(DATA_CHANGE_RATE);
}
-
+
+ @PowerNukkitOnly
public void setRadiusPerTick(float radiusPerTick) {
setRadiusPerTick(radiusPerTick, true);
}
-
+
+ @PowerNukkitOnly
public void setRadiusPerTick(float radiusPerTick, boolean send) {
this.setDataProperty(new FloatEntityData(DATA_CHANGE_RATE, radiusPerTick), send);
}
-
+
+ @PowerNukkitOnly
public long getSpawnTime() {
return this.getDataPropertyInt(DATA_SPAWN_TIME);
}
-
+
+ @PowerNukkitOnly
public void setSpawnTime(long spawnTime) {
setSpawnTime(spawnTime, true);
}
-
+
+ @PowerNukkitOnly
public void setSpawnTime(long spawnTime, boolean send) {
this.setDataProperty(new LongEntityData(DATA_SPAWN_TIME, spawnTime), send);
}
-
+
+ @PowerNukkitOnly
public int getDuration() {
return this.getDataPropertyInt(DATA_DURATION);
}
-
+
+ @PowerNukkitOnly
public void setDuration(int duration) {
setDuration(duration, true);
}
-
+
+ @PowerNukkitOnly
public void setDuration(int duration, boolean send) {
this.setDataProperty(new IntEntityData(DATA_DURATION, duration), send);
}
-
+
+ @PowerNukkitOnly
public float getRadius() {
return this.getDataPropertyFloat(DATA_AREA_EFFECT_CLOUD_RADIUS);
}
-
+
+ @PowerNukkitOnly
public void setRadius(float radius) {
setRadius(radius, true);
}
-
+
+ @PowerNukkitOnly
public void setRadius(float radius, boolean send) {
this.setDataProperty(new FloatEntityData(DATA_AREA_EFFECT_CLOUD_RADIUS, radius), send);
}
-
+
+ @PowerNukkitOnly
public int getParticleId() {
return this.getDataPropertyInt(DATA_AREA_EFFECT_CLOUD_PARTICLE_ID);
}
-
+
+ @PowerNukkitOnly
public void setParticleId(int particleId) {
setParticleId(particleId, true);
}
-
+
+ @PowerNukkitOnly
public void setParticleId(int particleId, boolean send) {
this.setDataProperty(new IntEntityData(DATA_AREA_EFFECT_CLOUD_PARTICLE_ID, particleId), send);
}
@@ -407,4 +445,11 @@ protected float getDrag() {
public int getNetworkId() {
return NETWORK_ID;
}
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Area Effect Cloud";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityArmorStand.java b/src/main/java/cn/nukkit/entity/item/EntityArmorStand.java
index 8ab3acdd9ad..fbc56d80280 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityArmorStand.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityArmorStand.java
@@ -29,7 +29,6 @@
import cn.nukkit.network.protocol.SetEntityDataPacket;
import cn.nukkit.potion.Effect;
-import javax.annotation.Nonnull;
import java.util.Collection;
@PowerNukkitOnly
@@ -438,10 +437,11 @@ public boolean attack(EntityDamageEvent source) {
return true;
}
- @Nonnull
+ @Since("1.5.1.0-PN")
+ @PowerNukkitOnly
@Override
- public String getName() {
- return this.hasCustomName() ? this.getNameTag() : "Armor Stand";
+ public String getOriginalName() {
+ return "Armor Stand";
}
@Override
diff --git a/src/main/java/cn/nukkit/entity/item/EntityBoat.java b/src/main/java/cn/nukkit/entity/item/EntityBoat.java
index 9e9ad88b6a9..02afadd3207 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityBoat.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityBoat.java
@@ -47,11 +47,6 @@ public class EntityBoat extends EntityVehicle {
public static final int NETWORK_ID = 90;
- @Deprecated @DeprecationDetails(since = "1.4.0.0-PN", by = "Cloudburst Nukkit",
- reason = "Was removed because it is already defined in Entity.DATA_VARIANT",
- replaceWith = "Entity.DATA_VARIANT")
- @PowerNukkitOnly public static final int DATA_WOOD_ID = 20;
-
public static final Vector3f RIDER_PLAYER_OFFSET = new Vector3f(0, 1.02001f, 0);
public static final Vector3f RIDER_OFFSET = new Vector3f(0, -0.2f, 0);
@@ -68,9 +63,9 @@ public class EntityBoat extends EntityVehicle {
protected boolean sinking = true;
private int ticksInWater;
private final Set ignoreCollision = new HashSet<>(2);
-
+
@Deprecated
- @DeprecationDetails(since = "1.4.0.0-PN", by = "PowerNukkit",
+ @DeprecationDetails(since = "1.4.0.0-PN", by = "PowerNukkit",
reason = "Unreliable direct field access", replaceWith = "getVariant(), setVariant(int)")
@Since("1.4.0.0-PN") public int woodID;
@@ -346,6 +341,7 @@ private boolean computeBuoyancy(double waterDiff) {
return hasUpdated;
}
+ @Override
public void updatePassengers() {
updatePassengers(false);
}
@@ -454,8 +450,8 @@ public boolean mountEntity(Entity entity, byte mode) {
entity.setDataProperty(new ByteEntityData(DATA_RIDER_ROTATION_LOCKED, 1));
entity.setDataProperty(new FloatEntityData(DATA_RIDER_MAX_ROTATION, 90));
- entity.setDataProperty(new FloatEntityData(DATA_RIDER_ROTATION_OFFSET, -90));
entity.setDataProperty(new FloatEntityData(DATA_RIDER_MIN_ROTATION, this.passengers.indexOf(entity) == 1 ? -90 : 1));
+ entity.setDataProperty(new FloatEntityData(DATA_RIDER_ROTATION_OFFSET, -90));
entity.setRotation(yaw, entity.pitch);
entity.updateMovement();
}
@@ -581,4 +577,16 @@ public void setVariant(int variant) {
this.woodID = variant;
this.dataProperties.putInt(DATA_VARIANT, variant);
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Boat";
+ }
+
+ public void onInput(double x, double y, double z, double yaw) {
+ this.setPositionAndRotation(this.temporalVector.setComponents(x, y - this.getBaseOffset(), z), yaw % 360, 0);
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityEndCrystal.java b/src/main/java/cn/nukkit/entity/item/EntityEndCrystal.java
index ab187e07155..65d7faaaa94 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityEndCrystal.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityEndCrystal.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.item;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.EntityExplosive;
import cn.nukkit.event.entity.EntityDamageEvent;
@@ -107,4 +109,12 @@ public boolean showBase() {
public void setShowBase(boolean value) {
this.setDataFlag(DATA_FLAGS, DATA_FLAG_SHOWBASE, value);
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Ender Crystal";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityExpBottle.java b/src/main/java/cn/nukkit/entity/item/EntityExpBottle.java
index d732c8d797d..88273cfe9ff 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityExpBottle.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityExpBottle.java
@@ -1,6 +1,7 @@
package cn.nukkit.entity.item;
-import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.projectile.EntityProjectile;
import cn.nukkit.level.Sound;
@@ -98,9 +99,17 @@ public void dropXp() {
this.getLevel().dropExpOrb(this, ThreadLocalRandom.current().nextInt(3, 12));
}
- @PowerNukkitDifference(info = "Using new method to play sounds", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
protected void addHitEffect() {
this.getLevel().addSound(this, Sound.RANDOM_GLASS);
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Bottle o' Enchanting";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityFallingBlock.java b/src/main/java/cn/nukkit/entity/item/EntityFallingBlock.java
index 52522f83a99..32c8770a6f8 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityFallingBlock.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityFallingBlock.java
@@ -1,11 +1,16 @@
package cn.nukkit.entity.item;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockLava;
+import cn.nukkit.block.BlockID;
import cn.nukkit.block.BlockLiquid;
import cn.nukkit.entity.Entity;
+import cn.nukkit.entity.EntityLiving;
import cn.nukkit.entity.data.IntEntityData;
import cn.nukkit.event.entity.EntityBlockChangeEvent;
+import cn.nukkit.event.entity.EntityDamageByBlockEvent;
import cn.nukkit.event.entity.EntityDamageEvent;
import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
import cn.nukkit.item.Item;
@@ -56,12 +61,12 @@ protected float getBaseOffset() {
@Override
public boolean canCollide() {
- return false;
+ return blockId == BlockID.ANVIL;
}
protected int blockId;
protected int damage;
- protected boolean breakOnLava;
+ protected @PowerNukkitOnly boolean breakOnLava;
public EntityFallingBlock(FullChunk chunk, CompoundTag nbt) {
super(chunk, nbt);
@@ -97,8 +102,9 @@ protected void initEntity() {
setDataProperty(new IntEntityData(DATA_VARIANT, GlobalBlockPalette.getOrCreateRuntimeId(this.getBlock(), this.getDamage())));
}
+ @Override
public boolean canCollideWith(Entity entity) {
- return false;
+ return blockId == BlockID.ANVIL;
}
@Override
@@ -136,6 +142,15 @@ public boolean onUpdate(int currentTick) {
motionZ *= friction;
Vector3 pos = (new Vector3(x - 0.5, y, z - 0.5)).round();
+
+ if (this.age > 600){
+ close();
+ if (this.level.getGameRules().getBoolean(GameRule.DO_ENTITY_DROPS)) {
+ getLevel().dropItem(this, Block.get(this.getBlock(), this.getDamage()).toItem());
+ }
+ level.addParticle(new DestroyBlockParticle(pos, Block.get(getBlock(), getDamage())));
+ return true;
+ }
if (breakOnLava && level.getBlock(pos.subtract(0, 1, 0)) instanceof BlockLava) {
close();
@@ -189,6 +204,13 @@ public boolean onUpdate(int currentTick) {
if (event.getTo().getId() == Item.ANVIL) {
getLevel().addLevelEvent(block, LevelEventPacket.EVENT_SOUND_ANVIL_FALL);
+
+ Entity[] e = level.getCollidingEntities(this.getBoundingBox(), this);
+ for (Entity entity : e) {
+ if (entity instanceof EntityLiving && fallDistance > 0) {
+ entity.attack(new EntityDamageByBlockEvent(event.getTo(), entity, DamageCause.FALLING_BLOCK, Math.min(40f, Math.max(0f, fallDistance * 2f))));
+ }
+ }
}
}
}
@@ -226,4 +248,19 @@ public void saveNBT() {
public boolean canBeMovedByCurrents() {
return false;
}
+
+ @Override
+ public void resetFallDistance() {
+ if (!this.closed) { // For falling anvil: do not reset fall distance before dealing damage to entities
+ this.highestPosition = this.y;
+ }
+ }
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Falling Block";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityFirework.java b/src/main/java/cn/nukkit/entity/item/EntityFirework.java
index 8390b493a25..a5505ce87c3 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityFirework.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityFirework.java
@@ -2,6 +2,8 @@
import cn.nukkit.Server;
import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.data.ByteEntityData;
@@ -183,4 +185,12 @@ public float getWidth() {
public float getHeight() {
return 0.25f;
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Firework Rocket";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityFishingHook.java b/src/main/java/cn/nukkit/entity/item/EntityFishingHook.java
index 4c1b5b7c050..dca7f1b9c65 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityFishingHook.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityFishingHook.java
@@ -3,6 +3,8 @@
import cn.nukkit.Player;
import cn.nukkit.Server;
import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.data.LongEntityData;
@@ -14,6 +16,7 @@
import cn.nukkit.event.entity.ProjectileHitEvent;
import cn.nukkit.event.player.PlayerFishEvent;
import cn.nukkit.item.Item;
+import cn.nukkit.item.enchantment.Enchantment;
import cn.nukkit.item.randomitem.Fishing;
import cn.nukkit.level.MovingObjectPosition;
import cn.nukkit.level.format.FullChunk;
@@ -24,9 +27,10 @@
import cn.nukkit.nbt.NBTIO;
import cn.nukkit.nbt.tag.CompoundTag;
import cn.nukkit.network.protocol.AddEntityPacket;
+import cn.nukkit.network.protocol.DataPacket;
import cn.nukkit.network.protocol.EntityEventPacket;
-import java.util.Random;
+import java.util.Collection;
import java.util.concurrent.ThreadLocalRandom;
@@ -37,15 +41,14 @@ public class EntityFishingHook extends EntityProjectile {
public static final int NETWORK_ID = 77;
- public static final int WAIT_CHANCE = 120;
- public static final int CHANCE = 40;
-
- public boolean chance = false;
- public int waitChance = WAIT_CHANCE * 2;
+ public int waitChance = 120;
+ public int waitTimer = 240;
public boolean attracted = false;
public int attractTimer = 0;
public boolean caught = false;
- public int coughtTimer = 0;
+ public int caughtTimer = 0;
+ @SuppressWarnings("java:S1845")
+ public boolean canCollide = true;
public Vector3 fish = null;
@@ -57,14 +60,9 @@ public EntityFishingHook(FullChunk chunk, CompoundTag nbt) {
public EntityFishingHook(FullChunk chunk, CompoundTag nbt, Entity shootingEntity) {
super(chunk, nbt, shootingEntity);
- }
-
- @Override
- protected void initEntity() {
- super.initEntity();
// https://github.com/PowerNukkit/PowerNukkit/issues/267
- if (age > 0) {
- close();
+ if (this.age > 0) {
+ this.close();
}
}
@@ -98,6 +96,11 @@ public float getDrag() {
return 0.04f;
}
+ @Override
+ public boolean canCollide() {
+ return this.canCollide;
+ }
+
@Override
public boolean onUpdate(int currentTick) {
boolean hasUpdate = false;
@@ -118,7 +121,8 @@ public boolean onUpdate(int currentTick) {
return false;
}
- if (this.isInsideOfWater()) {
+ boolean inWater = this.isInsideOfWater();
+ if (inWater) {
this.motionX = 0;
this.motionY -= getGravity() * -0.04;
this.motionZ = 0;
@@ -131,37 +135,41 @@ public boolean onUpdate(int currentTick) {
hasUpdate = true;
}
- Random random = new Random();
-
- if (this.isInsideOfWater()) {
+ if (inWater) {
+ if (this.waitTimer == 240) {
+ this.waitTimer = this.waitChance << 1;
+ } else if (this.waitTimer == 360) {
+ this.waitTimer = this.waitChance * 3;
+ }
if (!this.attracted) {
- if (this.waitChance > 0) {
- --this.waitChance;
+ if (this.waitTimer > 0) {
+ --this.waitTimer;
}
- if (this.waitChance == 0) {
+ if (this.waitTimer == 0) {
+ ThreadLocalRandom random = ThreadLocalRandom.current();
if (random.nextInt(100) < 90) {
this.attractTimer = (random.nextInt(40) + 20);
this.spawnFish();
this.caught = false;
this.attracted = true;
} else {
- this.waitChance = WAIT_CHANCE;
+ this.waitTimer = this.waitChance;
}
}
} else if (!this.caught) {
if (this.attractFish()) {
- this.coughtTimer = (random.nextInt(20) + 30);
+ this.caughtTimer = (ThreadLocalRandom.current().nextInt(20) + 30);
this.fishBites();
this.caught = true;
}
} else {
- if (this.coughtTimer > 0) {
- --this.coughtTimer;
+ if (this.caughtTimer > 0) {
+ --this.caughtTimer;
}
- if (this.coughtTimer == 0) {
+ if (this.caughtTimer == 0) {
this.attracted = false;
this.caught = false;
- this.waitChance = WAIT_CHANCE * 3;
+ this.waitTimer = this.waitChance * 3;
}
}
}
@@ -180,22 +188,24 @@ public int getWaterHeight() {
}
public void fishBites() {
+ Collection viewers = this.getViewers().values();
+
EntityEventPacket pk = new EntityEventPacket();
pk.eid = this.getId();
pk.event = EntityEventPacket.FISH_HOOK_HOOK;
- Server.broadcastPacket(this.getViewers().values(), pk);
+ Server.broadcastPacket(viewers, pk);
EntityEventPacket bubblePk = new EntityEventPacket();
bubblePk.eid = this.getId();
bubblePk.event = EntityEventPacket.FISH_HOOK_BUBBLE;
- Server.broadcastPacket(this.getViewers().values(), bubblePk);
+ Server.broadcastPacket(viewers, bubblePk);
EntityEventPacket teasePk = new EntityEventPacket();
teasePk.eid = this.getId();
teasePk.event = EntityEventPacket.FISH_HOOK_TEASE;
- Server.broadcastPacket(this.getViewers().values(), teasePk);
+ Server.broadcastPacket(viewers, teasePk);
- Random random = new Random();
+ ThreadLocalRandom random = ThreadLocalRandom.current();
for (int i = 0; i < 5; i++) {
this.level.addParticle(new BubbleParticle(this.setComponents(
this.x + random.nextDouble() * 0.5 - 0.25,
@@ -206,7 +216,7 @@ public void fishBites() {
}
public void spawnFish() {
- Random random = new Random();
+ ThreadLocalRandom random = ThreadLocalRandom.current();
this.fish = new Vector3(
this.x + (random.nextDouble() * 1.2 + 1) * (random.nextBoolean() ? -1 : 1),
this.getWaterHeight(),
@@ -221,14 +231,11 @@ public boolean attractFish() {
this.fish.y,
this.fish.z + (this.z - this.fish.z) * multiply
);
- if (new Random().nextInt(100) < 85) {
+ if (ThreadLocalRandom.current().nextInt(100) < 85) {
this.level.addParticle(new WaterParticle(this.fish));
}
double dist = Math.abs(Math.sqrt(this.x * this.x + this.z * this.z) - Math.sqrt(this.fish.x * this.fish.x + this.fish.z * this.fish.z));
- if (dist < 0.15) {
- return true;
- }
- return false;
+ return dist < 0.15;
}
@PowerNukkitDifference(since = "1.4.0.0-PN", info = "May create custom EntityItem")
@@ -247,8 +254,8 @@ public void reelLine() {
EntityItem itemEntity = (EntityItem) Entity.createEntity(EntityItem.NETWORK_ID,
this.level.getChunk((int) this.x >> 4, (int) this.z >> 4, true),
Entity.getDefaultNBT(
- new Vector3(this.x, this.getWaterHeight(), this.z),
- event.getMotion(), ThreadLocalRandom.current().nextFloat() * 360,
+ new Vector3(this.x, this.getWaterHeight(), this.z),
+ event.getMotion(), ThreadLocalRandom.current().nextFloat() * 360,
0
).putCompound("Item", NBTIO.putItemHelper(event.getLoot()))
.putShort("Health", 5)
@@ -265,7 +272,7 @@ public void reelLine() {
}
@Override
- public void spawnTo(Player player) {
+ protected DataPacket createAddEntityPacket() {
AddEntityPacket pk = new AddEntityPacket();
pk.entityRuntimeId = this.getId();
pk.entityUniqueId = this.getId();
@@ -284,13 +291,7 @@ public void spawnTo(Player player) {
ownerId = this.shootingEntity.getId();
}
pk.metadata = this.dataProperties.putLong(DATA_OWNER_EID, ownerId);
- player.dataPacket(pk);
- super.spawnTo(player);
- }
-
- @Override
- public boolean canCollide() {
- return getDataPropertyLong(DATA_TARGET_EID) == 0L;
+ return pk;
}
@Override
@@ -306,7 +307,30 @@ public void onCollideWithEntity(Entity entity) {
}
if (entity.attack(ev)) {
- setDataProperty(new LongEntityData(DATA_TARGET_EID, entity.getId()));
+ this.setTarget(entity.getId());
+ }
+ }
+
+ @Since("1.6.0.0-PN")
+ public void checkLure() {
+ if (rod != null) {
+ Enchantment ench = rod.getEnchantment(Enchantment.ID_LURE);
+ if (ench != null) {
+ this.waitChance = 120 - (25 * ench.getLevel());
+ }
}
}
+
+ @Since("1.6.0.0-PN")
+ public void setTarget(long eid) {
+ this.setDataProperty(new LongEntityData(DATA_TARGET_EID, eid));
+ this.canCollide = eid == 0;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Fishing Hook";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityItem.java b/src/main/java/cn/nukkit/entity/item/EntityItem.java
index b82c62d98a7..cb52ec5eb1b 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityItem.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityItem.java
@@ -2,6 +2,8 @@
import cn.nukkit.Server;
import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.block.BlockID;
import cn.nukkit.entity.Entity;
import cn.nukkit.event.entity.EntityDamageEvent;
@@ -20,9 +22,8 @@
* @author MagicDroidX
*/
public class EntityItem extends Entity {
- public static final int NETWORK_ID = 64;
- public static final int DATA_SOURCE_ID = 17;
+ public static final int NETWORK_ID = 64;
public EntityItem(FullChunk chunk, CompoundTag nbt) {
super(chunk, nbt);
@@ -288,9 +289,22 @@ public void saveNBT() {
}
}
+ @Since("1.5.1.0-PN")
+ @PowerNukkitOnly
+ @Override
+ public String getOriginalName() {
+ return "Item";
+ }
+
@Override
public String getName() {
- return this.hasCustomName() ? this.getNameTag() : (this.item.hasCustomName() ? this.item.getCustomName() : this.item.getName());
+ if (this.hasCustomName()) {
+ return getNameTag();
+ }
+ if (item == null) {
+ return getOriginalName();
+ }
+ return item.count + "x " + (this.item.hasCustomName() ? this.item.getCustomName() : this.item.getName());
}
public Item getItem() {
diff --git a/src/main/java/cn/nukkit/entity/item/EntityMinecartChest.java b/src/main/java/cn/nukkit/entity/item/EntityMinecartChest.java
index e1e7e4d999b..71bffa1142c 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityMinecartChest.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityMinecartChest.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.item;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
import cn.nukkit.entity.Entity;
import cn.nukkit.inventory.InventoryHolder;
@@ -28,8 +30,10 @@ public EntityMinecartChest(FullChunk chunk, CompoundTag nbt) {
setDisplayBlock(Block.get(Block.CHEST), false);
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return getType().getName();
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityMinecartEmpty.java b/src/main/java/cn/nukkit/entity/item/EntityMinecartEmpty.java
index 3b1b5c46556..57c012fb4fb 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityMinecartEmpty.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityMinecartEmpty.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.item;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.EntityLiving;
import cn.nukkit.entity.passive.EntityWaterAnimal;
@@ -25,8 +27,10 @@ public EntityMinecartEmpty(FullChunk chunk, CompoundTag nbt) {
super(chunk, nbt);
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return getType().getName();
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityMinecartHopper.java b/src/main/java/cn/nukkit/entity/item/EntityMinecartHopper.java
index 6a76cd09aee..b2ab7955545 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityMinecartHopper.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityMinecartHopper.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.item;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
import cn.nukkit.entity.Entity;
import cn.nukkit.inventory.InventoryHolder;
@@ -24,8 +26,10 @@ public EntityMinecartHopper(FullChunk chunk, CompoundTag nbt) {
setDisplayBlock(Block.get(Block.HOPPER_BLOCK), false);
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return getType().getName();
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityMinecartTNT.java b/src/main/java/cn/nukkit/entity/item/EntityMinecartTNT.java
index 04aa51112d0..81fc4cb2f90 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityMinecartTNT.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityMinecartTNT.java
@@ -2,6 +2,8 @@
import cn.nukkit.Player;
import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockID;
import cn.nukkit.entity.Entity;
@@ -117,8 +119,10 @@ public void dropItem() {
level.dropItem(this, new ItemMinecartTNT());
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return getType().getName();
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityPainting.java b/src/main/java/cn/nukkit/entity/item/EntityPainting.java
index fd2fb9004ad..dbe31b23522 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityPainting.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityPainting.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.item;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.blockentity.BlockEntityPistonArm;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.EntityHanging;
@@ -133,6 +135,7 @@ public void saveNBT() {
this.namedTag.putString("Motive", this.motive.title);
}
+ @PowerNukkitOnly
@Override
public void onPushByPiston(BlockEntityPistonArm piston) {
if (this.level.getGameRules().getBoolean(GameRule.DO_ENTITY_DROPS)) {
@@ -196,4 +199,12 @@ public enum Motive {
this.height = height;
}
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Painting";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityPotion.java b/src/main/java/cn/nukkit/entity/item/EntityPotion.java
index 99e5b513698..211fcd1ea40 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityPotion.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityPotion.java
@@ -1,6 +1,7 @@
package cn.nukkit.entity.item;
-import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.projectile.EntityProjectile;
import cn.nukkit.event.potion.PotionCollideEvent;
@@ -21,6 +22,10 @@ public class EntityPotion extends EntityProjectile {
public static final int DATA_POTION_ID = 37;
+ @PowerNukkitOnly
+ @Since("FUTURE")
+ public static final String NBT_POTION_ID = "PotionId";
+
public int potionId;
public EntityPotion(FullChunk chunk, CompoundTag nbt) {
@@ -35,7 +40,7 @@ public EntityPotion(FullChunk chunk, CompoundTag nbt, Entity shootingEntity) {
protected void initEntity() {
super.initEntity();
- potionId = this.namedTag.getShort("PotionId");
+ potionId = this.namedTag.getShort(NBT_POTION_ID);
this.dataProperties.putShort(DATA_POTION_AUX_VALUE, this.potionId);
@@ -89,7 +94,7 @@ public void onCollideWithEntity(Entity entity) {
this.splash(entity);
}
- @PowerNukkitDifference(info = "Using new method to play sounds", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
protected void splash(Entity collidedWith) {
Potion potion = Potion.getPotion(this.potionId);
PotionCollideEvent event = new PotionCollideEvent(potion, this);
@@ -162,4 +167,12 @@ public boolean onUpdate(int currentTick) {
this.timing.stopTiming();
return hasUpdate;
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Potion";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityPotionLingering.java b/src/main/java/cn/nukkit/entity/item/EntityPotionLingering.java
index 12ac555c364..287e856cd8a 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityPotionLingering.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityPotionLingering.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.item;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -9,14 +11,18 @@
import cn.nukkit.potion.Effect;
import cn.nukkit.potion.Potion;
+@PowerNukkitOnly
public class EntityPotionLingering extends EntityPotion {
-
+
+ @PowerNukkitOnly
public static final int NETWORK_ID = 101;
-
+
+ @PowerNukkitOnly
public EntityPotionLingering(FullChunk chunk, CompoundTag nbt) {
super(chunk, nbt);
}
-
+
+ @PowerNukkitOnly
public EntityPotionLingering(FullChunk chunk, CompoundTag nbt, Entity shootingEntity) {
super(chunk, nbt, shootingEntity);
}
@@ -27,6 +33,7 @@ protected void initEntity() {
setDataFlag(DATA_FLAGS, DATA_FLAG_LINGER, true);
}
+ @PowerNukkitOnly
@Override
protected void splash(Entity collidedWith) {
super.splash(collidedWith);
@@ -43,7 +50,7 @@ protected void splash(Entity collidedWith) {
.add(new DoubleTag("", 0))
.add(new DoubleTag("", 0))
)
- .putShort("PotionId", potionId)
+ .putShort(NBT_POTION_ID, potionId)
);
Effect effect = Potion.getEffect(potionId, true);
@@ -53,4 +60,12 @@ protected void splash(Entity collidedWith) {
entity.spawnToAll();
}
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Lingering Potion";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityPrimedTNT.java b/src/main/java/cn/nukkit/entity/item/EntityPrimedTNT.java
index 1ad7df10780..15a615671ab 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityPrimedTNT.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityPrimedTNT.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.item;
import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.EntityExplosive;
import cn.nukkit.entity.data.IntEntityData;
@@ -78,6 +80,7 @@ public boolean attack(EntityDamageEvent source) {
return source.getCause() == DamageCause.VOID && super.attack(source);
}
+ @Override
@PowerNukkitDifference(info = "Using new method to play sounds", since = "1.4.0.0-PN")
protected void initEntity() {
super.initEntity();
@@ -95,15 +98,18 @@ protected void initEntity() {
}
+ @Override
public boolean canCollideWith(Entity entity) {
return false;
}
+ @Override
public void saveNBT() {
super.saveNBT();
namedTag.putByte("Fuse", fuse);
}
+ @Override
public boolean onUpdate(int currentTick) {
if (closed) {
@@ -161,6 +167,7 @@ public boolean onUpdate(int currentTick) {
return hasUpdate || fuse >= 0 || Math.abs(motionX) > 0.00001 || Math.abs(motionY) > 0.00001 || Math.abs(motionZ) > 0.00001;
}
+ @Override
public void explode() {
EntityExplosionPrimeEvent event = new EntityExplosionPrimeEvent(this, 4);
server.getPluginManager().callEvent(event);
@@ -178,4 +185,12 @@ public void explode() {
public Entity getSource() {
return source;
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Block of TNT";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/item/EntityXPOrb.java b/src/main/java/cn/nukkit/entity/item/EntityXPOrb.java
index 94bbb987fbd..fc8b5ba4e05 100644
--- a/src/main/java/cn/nukkit/entity/item/EntityXPOrb.java
+++ b/src/main/java/cn/nukkit/entity/item/EntityXPOrb.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.item;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
import cn.nukkit.event.entity.EntityDamageEvent;
import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
@@ -264,4 +266,12 @@ public static List splitIntoOrbSizes(int amount) {
return result;
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Experience Orb";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityBlaze.java b/src/main/java/cn/nukkit/entity/mob/EntityBlaze.java
index 0b258344e6e..065e6e4af47 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityBlaze.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityBlaze.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -36,11 +38,14 @@ public float getHeight() {
return 1.8f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Blaze";
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityCaveSpider.java b/src/main/java/cn/nukkit/entity/mob/EntityCaveSpider.java
index a9e77083bb4..2affa521617 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityCaveSpider.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityCaveSpider.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntityArthropod;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -37,11 +39,14 @@ public float getHeight() {
return 0.5f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
- return "CaveSpider";
+ public String getOriginalName() {
+ return "Cave Spider";
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityCreeper.java b/src/main/java/cn/nukkit/entity/mob/EntityCreeper.java
index 52bf242f46c..dc1ad16e59c 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityCreeper.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityCreeper.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.data.ByteEntityData;
import cn.nukkit.entity.weather.EntityLightningStrike;
@@ -67,6 +69,7 @@ public void setPowered(boolean powered) {
}
}
+ @Override
public void onStruckByLightning(Entity entity) {
this.setPowered(true);
}
@@ -81,8 +84,10 @@ protected void initEntity() {
this.setMaxHealth(20);
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Creeper";
}
@@ -94,6 +99,7 @@ public Item[] getDrops() {
return Item.EMPTY_ARRAY;
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityDrowned.java b/src/main/java/cn/nukkit/entity/mob/EntityDrowned.java
index 50ea237121a..b9b093cf33f 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityDrowned.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityDrowned.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntitySmite;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
@@ -38,8 +40,10 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Drowned";
}
@@ -48,11 +52,13 @@ public Item[] getDrops() {
return new Item[]{Item.get(Item.ROTTEN_FLESH)};
}
+ @PowerNukkitOnly
@Override
public boolean isUndead() {
return true;
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityElderGuardian.java b/src/main/java/cn/nukkit/entity/mob/EntityElderGuardian.java
index a34343ecf58..6dab4e23621 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityElderGuardian.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityElderGuardian.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -37,11 +39,14 @@ public float getHeight() {
return 1.99f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Elder Guardian";
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityEnderDragon.java b/src/main/java/cn/nukkit/entity/mob/EntityEnderDragon.java
index 9bcd0b49e76..cf02386d963 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityEnderDragon.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityEnderDragon.java
@@ -2,6 +2,7 @@
import cn.nukkit.Player;
import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -52,8 +53,10 @@ public boolean applyNameTag(Item item) {
return false;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
- return "EnderDragon";
+ public String getOriginalName() {
+ return "Ender Dragon";
}
}
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityEnderman.java b/src/main/java/cn/nukkit/entity/mob/EntityEnderman.java
index c9a449d7266..27b8a9b3b85 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityEnderman.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityEnderman.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -36,11 +38,14 @@ public float getHeight() {
return 2.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Enderman";
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return this.getDataPropertyBoolean(DATA_FLAG_ANGRY);
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityEndermite.java b/src/main/java/cn/nukkit/entity/mob/EntityEndermite.java
index 8b57d709ce1..a4eca36fde6 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityEndermite.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityEndermite.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntityArthropod;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -37,11 +39,14 @@ public float getHeight() {
return 0.3f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Endermite";
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityEvoker.java b/src/main/java/cn/nukkit/entity/mob/EntityEvoker.java
index 36785c37c1c..d4f0c2055db 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityEvoker.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityEvoker.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -36,11 +38,14 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Evoker";
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityGhast.java b/src/main/java/cn/nukkit/entity/mob/EntityGhast.java
index e2c159c8f2c..b7cd44009d5 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityGhast.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityGhast.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.mob;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -35,8 +37,10 @@ public float getHeight() {
return 4;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Ghast";
}
}
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityGuardian.java b/src/main/java/cn/nukkit/entity/mob/EntityGuardian.java
index e00caa67e67..3ce38363a5b 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityGuardian.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityGuardian.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -26,8 +28,10 @@ public void initEntity() {
this.setMaxHealth(30);
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Guardian";
}
@@ -41,6 +45,7 @@ public float getHeight() {
return 0.85f;
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityHoglin.java b/src/main/java/cn/nukkit/entity/mob/EntityHoglin.java
index dc4eb16ab36..3213b93f2b3 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityHoglin.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityHoglin.java
@@ -47,11 +47,14 @@ public float getHeight() {
return 0.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Hoglin";
}
+ @PowerNukkitOnly
@Override
public boolean isBaby() {
return this.getDataFlag(DATA_FLAGS, DATA_FLAG_BABY);
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityHusk.java b/src/main/java/cn/nukkit/entity/mob/EntityHusk.java
index 3c27c89302f..6a0a4238ae4 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityHusk.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityHusk.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntitySmite;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -37,16 +39,20 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Husk";
}
+ @PowerNukkitOnly
@Override
public boolean isUndead() {
return true;
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityIronGolem.java b/src/main/java/cn/nukkit/entity/mob/EntityIronGolem.java
index 92f23d7a7d3..a18081cb63c 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityIronGolem.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityIronGolem.java
@@ -26,7 +26,6 @@
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
-import javax.annotation.Nonnull;
import java.util.concurrent.ThreadLocalRandom;
/**
@@ -51,9 +50,10 @@ public int getNetworkId() {
return NETWORK_ID;
}
- @Nonnull
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Iron Golem";
}
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityMagmaCube.java b/src/main/java/cn/nukkit/entity/mob/EntityMagmaCube.java
index 14e85f22c72..522a383117d 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityMagmaCube.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityMagmaCube.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.mob;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -35,8 +37,10 @@ public float getHeight() {
return 2.04f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Magma Cube";
}
}
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityPhantom.java b/src/main/java/cn/nukkit/entity/mob/EntityPhantom.java
index 820e46f435e..71b7be08c6e 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityPhantom.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityPhantom.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntitySmite;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
@@ -38,8 +40,10 @@ public float getHeight() {
return 0.5f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Phantom";
}
@@ -48,11 +52,13 @@ public Item[] getDrops() {
return new Item[]{Item.get(470)};
}
+ @PowerNukkitOnly
@Override
public boolean isUndead() {
return true;
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityPiglin.java b/src/main/java/cn/nukkit/entity/mob/EntityPiglin.java
index 6e2f1e81c3e..0e554406679 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityPiglin.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityPiglin.java
@@ -1,6 +1,7 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.EntityAgeable;
@@ -40,16 +41,20 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Piglin";
}
+ @PowerNukkitOnly
@Override
public boolean isBaby() {
return this.getDataFlag(DATA_FLAGS, Entity.DATA_FLAG_BABY);
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return !this.isBaby()/*TODO: Should this check player's golden armor?*/;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityPiglinBrute.java b/src/main/java/cn/nukkit/entity/mob/EntityPiglinBrute.java
index 0cfa8101738..5e8ff2d7561 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityPiglinBrute.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityPiglinBrute.java
@@ -45,13 +45,16 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Piglin Brute";
}
}
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityPillager.java b/src/main/java/cn/nukkit/entity/mob/EntityPillager.java
index c05402f8203..6c169d2424e 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityPillager.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityPillager.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -33,11 +35,14 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Pillager";
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityRavager.java b/src/main/java/cn/nukkit/entity/mob/EntityRavager.java
index 39c14973e5a..848d4861568 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityRavager.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityRavager.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -33,11 +35,14 @@ public float getWidth() {
return 1.2f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Ravager";
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityShulker.java b/src/main/java/cn/nukkit/entity/mob/EntityShulker.java
index 02e176c1d38..e1ae3596206 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityShulker.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityShulker.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.mob;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -35,8 +37,10 @@ public float getHeight() {
return 1f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Shulker";
}
}
diff --git a/src/main/java/cn/nukkit/entity/mob/EntitySilverfish.java b/src/main/java/cn/nukkit/entity/mob/EntitySilverfish.java
index 8713c5949a1..2817468138b 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntitySilverfish.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntitySilverfish.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntityArthropod;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -21,8 +23,10 @@ public EntitySilverfish(FullChunk chunk, CompoundTag nbt) {
super(chunk, nbt);
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Silverfish";
}
@@ -42,6 +46,7 @@ public void initEntity() {
this.setMaxHealth(8);
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntitySkeleton.java b/src/main/java/cn/nukkit/entity/mob/EntitySkeleton.java
index 32aaeb241a7..e14d6765203 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntitySkeleton.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntitySkeleton.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntitySmite;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
@@ -38,8 +40,10 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Skeleton";
}
@@ -48,11 +52,13 @@ public Item[] getDrops() {
return new Item[]{Item.get(Item.BONE, Item.ARROW)};
}
+ @PowerNukkitOnly
@Override
public boolean isUndead() {
return true;
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntitySlime.java b/src/main/java/cn/nukkit/entity/mob/EntitySlime.java
index 34ba44764b2..9539c34cc7f 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntitySlime.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntitySlime.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.mob;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -36,8 +38,10 @@ public float getHeight() {
return 2.04f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Slime";
}
diff --git a/src/main/java/cn/nukkit/entity/mob/EntitySnowGolem.java b/src/main/java/cn/nukkit/entity/mob/EntitySnowGolem.java
index 2512d9f7c20..33e921e91b2 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntitySnowGolem.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntitySnowGolem.java
@@ -1,5 +1,6 @@
package cn.nukkit.entity.mob;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -19,8 +20,10 @@ public int getNetworkId() {
return NETWORK_ID;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Snow Golem";
}
diff --git a/src/main/java/cn/nukkit/entity/mob/EntitySpider.java b/src/main/java/cn/nukkit/entity/mob/EntitySpider.java
index 537f8d02239..b6f50dd80d7 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntitySpider.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntitySpider.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntityArthropod;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
@@ -38,8 +40,10 @@ public float getHeight() {
return 0.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Spider";
}
@@ -48,6 +52,7 @@ public Item[] getDrops() {
return new Item[]{Item.get(Item.STRING, Item.SPIDER_EYE)};
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityStray.java b/src/main/java/cn/nukkit/entity/mob/EntityStray.java
index ff7aecb53f8..dd73a7233cf 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityStray.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityStray.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntitySmite;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
@@ -38,8 +40,10 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Stray";
}
@@ -48,11 +52,13 @@ public Item[] getDrops() {
return new Item[]{Item.get(Item.BONE, Item.ARROW)};
}
+ @PowerNukkitOnly
@Override
public boolean isUndead() {
return true;
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityVex.java b/src/main/java/cn/nukkit/entity/mob/EntityVex.java
index 6d479124e58..0ba5ee8690a 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityVex.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityVex.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -36,11 +38,14 @@ public float getHeight() {
return 0.8f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Vex";
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityVindicator.java b/src/main/java/cn/nukkit/entity/mob/EntityVindicator.java
index 03d9ef0b7a1..3936b523919 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityVindicator.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityVindicator.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -37,8 +39,10 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Vindicator";
}
@@ -47,6 +51,7 @@ public Item[] getDrops() {
return new Item[]{Item.get(Item.IRON_AXE)};
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityWitch.java b/src/main/java/cn/nukkit/entity/mob/EntityWitch.java
index de7766d4a9c..62878d383a7 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityWitch.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityWitch.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -36,11 +38,14 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Witch";
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityWither.java b/src/main/java/cn/nukkit/entity/mob/EntityWither.java
index 398db9985dd..5a02b1fb7e9 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityWither.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityWither.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntitySmite;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -37,16 +39,20 @@ protected void initEntity() {
this.setMaxHealth(600);
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Wither";
}
+ @PowerNukkitOnly
@Override
public boolean isUndead() {
return true;
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityWitherSkeleton.java b/src/main/java/cn/nukkit/entity/mob/EntityWitherSkeleton.java
index d0f64679493..c829a39f9a0 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityWitherSkeleton.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityWitherSkeleton.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntitySmite;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -36,16 +38,20 @@ public float getHeight() {
return 2.01f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
- return "WitherSkeleton";
+ public String getOriginalName() {
+ return "Wither Skeleton";
}
+ @PowerNukkitOnly
@Override
public boolean isUndead() {
return true;
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityZoglin.java b/src/main/java/cn/nukkit/entity/mob/EntityZoglin.java
index 0541572d860..2bd7f4de2dc 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityZoglin.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityZoglin.java
@@ -48,21 +48,26 @@ public float getHeight() {
return 0.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Zoglin";
}
+ @PowerNukkitOnly
@Override
public boolean isUndead() {
return true;
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
}
+ @PowerNukkitOnly
@Override
public boolean isBaby() {
return this.getDataFlag(DATA_FLAGS, DATA_FLAG_BABY);
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityZombie.java b/src/main/java/cn/nukkit/entity/mob/EntityZombie.java
index bfc7e4a8d6b..a250ca3f01f 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityZombie.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityZombie.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntitySmite;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -38,16 +40,20 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Zombie";
}
+ @PowerNukkitOnly
@Override
public boolean isUndead() {
return true;
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityZombiePigman.java b/src/main/java/cn/nukkit/entity/mob/EntityZombiePigman.java
index 0a34f6e67e9..f1e23b9e68b 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityZombiePigman.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityZombiePigman.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntitySmite;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -37,16 +39,20 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
- return "ZombiePigman";
+ public String getOriginalName() {
+ return "Zombified Piglin";
}
+ @PowerNukkitOnly
@Override
public boolean isUndead() {
return true;
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return this.getDataPropertyBoolean(DATA_FLAG_ANGRY);
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityZombieVillager.java b/src/main/java/cn/nukkit/entity/mob/EntityZombieVillager.java
index 3382217fe71..dab9f05fb56 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityZombieVillager.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityZombieVillager.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.mob;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntitySmite;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -34,16 +36,20 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Zombie Villager";
}
+ @PowerNukkitOnly
@Override
public boolean isUndead() {
return true;
}
+ @PowerNukkitOnly
@Override
public boolean isPreventingSleep(Player player) {
return true;
diff --git a/src/main/java/cn/nukkit/entity/mob/EntityZombieVillagerV1.java b/src/main/java/cn/nukkit/entity/mob/EntityZombieVillagerV1.java
index bf06c34da1b..5b41fbb01ad 100644
--- a/src/main/java/cn/nukkit/entity/mob/EntityZombieVillagerV1.java
+++ b/src/main/java/cn/nukkit/entity/mob/EntityZombieVillagerV1.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.mob;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntitySmite;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -36,11 +38,14 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Zombie Villager";
}
+ @PowerNukkitOnly
@Override
public boolean isUndead() {
return true;
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityBat.java b/src/main/java/cn/nukkit/entity/passive/EntityBat.java
index de801a1efe8..2618bc8bf24 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityBat.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityBat.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -34,4 +36,12 @@ public void initEntity() {
super.initEntity();
this.setMaxHealth(6);
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Bat";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityBee.java b/src/main/java/cn/nukkit/entity/passive/EntityBee.java
index bd05e784183..9a08794ef3e 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityBee.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityBee.java
@@ -1,6 +1,7 @@
package cn.nukkit.entity.passive;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockBeehive;
@@ -49,21 +50,25 @@ public float getHeight() {
return 0.5f;
}
+ @PowerNukkitOnly
@Since("1.1.1.0-PN")
public boolean getHasNectar() {
return false;
}
+ @PowerNukkitOnly
@Since("1.1.1.0-PN")
public void setHasNectar(boolean hasNectar) {
}
+ @PowerNukkitOnly
@Since("1.1.1.0-PN")
public boolean isAngry() {
return false;
}
+ @PowerNukkitOnly
@Since("1.1.1.0-PN")
public void setAngry(boolean angry) {
@@ -106,18 +111,29 @@ protected void initEntity() {
this.setMaxHealth(10);
}
+ @PowerNukkitOnly
@Since("1.1.1.0-PN")
public void nectarDelivered(BlockEntityBeehive blockEntityBeehive) {
}
+ @PowerNukkitOnly
@Since("1.1.1.0-PN")
public void leftBeehive(BlockEntityBeehive blockEntityBeehive) {
}
+ @PowerNukkitOnly
@Since("1.1.1.0-PN")
public void setAngry(Player player) {
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Bee";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityCat.java b/src/main/java/cn/nukkit/entity/passive/EntityCat.java
index 6381ea60561..aa9eadd0295 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityCat.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityCat.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -37,4 +39,12 @@ public void initEntity() {
super.initEntity();
this.setMaxHealth(10);
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Cat";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityChicken.java b/src/main/java/cn/nukkit/entity/passive/EntityChicken.java
index 3dd62f09871..44b7ff949dc 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityChicken.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityChicken.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -31,8 +33,10 @@ public float getHeight() {
return 0.8f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Chicken";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityCod.java b/src/main/java/cn/nukkit/entity/passive/EntityCod.java
index e4a09151d35..a73ad5c72ff 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityCod.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityCod.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -19,7 +21,10 @@ public int getNetworkId() {
return NETWORK_ID;
}
- public String getName() {
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
return "Cod";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityCow.java b/src/main/java/cn/nukkit/entity/passive/EntityCow.java
index c1a77a9c8d4..9a4d8c1ac7f 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityCow.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityCow.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -31,8 +33,10 @@ public float getHeight() {
return 1.3f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Cow";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityDolphin.java b/src/main/java/cn/nukkit/entity/passive/EntityDolphin.java
index 7a9b1269758..54f41179c9b 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityDolphin.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityDolphin.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -20,7 +22,10 @@ public int getNetworkId() {
return NETWORK_ID;
}
- public String getName() {
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
return "Dolphin";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityDonkey.java b/src/main/java/cn/nukkit/entity/passive/EntityDonkey.java
index b27b0c7f68c..612391f7cf9 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityDonkey.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityDonkey.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -46,4 +48,12 @@ public void initEntity() {
public Item[] getDrops() {
return new Item[]{Item.get(Item.LEATHER)};
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Donkey";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityFox.java b/src/main/java/cn/nukkit/entity/passive/EntityFox.java
index 872a1c4b5b9..2956d891b89 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityFox.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityFox.java
@@ -1,5 +1,6 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -40,8 +41,10 @@ protected void initEntity() {
this.setMaxHealth(20);
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Fox";
}
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityHorse.java b/src/main/java/cn/nukkit/entity/passive/EntityHorse.java
index af3461880fc..3279cc6f8e3 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityHorse.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityHorse.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -46,4 +48,12 @@ public void initEntity() {
public Item[] getDrops() {
return new Item[]{Item.get(Item.LEATHER)};
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Horse";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityLlama.java b/src/main/java/cn/nukkit/entity/passive/EntityLlama.java
index 6536a79ee0c..71ea229972d 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityLlama.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityLlama.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -48,4 +50,12 @@ public void initEntity() {
super.initEntity();
this.setMaxHealth(15);
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Llama";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityMooshroom.java b/src/main/java/cn/nukkit/entity/passive/EntityMooshroom.java
index 4a4b982c401..ced896fefa7 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityMooshroom.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityMooshroom.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -31,8 +33,10 @@ public float getHeight() {
return 1.3f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Mooshroom";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityMule.java b/src/main/java/cn/nukkit/entity/passive/EntityMule.java
index ae138004025..dd1cca7cb55 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityMule.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityMule.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -46,4 +48,12 @@ public void initEntity() {
super.initEntity();
this.setMaxHealth(15);
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Mule";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityNPCEntity.java b/src/main/java/cn/nukkit/entity/passive/EntityNPCEntity.java
index 55abc3d242c..5c5236c9641 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityNPCEntity.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityNPCEntity.java
@@ -49,8 +49,10 @@ public String getInteractButtonText() {
return "action.interact.edit";
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "NPC";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityOcelot.java b/src/main/java/cn/nukkit/entity/passive/EntityOcelot.java
index 04977a6c425..8a01c864f0e 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityOcelot.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityOcelot.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -31,8 +33,10 @@ public float getHeight() {
return 0.7f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Ocelot";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityPanda.java b/src/main/java/cn/nukkit/entity/passive/EntityPanda.java
index fd34ddd055a..ecd747c3bb3 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityPanda.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityPanda.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -31,4 +33,12 @@ public void initEntity() {
super.initEntity();
this.setMaxHealth(20);
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Panda";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityParrot.java b/src/main/java/cn/nukkit/entity/passive/EntityParrot.java
index 955329a59b8..1bfd2a3d610 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityParrot.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityParrot.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -20,7 +22,10 @@ public int getNetworkId() {
return NETWORK_ID;
}
- public String getName() {
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
return "Parrot";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityPig.java b/src/main/java/cn/nukkit/entity/passive/EntityPig.java
index 85b6da5b9df..11c6d01c9bb 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityPig.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityPig.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -37,8 +39,10 @@ public void initEntity() {
this.setMaxHealth(10);
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Pig";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityPolarBear.java b/src/main/java/cn/nukkit/entity/passive/EntityPolarBear.java
index 21f29c0458d..fb91711f944 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityPolarBear.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityPolarBear.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -46,4 +48,12 @@ public void initEntity() {
public Item[] getDrops() {
return new Item[]{Item.get(Item.RAW_FISH), Item.get(Item.RAW_SALMON)};
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Polar Bear";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityPufferfish.java b/src/main/java/cn/nukkit/entity/passive/EntityPufferfish.java
index 1a30aceec5e..e9423f6279a 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityPufferfish.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityPufferfish.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -19,7 +21,10 @@ public int getNetworkId() {
return NETWORK_ID;
}
- public String getName() {
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
return "Pufferfish";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityRabbit.java b/src/main/java/cn/nukkit/entity/passive/EntityRabbit.java
index 394b34c6b18..210c0d40b9e 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityRabbit.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityRabbit.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -31,8 +33,10 @@ public float getHeight() {
return 0.67f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Rabbit";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntitySalmon.java b/src/main/java/cn/nukkit/entity/passive/EntitySalmon.java
index d29dc648e21..8926d7a7fbd 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntitySalmon.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntitySalmon.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -19,7 +21,10 @@ public int getNetworkId() {
return NETWORK_ID;
}
- public String getName() {
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
return "Salmon";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntitySheep.java b/src/main/java/cn/nukkit/entity/passive/EntitySheep.java
index b0ff618e885..a9e79eaec3b 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntitySheep.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntitySheep.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.passive;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.data.ByteEntityData;
import cn.nukkit.event.entity.EntityDamageByEntityEvent;
import cn.nukkit.item.Item;
@@ -42,8 +44,10 @@ public float getHeight() {
return 1.3f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Sheep";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntitySkeletonHorse.java b/src/main/java/cn/nukkit/entity/passive/EntitySkeletonHorse.java
index 0b11656e64c..25f9c2d5476 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntitySkeletonHorse.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntitySkeletonHorse.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntitySmite;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
@@ -42,8 +44,17 @@ public Item[] getDrops() {
return new Item[]{Item.get(Item.BONE)};
}
+ @PowerNukkitOnly
@Override
public boolean isUndead() {
return true;
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Skeleton Horse";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntitySquid.java b/src/main/java/cn/nukkit/entity/passive/EntitySquid.java
index c1ce19d9bed..6dab217e4f1 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntitySquid.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntitySquid.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.item.MinecraftItemID;
import cn.nukkit.level.format.FullChunk;
@@ -41,4 +43,12 @@ public void initEntity() {
public Item[] getDrops() {
return new Item[]{MinecraftItemID.INK_SAC.get(1)};
}
+
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Squid";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityStrider.java b/src/main/java/cn/nukkit/entity/passive/EntityStrider.java
index 001da949c9b..88ce05a70a7 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityStrider.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityStrider.java
@@ -1,5 +1,6 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -37,8 +38,10 @@ public float getHeight() {
return 1.7f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Strider";
}
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityTameable.java b/src/main/java/cn/nukkit/entity/passive/EntityTameable.java
index 9499c2a220e..3d355d25426 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityTameable.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityTameable.java
@@ -74,11 +74,6 @@ public Player getOwner() {
return getServer().getPlayer(getOwnerName());
}
- @Override
- public String getName() {
- return getNameTag();
- }
-
public boolean isTamed() {
return (getDataPropertyByte(DATA_TAMED_FLAG) & 4) != 0;
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityTropicalFish.java b/src/main/java/cn/nukkit/entity/passive/EntityTropicalFish.java
index 8c6aa42b97a..79aca0eb7e2 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityTropicalFish.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityTropicalFish.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -19,7 +21,10 @@ public int getNetworkId() {
return NETWORK_ID;
}
- public String getName() {
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
return "Tropical Fish";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityTurtle.java b/src/main/java/cn/nukkit/entity/passive/EntityTurtle.java
index 880a2eea793..23f9c862710 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityTurtle.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityTurtle.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.math.Vector3;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -20,7 +22,10 @@ public int getNetworkId() {
return NETWORK_ID;
}
- public String getName() {
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
return "Turtle";
}
@@ -46,10 +51,12 @@ public void initEntity() {
this.setMaxHealth(30);
}
+ @PowerNukkitOnly
public void setBreedingAge(int ticks) {
}
+ @PowerNukkitOnly
public void setHomePos(Vector3 pos) {
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityVillager.java b/src/main/java/cn/nukkit/entity/passive/EntityVillager.java
index f07cae39843..8f074780f80 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityVillager.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityVillager.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntityAgeable;
import cn.nukkit.entity.EntityCreature;
import cn.nukkit.level.format.FullChunk;
@@ -34,8 +36,10 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Villager";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityVillagerV1.java b/src/main/java/cn/nukkit/entity/passive/EntityVillagerV1.java
index 33aca7df386..707d64a843c 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityVillagerV1.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityVillagerV1.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.EntityAgeable;
import cn.nukkit.entity.EntityCreature;
@@ -40,8 +42,10 @@ public float getHeight() {
return 1.9f;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Villager";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityWanderingTrader.java b/src/main/java/cn/nukkit/entity/passive/EntityWanderingTrader.java
index 9b00daf6db1..c4042c112d8 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityWanderingTrader.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityWanderingTrader.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntityCreature;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -21,9 +23,11 @@ public float getWidth() {
public float getHeight() {
return 1.9f;
}
-
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Wandering Trader";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityWolf.java b/src/main/java/cn/nukkit/entity/passive/EntityWolf.java
index 5c2c6fb6763..a5e88685290 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityWolf.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityWolf.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.nbt.tag.CompoundTag;
@@ -24,9 +26,11 @@ public float getWidth() {
public float getHeight() {
return 0.8f;
}
-
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
+ public String getOriginalName() {
return "Wolf";
}
diff --git a/src/main/java/cn/nukkit/entity/passive/EntityZombieHorse.java b/src/main/java/cn/nukkit/entity/passive/EntityZombieHorse.java
index 40a0183a784..eb635579b74 100644
--- a/src/main/java/cn/nukkit/entity/passive/EntityZombieHorse.java
+++ b/src/main/java/cn/nukkit/entity/passive/EntityZombieHorse.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.passive;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.EntitySmite;
import cn.nukkit.item.Item;
import cn.nukkit.level.format.FullChunk;
@@ -42,8 +44,16 @@ public Item[] getDrops() {
return new Item[]{Item.get(Item.ROTTEN_FLESH, 1, 1)};
}
+ @PowerNukkitOnly
@Override
public boolean isUndead() {
return true;
}
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Zombie Horse";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/projectile/EntityArrow.java b/src/main/java/cn/nukkit/entity/projectile/EntityArrow.java
index 7f67bab01ad..f5688a31678 100644
--- a/src/main/java/cn/nukkit/entity/projectile/EntityArrow.java
+++ b/src/main/java/cn/nukkit/entity/projectile/EntityArrow.java
@@ -15,13 +15,8 @@
* @author MagicDroidX (Nukkit Project)
*/
public class EntityArrow extends EntityProjectile {
- public static final int NETWORK_ID = 80;
-
- public static final int DATA_SOURCE_ID = 17;
- public static final int PICKUP_NONE = 0;
- public static final int PICKUP_ANY = 1;
- public static final int PICKUP_CREATIVE = 2;
+ public static final int NETWORK_ID = 80;
protected int pickupMode;
@@ -65,7 +60,7 @@ protected void updateMotion() {
}
float drag = 1 - this.getDrag() * 20;
-
+
motionY -= getGravity() * 2;
if (motionY < 0) {
motionY *= drag / 1.5;
@@ -84,13 +79,13 @@ public EntityArrow(FullChunk chunk, CompoundTag nbt, Entity shootingEntity) {
public EntityArrow(FullChunk chunk, CompoundTag nbt, Entity shootingEntity, boolean critical) {
super(chunk, nbt, shootingEntity);
- closeOnCollide = false;
this.setCritical(critical);
}
@Override
protected void initEntity() {
super.initEntity();
+ closeOnCollide = false;
this.damage = namedTag.contains("damage") ? namedTag.getDouble("damage") : 2;
this.pickupMode = namedTag.contains("pickup") ? namedTag.getByte("pickup") : PICKUP_ANY;
@@ -143,6 +138,12 @@ public boolean onUpdate(int currentTick) {
hasUpdate = true;
}
+ if (this.level.isRaining() && this.fireTicks > 0 && this.level.canBlockSeeSky(this)) {
+ extinguish();
+
+ hasUpdate = true;
+ }
+
this.timing.stopTiming();
return hasUpdate;
@@ -164,6 +165,7 @@ protected void afterCollisionWithEntity(Entity entity) {
}
}
+ @PowerNukkitOnly
@Override
protected void addHitEffect() {
this.level.addSound(this, Sound.RANDOM_BOWHIT);
@@ -172,7 +174,7 @@ protected void addHitEffect() {
packet.event = EntityEventPacket.ARROW_SHAKE;
packet.data = 7; // TODO Magic value. I have no idea why we have to set it to 7 here...
Server.broadcastPacket(this.hasSpawned.values(), packet);
-
+
onGround = true;
}
@@ -190,4 +192,11 @@ public int getPickupMode() {
public void setPickupMode(int pickupMode) {
this.pickupMode = pickupMode;
}
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Arrow";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/projectile/EntityEgg.java b/src/main/java/cn/nukkit/entity/projectile/EntityEgg.java
index 2e33c328632..62c0280b2af 100644
--- a/src/main/java/cn/nukkit/entity/projectile/EntityEgg.java
+++ b/src/main/java/cn/nukkit/entity/projectile/EntityEgg.java
@@ -1,5 +1,7 @@
package cn.nukkit.entity.projectile;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
import cn.nukkit.item.ItemEgg;
import cn.nukkit.level.format.FullChunk;
@@ -12,6 +14,7 @@
* @author MagicDroidX (Nukkit Project)
*/
public class EntityEgg extends EntityProjectile {
+
public static final int NETWORK_ID = 82;
@Override
@@ -67,7 +70,8 @@ public boolean onUpdate(int currentTick) {
return hasUpdate;
}
-
+
+ @PowerNukkitOnly
@Override
protected void addHitEffect() {
int particles = ThreadLocalRandom.current().nextInt(10) + 5;
@@ -76,4 +80,11 @@ protected void addHitEffect() {
level.addParticle(new ItemBreakParticle(this, egg));
}
}
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Egg";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/projectile/EntityEnderPearl.java b/src/main/java/cn/nukkit/entity/projectile/EntityEnderPearl.java
index 8d59b5c78f5..78f3b5d5d97 100644
--- a/src/main/java/cn/nukkit/entity/projectile/EntityEnderPearl.java
+++ b/src/main/java/cn/nukkit/entity/projectile/EntityEnderPearl.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.projectile;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
import cn.nukkit.entity.Entity;
import cn.nukkit.event.entity.EntityDamageByEntityEvent;
@@ -13,6 +15,7 @@
import cn.nukkit.network.protocol.LevelEventPacket;
public class EntityEnderPearl extends EntityProjectile {
+
public static final int NETWORK_ID = 87;
@Override
@@ -106,4 +109,11 @@ private void teleport() {
this.level.addLevelEvent(this, LevelEventPacket.EVENT_PARTICLE_ENDERMAN_TELEPORT);
this.level.addLevelEvent(this.shootingEntity.add(0.5, 0.5, 0.5), LevelEventPacket.EVENT_SOUND_PORTAL);
}
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Ender Pearl";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/projectile/EntityProjectile.java b/src/main/java/cn/nukkit/entity/projectile/EntityProjectile.java
index 45d940e0535..bbad2aa473a 100644
--- a/src/main/java/cn/nukkit/entity/projectile/EntityProjectile.java
+++ b/src/main/java/cn/nukkit/entity/projectile/EntityProjectile.java
@@ -1,5 +1,6 @@
package cn.nukkit.entity.projectile;
+import cn.nukkit.api.DeprecationDetails;
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.Player;
@@ -8,7 +9,6 @@
import cn.nukkit.entity.EntityLiving;
import cn.nukkit.entity.data.LongEntityData;
import cn.nukkit.entity.item.EntityEndCrystal;
-import cn.nukkit.event.block.BellRingEvent;
import cn.nukkit.event.entity.*;
import cn.nukkit.event.entity.EntityDamageEvent.DamageCause;
import cn.nukkit.level.MovingObjectPosition;
@@ -29,13 +29,19 @@
public abstract class EntityProjectile extends Entity {
public static final int DATA_SHOOTER_ID = 17;
+ @Since("1.6.0.0-PN") public static final int PICKUP_NONE = 0;
+ @Since("1.6.0.0-PN") public static final int PICKUP_ANY = 1;
+ @Since("1.6.0.0-PN") public static final int PICKUP_CREATIVE = 2;
+
+ public Entity shootingEntity;
+
+ /**
+ * It's inverted from {@link #getHasAge()} because of the poor architecture chosen by the original devs
+ * on the entity construction and initialization. It's impossible to set it to true before
+ * the initialization of the child classes.
+ */
+ private boolean noAge;
- public Entity shootingEntity = null;
-
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
- public boolean hasAge = true;
-
protected double getDamage() {
return namedTag.contains("damage") ? namedTag.getDouble("damage") : getBaseDamage();
}
@@ -44,11 +50,13 @@ protected double getBaseDamage() {
return 0;
}
- public boolean hadCollision = false;
+ public boolean hadCollision;
- public boolean closeOnCollide = true;
+ public boolean closeOnCollide;
- protected double damage = 0;
+ @Deprecated
+ @DeprecationDetails(since = "1.6.0.0-PN", by = "PowerNukkit", reason = "Redundant and unused", replaceWith = "getDamage()")
+ protected double damage;
public EntityProjectile(FullChunk chunk, CompoundTag nbt) {
this(chunk, nbt, null);
@@ -61,6 +69,8 @@ public EntityProjectile(FullChunk chunk, CompoundTag nbt, Entity shootingEntity)
this.setDataProperty(new LongEntityData(DATA_SHOOTER_ID, shootingEntity.getId()));
}
}
+
+
@PowerNukkitOnly("Allows to modify the damage based on the entity being damaged")
@Since("1.4.0.0-PN")
@@ -72,6 +82,7 @@ public int getResultDamage() {
return NukkitMath.ceilDouble(Math.sqrt(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ) * getDamage());
}
+ @Override
public boolean attack(EntityDamageEvent source) {
return source.getCause() == DamageCause.VOID && super.attack(source);
}
@@ -98,7 +109,7 @@ public void onCollideWithEntity(Entity entity) {
if (this.fireTicks > 0) {
EntityCombustByEntityEvent event = new EntityCombustByEntityEvent(this, entity, 5);
- this.server.getPluginManager().callEvent(ev);
+ this.server.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
entity.setOnFire(event.getDuration());
}
@@ -109,20 +120,21 @@ public void onCollideWithEntity(Entity entity) {
this.close();
}
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
protected void afterCollisionWithEntity(Entity entity) {
-
+
}
@Override
protected void initEntity() {
+ this.closeOnCollide = true;
super.initEntity();
this.setMaxHealth(1);
this.setHealth(1);
- if (this.namedTag.contains("Age") && this.hasAge) {
+ if (this.namedTag.contains("Age") && !this.noAge) {
this.age = this.namedTag.getShort("Age");
}
}
@@ -135,7 +147,7 @@ public boolean canCollideWith(Entity entity) {
@Override
public void saveNBT() {
super.saveNBT();
- if (this.hasAge) {
+ if (!this.noAge) {
this.namedTag.putShort("Age", this.age);
}
}
@@ -147,7 +159,7 @@ protected void updateMotion() {
this.motionX *= 1 - this.getDrag();
this.motionZ *= 1 - this.getDrag();
}
-
+
@Override
public boolean onUpdate(int currentTick) {
if (this.closed) {
@@ -245,12 +257,14 @@ public boolean onUpdate(int currentTick) {
return hasUpdate;
}
+ @PowerNukkitOnly
public void updateRotation() {
double f = Math.sqrt((this.motionX * this.motionX) + (this.motionZ * this.motionZ));
this.yaw = Math.atan2(this.motionX, this.motionZ) * 180 / Math.PI;
this.pitch = Math.atan2(this.motionY, f) * 180 / Math.PI;
}
+ @PowerNukkitOnly
public void inaccurate(float modifier) {
Random rand = ThreadLocalRandom.current();
@@ -277,16 +291,34 @@ protected boolean onCollideWithBlock(Position position, Vector3 motion, Block co
protected void addHitEffect() {
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
+ @Deprecated
+ @DeprecationDetails(
+ by = "PowerNukkit", since = "1.6.0.0-PN", reason = "Bad method name", replaceWith = "getHasAge",
+ toBeRemovedAt = "1.7.0.0-PN")
public boolean hasAge() {
- return hasAge;
+ return getHasAge();
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
+ @Deprecated
+ @DeprecationDetails(
+ by = "PowerNukkit", since = "1.6.0.0-PN", reason = "Bad method name", replaceWith = "setHasAge",
+ toBeRemovedAt = "1.7.0.0-PN")
public void setAge(boolean hasAge) {
- this.hasAge = hasAge;
+ setHasAge(hasAge);
+ }
+
+ @PowerNukkitOnly
+ @Since("1.4.0.0-PN")
+ public void setHasAge(boolean hasAge) {
+ this.noAge = !hasAge;
+ }
+
+ public boolean getHasAge() {
+ return !this.noAge;
}
}
diff --git a/src/main/java/cn/nukkit/entity/projectile/EntitySnowball.java b/src/main/java/cn/nukkit/entity/projectile/EntitySnowball.java
index 27efc491eee..4700d5209f8 100644
--- a/src/main/java/cn/nukkit/entity/projectile/EntitySnowball.java
+++ b/src/main/java/cn/nukkit/entity/projectile/EntitySnowball.java
@@ -2,6 +2,7 @@
import cn.nukkit.Player;
import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.mob.EntityBlaze;
import cn.nukkit.level.Level;
@@ -19,6 +20,7 @@
* @author MagicDroidX (Nukkit Project)
*/
public class EntitySnowball extends EntityProjectile {
+
public static final int NETWORK_ID = 81;
private static final byte[] particleCounts = new byte[24];
private static int particleIndex = 0;
@@ -100,6 +102,7 @@ public int getResultDamage(@Nullable Entity entity) {
return entity instanceof EntityBlaze ? 3 : super.getResultDamage(entity);
}
+ @PowerNukkitOnly
@Override
protected void addHitEffect() {
int particles = nextParticleCount();
@@ -114,4 +117,11 @@ protected void addHitEffect() {
Level level = this.level;
level.getServer().batchPackets(level.getChunkPlayers(chunkX, chunkZ).values().toArray(Player.EMPTY_ARRAY), allPackets);
}
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Snowball";
+ }
}
diff --git a/src/main/java/cn/nukkit/entity/projectile/EntityThrownTrident.java b/src/main/java/cn/nukkit/entity/projectile/EntityThrownTrident.java
index 03c20f6b137..f53b09fea28 100644
--- a/src/main/java/cn/nukkit/entity/projectile/EntityThrownTrident.java
+++ b/src/main/java/cn/nukkit/entity/projectile/EntityThrownTrident.java
@@ -1,6 +1,7 @@
package cn.nukkit.entity.projectile;
import cn.nukkit.Player;
+import cn.nukkit.api.DeprecationDetails;
import cn.nukkit.api.PowerNukkitDifference;
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
@@ -39,62 +40,46 @@
public class EntityThrownTrident extends EntityProjectile {
public static final int NETWORK_ID = 73;
+ private static final String TAG_PICKUP = "pickup";
+ private static final String TAG_TRIDENT = "Trident";
+ private static final String TAG_FAVORED_SLOT = "favoredSlot";
+ private static final String TAG_CREATIVE = "isCreative";
+ private static final String TAG_PLAYER = "player";
+ private static final String NAME_TRIDENT = "Trident";
- public static final int DATA_SOURCE_ID = 17;
-
- // NBT data
protected Item trident;
-
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
+
private Vector3 collisionPos;
-
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
+
private BlockVector3 stuckToBlockPos;
-
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
+
private int favoredSlot;
-
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
- private boolean isCreative;
-
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
+
private boolean player;
-
+
// Enchantment
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
private int loyaltyLevel;
-
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
+
private boolean hasChanneling;
-
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
+
private int riptideLevel;
-
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
+
private int impalingLevel;
-
+
// Default Values
+ @PowerNukkitOnly
protected float gravity = 0.04f;
-
- protected float drag = 0.01f;
-
+
@PowerNukkitOnly
- @Since("1.4.0.0-PN")
+ protected float drag = 0.01f;
+
private static final Vector3 defaultCollisionPos = new Vector3(0, 0, 0);
-
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
+
private static final BlockVector3 defaultStuckToBlockPos = new BlockVector3(0, 0, 0);
-
+
+ @Since("1.6.0.0-PN") protected int pickupMode;
+ @Since("1.6.0.0-PN") public boolean alreadyCollided;
+
@Override
public int getNetworkId() {
return NETWORK_ID;
@@ -117,41 +102,55 @@ public float getHeight() {
@Override
public float getGravity() {
- return 0.04f;
+ return 0.05f;
}
@Override
public float getDrag() {
return 0.01f;
}
-
+
public EntityThrownTrident(FullChunk chunk, CompoundTag nbt) {
this(chunk, nbt, null);
}
public EntityThrownTrident(FullChunk chunk, CompoundTag nbt, Entity shootingEntity) {
- this(chunk, nbt, shootingEntity, false);
+ super(chunk, nbt, shootingEntity);
}
+ @Deprecated
public EntityThrownTrident(FullChunk chunk, CompoundTag nbt, Entity shootingEntity, boolean critical) {
- super(chunk, nbt, shootingEntity);
+ this(chunk, nbt, shootingEntity);
}
-
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
@Override
- public String getName() {
- return "Trident";
+ public String getOriginalName() {
+ return NAME_TRIDENT;
}
-
+
@Override
protected void initEntity() {
+ super.setHasAge(false);
super.initEntity();
-
+
this.closeOnCollide = false;
-
- this.hasAge = false;
-
- if (namedTag.contains("Trident")) {
- this.trident = NBTIO.getItemHelper(namedTag.getCompound("Trident"));
+
+ this.pickupMode = namedTag.contains(TAG_PICKUP) ? namedTag.getByte(TAG_PICKUP) : PICKUP_ANY;
+ this.damage = namedTag.contains("damage") ? namedTag.getDouble("damage") : 8;
+ this.favoredSlot = namedTag.contains(TAG_FAVORED_SLOT) ? namedTag.getInt(TAG_FAVORED_SLOT) : -1;
+ this.player = !namedTag.contains(TAG_PLAYER) || namedTag.getBoolean(TAG_PLAYER);
+
+ if (namedTag.contains(TAG_CREATIVE)) {
+ if (pickupMode == PICKUP_ANY && namedTag.getBoolean(TAG_CREATIVE)) {
+ pickupMode = PICKUP_CREATIVE;
+ }
+ namedTag.remove(TAG_CREATIVE);
+ }
+
+ if (namedTag.contains(TAG_TRIDENT)) {
+ this.trident = NBTIO.getItemHelper(namedTag.getCompound(TAG_TRIDENT));
this.loyaltyLevel = this.trident.getEnchantmentLevel(Enchantment.ID_TRIDENT_LOYALTY);
this.hasChanneling = this.trident.hasEnchantment(Enchantment.ID_TRIDENT_CHANNELING);
this.riptideLevel = this.trident.getEnchantmentLevel(Enchantment.ID_TRIDENT_RIPTIDE);
@@ -163,43 +162,19 @@ protected void initEntity() {
this.riptideLevel = 0;
this.impalingLevel = 0;
}
-
- if (namedTag.contains("damage")) {
- this.damage = namedTag.getDouble("damage");
- } else {
- this.damage = 8;
- }
-
+
if (namedTag.contains("CollisionPos")) {
ListTag collisionPosList = this.namedTag.getList("CollisionPos", DoubleTag.class);
collisionPos = new Vector3(collisionPosList.get(0).data, collisionPosList.get(1).data, collisionPosList.get(2).data);
} else {
- collisionPos = this.defaultCollisionPos.clone();
+ collisionPos = defaultCollisionPos.clone();
}
-
+
if (namedTag.contains("StuckToBlockPos")) {
ListTag stuckToBlockPosList = this.namedTag.getList("StuckToBlockPos", IntTag.class);
stuckToBlockPos = new BlockVector3(stuckToBlockPosList.get(0).data, stuckToBlockPosList.get(1).data, stuckToBlockPosList.get(2).data);
} else {
- stuckToBlockPos = this.defaultStuckToBlockPos.clone();
- }
-
- if (namedTag.contains("favoredSlot")) {
- this.favoredSlot = namedTag.getInt("favoredSlot");
- } else {
- this.favoredSlot = -1;
- }
-
- if (namedTag.contains("isCreative")) {
- this.isCreative = namedTag.getBoolean("isCreative");
- } else {
- this.isCreative = false;
- }
-
- if (namedTag.contains("player")) {
- this.player = namedTag.getBoolean("player");
- } else {
- this.player = true;
+ stuckToBlockPos = defaultStuckToBlockPos.clone();
}
}
@@ -207,7 +182,8 @@ protected void initEntity() {
public void saveNBT() {
super.saveNBT();
- this.namedTag.put("Trident", NBTIO.putItemHelper(this.trident));
+ this.namedTag.put(TAG_TRIDENT, NBTIO.putItemHelper(this.trident));
+ this.namedTag.putByte(TAG_PICKUP, this.pickupMode);
this.namedTag.putList(new ListTag("CollisionPos")
.add(new DoubleTag("0", this.collisionPos.x))
.add(new DoubleTag("1", this.collisionPos.y))
@@ -218,9 +194,8 @@ public void saveNBT() {
.add(new IntTag("1", this.stuckToBlockPos.y))
.add(new IntTag("2", this.stuckToBlockPos.z))
);
- this.namedTag.putInt("favoredSlot", this.favoredSlot);
- this.namedTag.putBoolean("isCreative", this.isCreative);
- this.namedTag.putBoolean("player", this.player);
+ this.namedTag.putInt(TAG_FAVORED_SLOT, this.favoredSlot);
+ this.namedTag.putBoolean(TAG_PLAYER, this.player);
}
public Item getItem() {
@@ -235,14 +210,17 @@ public void setItem(Item item) {
this.impalingLevel = this.trident.getEnchantmentLevel(Enchantment.ID_TRIDENT_IMPALING);
}
+ @PowerNukkitOnly
public void setCritical() {
this.setCritical(true);
}
+ @PowerNukkitOnly
public void setCritical(boolean value) {
this.setDataFlag(DATA_FLAGS, DATA_FLAG_CRITICAL, value);
}
+ @PowerNukkitOnly
public boolean isCritical() {
return this.getDataFlag(DATA_FLAGS, DATA_FLAG_CRITICAL);
}
@@ -281,7 +259,7 @@ public boolean onUpdate(int currentTick) {
if (this.onGround || this.hadCollision) {
this.setCritical(false);
}
-
+
if (this.noClip) {
if (this.canReturnToShooter()) {
Entity shooter = this.shootingEntity;
@@ -296,7 +274,7 @@ public boolean onUpdate(int currentTick) {
this.close();
}
}
-
+
this.timing.stopTiming();
return hasUpdate;
@@ -328,13 +306,18 @@ public void onCollideWithEntity(Entity entity) {
if (this.noClip) {
return;
}
-
+
+ if (this.alreadyCollided) {
+ this.move(this.motionX, this.motionY, this.motionZ);
+ return;
+ }
+
this.server.getPluginManager().callEvent(new ProjectileHitEvent(this, MovingObjectPosition.fromEntity(entity)));
float damage = this.getResultDamage();
if (this.impalingLevel > 0 && (entity.isTouchingWater() || (entity.getLevel().isRaining() && entity.getLevel().canBlockSeeSky(entity)))) {
damage = damage + (2.5f * (float) this.impalingLevel);
}
-
+
EntityDamageEvent ev;
if (this.shootingEntity == null) {
ev = new EntityDamageByEntityEvent(this, entity, DamageCause.PROJECTILE, damage);
@@ -346,7 +329,7 @@ public void onCollideWithEntity(Entity entity) {
this.hadCollision = true;
this.setCollisionPos(this);
this.setMotion(new Vector3(this.getMotion().getX() * -0.01, this.getMotion().getY() * -0.1, this.getMotion().getZ() * -0.01));
-
+
if (this.hasChanneling) {
if (this.level.isThundering() && this.level.canBlockSeeSky(this)) {
Position pos = this.getPosition();
@@ -355,7 +338,7 @@ public void onCollideWithEntity(Entity entity) {
this.getLevel().addSound(this, Sound.ITEM_TRIDENT_THUNDER);
}
}
-
+
if (this.canReturnToShooter()) {
this.getLevel().addSound(this, Sound.ITEM_TRIDENT_RETURN);
this.setNoClip(true);
@@ -364,19 +347,30 @@ public void onCollideWithEntity(Entity entity) {
}
}
+ @PowerNukkitOnly
public Entity create(Object type, Position source, Object... args) {
FullChunk chunk = source.getLevel().getChunk((int) source.x >> 4, (int) source.z >> 4);
if (chunk == null) return null;
CompoundTag nbt = Entity.getDefaultNBT(
- source.add(0.5, 0, 0.5),
- null,
+ source.add(0.5, 0, 0.5),
+ null,
new Random().nextFloat() * 360, 0
);
return Entity.createEntity(type.toString(), chunk, nbt, args);
}
-
+
+ @Since("1.6.0.0-PN")
+ public int getPickupMode() {
+ return this.pickupMode;
+ }
+
+ @Since("1.6.0.0-PN")
+ public void setPickupMode(int pickupMode) {
+ this.pickupMode = pickupMode;
+ }
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
@@ -384,7 +378,7 @@ protected void onCollideWithBlock(Position position, Vector3 motion) {
if (this.noClip) {
return;
}
-
+
for (Block collisionBlock : level.getCollisionBlocks(getBoundingBox().grow(0.1, 0.1, 0.1))) {
this.setStuckToBlockPos(new BlockVector3(collisionBlock.getFloorX(), collisionBlock.getFloorY(), collisionBlock.getFloorZ()));
if (this.canReturnToShooter()) {
@@ -396,73 +390,80 @@ protected void onCollideWithBlock(Position position, Vector3 motion) {
onCollideWithBlock(position, motion, collisionBlock);
}
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public Vector3 getCollisionPos() {
return collisionPos;
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public void setCollisionPos(Vector3 collisionPos) {
this.collisionPos = collisionPos;
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public BlockVector3 getStuckToBlockPos() {
return stuckToBlockPos;
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public void setStuckToBlockPos(BlockVector3 stuckToBlockPos) {
this.stuckToBlockPos = stuckToBlockPos;
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getFavoredSlot() {
return favoredSlot;
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public void setFavoredSlot(int favoredSlot) {
this.favoredSlot = favoredSlot;
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public boolean isCreative() {
- return isCreative;
+ return getPickupMode() == EntityProjectile.PICKUP_CREATIVE;
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
+ @Deprecated
+ @DeprecationDetails(since = "1.6.0.0-PN", by = "PowerNukkit", replaceWith = "setPickupMode(EntityProjectile.PICKUP_)",
+ reason = "Nukkit added this API in 3-states, NONE, ANY, and CREATIVE")
public void setCreative(boolean isCreative) {
- this.isCreative = isCreative;
+ if (isCreative) {
+ setPickupMode(EntityProjectile.PICKUP_CREATIVE);
+ } else if (getPickupMode() == EntityProjectile.PICKUP_CREATIVE) {
+ setPickupMode(EntityProjectile.PICKUP_ANY);
+ }
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public boolean isPlayer() {
return player;
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public void setPlayer(boolean player) {
this.player = player;
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getLoyaltyLevel() {
return loyaltyLevel;
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public void setLoyaltyLevel(int loyaltyLevel) {
@@ -473,13 +474,13 @@ public void setLoyaltyLevel(int loyaltyLevel) {
// TODO: this.trident.removeEnchantment(Enchantment.ID_TRIDENT_LOYALTY);
}
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public boolean hasChanneling() {
return hasChanneling;
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public void setChanneling(boolean hasChanneling) {
@@ -490,13 +491,13 @@ public void setChanneling(boolean hasChanneling) {
// TODO: this.trident.removeEnchantment(Enchantment.ID_TRIDENT_CHANNELING);
}
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getRiptideLevel() {
return riptideLevel;
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public void setRiptideLevel(int riptideLevel) {
@@ -507,13 +508,13 @@ public void setRiptideLevel(int riptideLevel) {
// TODO: this.trident.removeEnchantment(Enchantment.ID_TRIDENT_RIPTIDE);
}
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getImpalingLevel() {
return impalingLevel;
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public void setImpalingLevel(int impalingLevel) {
@@ -524,13 +525,13 @@ public void setImpalingLevel(int impalingLevel) {
// TODO: this.trident.removeEnchantment(Enchantment.ID_TRIDENT_IMPALING);
}
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public boolean getTridentRope() {
return this.getDataFlag(DATA_FLAGS, DATA_FLAG_SHOW_TRIDENT_ROPE);
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public void setTridentRope(boolean tridentRope) {
@@ -541,18 +542,18 @@ public void setTridentRope(boolean tridentRope) {
}
this.setDataFlag(DATA_FLAGS, DATA_FLAG_SHOW_TRIDENT_ROPE, tridentRope);
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public boolean canReturnToShooter() {
if (this.loyaltyLevel <= 0) {
return false;
}
-
+
if (this.getCollisionPos().equals(this.defaultCollisionPos) && this.getStuckToBlockPos().equals(this.defaultStuckToBlockPos)) {
return false;
}
-
+
Entity shooter = this.shootingEntity;
if (shooter != null) {
if (shooter.isAlive() && shooter instanceof Player) {
diff --git a/src/main/java/cn/nukkit/entity/weather/EntityLightning.java b/src/main/java/cn/nukkit/entity/weather/EntityLightning.java
index 439c49801d7..a4cd3eea757 100644
--- a/src/main/java/cn/nukkit/entity/weather/EntityLightning.java
+++ b/src/main/java/cn/nukkit/entity/weather/EntityLightning.java
@@ -1,6 +1,8 @@
package cn.nukkit.entity.weather;
import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockFire;
import cn.nukkit.block.BlockID;
@@ -71,10 +73,12 @@ protected void initEntity() {
}
}
+ @Override
public boolean isEffect() {
return this.isEffect;
}
+ @Override
public void setEffect(boolean e) {
this.isEffect = e;
}
@@ -150,4 +154,10 @@ public boolean onUpdate(int currentTick) {
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Override
+ public String getOriginalName() {
+ return "Lightning Bolt";
+ }
}
diff --git a/src/main/java/cn/nukkit/event/block/AnvilDamageEvent.java b/src/main/java/cn/nukkit/event/block/AnvilDamageEvent.java
index 08e5324da49..6278dc5b29f 100644
--- a/src/main/java/cn/nukkit/event/block/AnvilDamageEvent.java
+++ b/src/main/java/cn/nukkit/event/block/AnvilDamageEvent.java
@@ -2,26 +2,22 @@
import cn.nukkit.Player;
import cn.nukkit.api.DeprecationDetails;
-import cn.nukkit.api.PowerNukkitDifference;
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
+import cn.nukkit.block.BlockAnvil;
+import cn.nukkit.blockproperty.value.AnvilDamage;
+import cn.nukkit.blockstate.BlockState;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.HandlerList;
import cn.nukkit.inventory.transaction.CraftingTransaction;
-import lombok.RequiredArgsConstructor;
+import com.google.common.base.Preconditions;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-@PowerNukkitDifference(info = "Extends BlockFadeEvent instead of BlockEvent only in PowerNukkit")
-@Deprecated @DeprecationDetails(since = "1.4.0.0-PN",
- reason = "This is only a warning, this event will change in 1.5.0.0-PN, " +
- "it will no longer extend BlockFadeEvent and the cause enum will be renamed!",
- toBeRemovedAt = "The class will have a breaking change in 1.5.0.0-PN"
-)
@Since("1.1.1.0-PN")
-public class AnvilDamageEvent extends BlockFadeEvent implements Cancellable {
+public class AnvilDamageEvent extends BlockEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
@@ -29,120 +25,140 @@ public class AnvilDamageEvent extends BlockFadeEvent implements Cancellable {
public static HandlerList getHandlers() {
return handlers;
}
-
+
+ @Nullable
private final Player player;
+
+ @Nullable
private final CraftingTransaction transaction;
+
+ @Nonnull
private final DamageCause cause;
+ @Nonnull
+ private final BlockState oldState;
+
+ @Nonnull
+ private BlockState newState;
+
@Since("1.4.0.0-PN")
- public AnvilDamageEvent(Block block, int oldDamage, int newDamage, DamageCause cause, Player player) {
- this(adjustBlock(block, oldDamage), adjustBlock(block, newDamage), player, null, cause);
+ public AnvilDamageEvent(@Nonnull Block block, int oldDamage, int newDamage, @Nonnull DamageCause cause, @Nullable Player player) {
+ this(adjustBlock(block, oldDamage), block.getCurrentState().withData(newDamage), player, null, cause);
}
@PowerNukkitOnly
@Since("1.4.0.0-PN")
- public AnvilDamageEvent(Block block, Block newState, Player player, @Nullable CraftingTransaction transaction, DamageCause cause) {
- super(block, newState);
+ public AnvilDamageEvent(@Nonnull Block block, @Nonnull Block newState, @Nullable Player player, @Nullable CraftingTransaction transaction, @Nonnull DamageCause cause) {
+ this(block, newState.getCurrentState(), player, transaction, cause);
+ }
+
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ public AnvilDamageEvent(@Nonnull Block block, @Nonnull BlockState newState, @Nullable Player player, @Nullable CraftingTransaction transaction, @Nonnull DamageCause cause) {
+ super(Preconditions.checkNotNull(block, "block").clone());
+ this.oldState = block.getCurrentState();
this.player = player;
this.transaction = transaction;
- this.cause = cause;
+ this.cause = Preconditions.checkNotNull(cause, "cause");
+ this.newState = Preconditions.checkNotNull(newState, "newState");
}
@PowerNukkitOnly
@Since("1.1.1.0-PN")
- public AnvilDamageEvent(Block block, Block newState, Player player, CraftingTransaction transaction, Cause cause) {
- this(block, newState, player, transaction, convert(cause));
- }
-
-
- @Since("1.1.1.0-PN")
- public Player getPlayer() {
- return player;
- }
-
-
- @PowerNukkitOnly
- @Since("1.1.1.0-PN")
+ @Nullable
public CraftingTransaction getTransaction() {
return transaction;
}
@PowerNukkitOnly
@Since("1.4.0.0-PN")
+ @Nonnull
public DamageCause getDamageCause() {
return cause;
}
-
+ @Deprecated
+ @DeprecationDetails(since = "1.6.0.0-PN", by = "PowerNukkit", reason = "Unstable use of raw block state data", replaceWith = "getOldAnvilDamage or getOldBlockState")
@Since("1.4.0.0-PN")
public int getOldDamage() {
- return getBlock().getDamage();
+ if (!block.getProperties().contains(BlockAnvil.DAMAGE)) {
+ return 0;
+ }
+ return block.getIntValue(BlockAnvil.DAMAGE);
+ }
+
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ @Nullable
+ public AnvilDamage getOldAnvilDamage() {
+ if (oldState.getProperties().contains(BlockAnvil.DAMAGE)) {
+ return oldState.getPropertyValue(BlockAnvil.DAMAGE);
+ }
+ return null;
}
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ @Nonnull
+ public BlockState getOldBlockState() {
+ return oldState;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ @Nonnull
+ public BlockState getNewBlockState() {
+ return newState;
+ }
+
+ @PowerNukkitOnly("Used to be inherited from BlockFadeEvent")
+ @Since("1.1.1.0-PN")
+ @Nonnull
+ public Block getNewState() {
+ return newState.getBlockRepairing(block);
+ }
+
+ @Deprecated
+ @DeprecationDetails(since = "1.6.0.0-PN", by = "PowerNukkit", reason = "Unstable use of raw block state data", replaceWith = "getNewAnvilDamage or getNewBlockState")
@Since("1.4.0.0-PN")
public int getNewDamage() {
- return getNewState().getDamage();
+ BlockState newBlockState = getNewBlockState();
+ return newBlockState.getProperties().contains(BlockAnvil.DAMAGE)? newBlockState.getIntValue(BlockAnvil.DAMAGE) : 0;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ public void setNewBlockState(@Nonnull BlockState state) {
+ this.newState = Preconditions.checkNotNull(state);
}
+ @Deprecated
+ @DeprecationDetails(since = "1.6.0.0-PN", by = "PowerNukkit", reason = "Unstable use of raw block state data",
+ replaceWith = "setNewBlockState example: setNewBlockState(BlockState.of(BlockID.ANVIL).withProperty(BlockAnvil.DAMAGE, AnvilDamage.VERY_DAMAGED))")
@Since("1.4.0.0-PN")
public void setNewDamage(int newDamage) {
- getNewState().setDamage(newDamage);
+ BlockState newBlockState = getNewBlockState();
+ if (newBlockState.getProperties().contains(BlockAnvil.DAMAGE)) {
+ this.setNewBlockState(newBlockState.withProperty(BlockAnvil.DAMAGE, BlockAnvil.DAMAGE.getValueForMeta(newDamage)));
+ }
}
@PowerNukkitOnly
- @Since("1.1.1.0-PN")
- @Deprecated @DeprecationDetails(
- since = "1.4.0.0-PN", by = "PowerNukkit",
- reason = "NukkitX added the class and made getCause() return an enum with a different name.",
- replaceWith = "getDamageCause()",
- toBeRemovedAt = "1.6.0.0-PN"
- )
- public Cause getCause() {
- return convert(cause);
+ @Since("1.6.0.0-PN")
+ public void setNewState(@Nonnull Block block) {
+ this.newState = block.getCurrentState();
+ }
+
+ @Since("1.6.0.0-PN")
+ @Nonnull
+ public DamageCause getCause() {
+ return this.cause;
}
- @PowerNukkitOnly
@Since("1.1.1.0-PN")
- @Deprecated @DeprecationDetails(
- since = "1.4.0.0-PN", by = "PowerNukkit",
- reason = "NukkitX added the class but with a different enum for the damage cause",
- replaceWith = "DamageCause",
- toBeRemovedAt = "1.6.0.0-PN"
- )
- @RequiredArgsConstructor
- public enum Cause {
- @PowerNukkitOnly
- @Since("1.1.1.0-PN")
- @Deprecated @DeprecationDetails(
- since = "1.4.0.0-PN", by = "PowerNukkit",
- reason = "NukkitX added the class but with a different enum for the damage cause",
- replaceWith = "DamageCause.USE",
- toBeRemovedAt = "1.6.0.0-PN"
- )
- USE,
-
- @PowerNukkitOnly
- @Since("1.1.1.0-PN")
- @Deprecated @DeprecationDetails(
- since = "1.4.0.0-PN", by = "PowerNukkit",
- reason = "NukkitX added the class but with a different enum for the damage cause",
- replaceWith = "DamageCause.FALL",
- toBeRemovedAt = "1.6.0.0-PN"
- )
- IMPACT;
-
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
- @Deprecated @DeprecationDetails(
- since = "1.4.0.0-PN", by = "PowerNukkit",
- reason = "This is method is only a temporary helper, it will also be removed in future",
- replaceWith = "Direct usage of DamageCause",
- toBeRemovedAt = "1.6.0.0-PN"
- )
- @Nonnull
- public DamageCause getDamageCause() {
- return DamageCause.valueOf(name());
- }
+ @Nullable
+ public Player getPlayer() {
+ return this.player;
}
@Since("1.4.0.0-PN")
@@ -152,30 +168,8 @@ public enum DamageCause {
}
private static Block adjustBlock(Block block, int damage) {
- Block adjusted = block.clone();
- adjusted.setDamage(damage);
+ Block adjusted = Preconditions.checkNotNull(block, "block").clone();
+ adjusted.setDataStorage(damage);
return adjusted;
}
-
- private static DamageCause convert(Cause cause) {
- switch (cause) {
- case USE:
- return DamageCause.USE;
- case IMPACT:
- return DamageCause.FALL;
- default:
- return null;
- }
- }
-
- private static Cause convert(DamageCause cause) {
- switch (cause) {
- case USE:
- return Cause.USE;
- case FALL:
- return Cause.IMPACT;
- default:
- return null;
- }
- }
}
diff --git a/src/main/java/cn/nukkit/event/block/BellRingEvent.java b/src/main/java/cn/nukkit/event/block/BellRingEvent.java
index 18f2bc67d86..29fad42d1a6 100644
--- a/src/main/java/cn/nukkit/event/block/BellRingEvent.java
+++ b/src/main/java/cn/nukkit/event/block/BellRingEvent.java
@@ -1,14 +1,17 @@
package cn.nukkit.event.block;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.BlockBell;
import cn.nukkit.entity.Entity;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.HandlerList;
+@PowerNukkitOnly
public class BellRingEvent extends BlockEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
+ @PowerNukkitOnly
public static HandlerList getHandlers() {
return handlers;
}
@@ -16,6 +19,7 @@ public static HandlerList getHandlers() {
private final RingCause cause;
private final Entity entity;
+ @PowerNukkitOnly
public BellRingEvent(BlockBell bell, RingCause cause, Entity entity) {
super(bell);
this.cause = cause;
@@ -27,20 +31,23 @@ public BlockBell getBlock() {
return (BlockBell) super.getBlock();
}
+ @PowerNukkitOnly
public Entity getEntity() {
return entity;
}
+ @PowerNukkitOnly
public RingCause getCause() {
return cause;
}
+ @PowerNukkitOnly
public enum RingCause {
- HUMAN_INTERACTION,
- REDSTONE,
- PROJECTILE,
- DROPPED_ITEM,
- UNKNOWN
+ @PowerNukkitOnly HUMAN_INTERACTION,
+ @PowerNukkitOnly REDSTONE,
+ @PowerNukkitOnly PROJECTILE,
+ @PowerNukkitOnly DROPPED_ITEM,
+ @PowerNukkitOnly UNKNOWN
}
}
diff --git a/src/main/java/cn/nukkit/event/block/BlockHarvestEvent.java b/src/main/java/cn/nukkit/event/block/BlockHarvestEvent.java
index e214f069251..f661d1a8759 100644
--- a/src/main/java/cn/nukkit/event/block/BlockHarvestEvent.java
+++ b/src/main/java/cn/nukkit/event/block/BlockHarvestEvent.java
@@ -1,10 +1,12 @@
package cn.nukkit.event.block;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.HandlerList;
import cn.nukkit.item.Item;
+@PowerNukkitOnly
public class BlockHarvestEvent extends BlockEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
@@ -12,28 +14,34 @@ public class BlockHarvestEvent extends BlockEvent implements Cancellable {
private Block newState;
private Item[] drops;
+ @PowerNukkitOnly
public BlockHarvestEvent(Block block, Block newState, Item[] drops) {
super(block);
this.newState = newState;
this.drops = drops;
}
+ @PowerNukkitOnly
public Block getNewState() {
return newState;
}
+ @PowerNukkitOnly
public void setNewState(Block newState) {
this.newState = newState;
}
+ @PowerNukkitOnly
public Item[] getDrops() {
return drops;
}
+ @PowerNukkitOnly
public void setDrops(Item[] drops) {
this.drops = drops;
}
+ @PowerNukkitOnly
public static HandlerList getHandlers() {
return handlers;
}
diff --git a/src/main/java/cn/nukkit/event/block/BlockPistonEvent.java b/src/main/java/cn/nukkit/event/block/BlockPistonEvent.java
index 2d1cc3debd7..5121587560e 100644
--- a/src/main/java/cn/nukkit/event/block/BlockPistonEvent.java
+++ b/src/main/java/cn/nukkit/event/block/BlockPistonEvent.java
@@ -1,5 +1,6 @@
package cn.nukkit.event.block;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockPistonBase;
import cn.nukkit.event.Cancellable;
@@ -9,10 +10,12 @@
import java.util.ArrayList;
import java.util.List;
+@PowerNukkitOnly
public class BlockPistonEvent extends BlockEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
+ @PowerNukkitOnly
public static HandlerList getHandlers() {
return handlers;
}
@@ -22,6 +25,7 @@ public static HandlerList getHandlers() {
private final List destroyedBlocks;
private final boolean extending;
+ @PowerNukkitOnly
public BlockPistonEvent(BlockPistonBase piston, BlockFace direction, List blocks, List destroyedBlocks, boolean extending) {
super(piston);
this.direction = direction;
@@ -30,18 +34,22 @@ public BlockPistonEvent(BlockPistonBase piston, BlockFace direction, List
this.extending = extending;
}
+ @PowerNukkitOnly
public BlockFace getDirection() {
return direction;
}
+ @PowerNukkitOnly
public List getBlocks() {
return new ArrayList<>(blocks);
}
+ @PowerNukkitOnly
public List getDestroyedBlocks() {
return destroyedBlocks;
}
+ @PowerNukkitOnly
public boolean isExtending() {
return extending;
}
diff --git a/src/main/java/cn/nukkit/event/block/ComposterEmptyEvent.java b/src/main/java/cn/nukkit/event/block/ComposterEmptyEvent.java
index c6614169ba2..80120a5b67d 100644
--- a/src/main/java/cn/nukkit/event/block/ComposterEmptyEvent.java
+++ b/src/main/java/cn/nukkit/event/block/ComposterEmptyEvent.java
@@ -1,14 +1,14 @@
package cn.nukkit.event.block;
import cn.nukkit.Player;
-import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.HandlerList;
import cn.nukkit.item.Item;
import cn.nukkit.math.Vector3;
-@PowerNukkitDifference(info = "The player and the item are null when they are empty by a hopper pulling the item", since = "1.4.0.0-PN")
+@PowerNukkitOnly
public class ComposterEmptyEvent extends BlockEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
@@ -19,6 +19,7 @@ public class ComposterEmptyEvent extends BlockEvent implements Cancellable {
private int newLevel;
private Vector3 motion;
+ @PowerNukkitOnly
public ComposterEmptyEvent(Block block, Player player, Item itemUsed, Item drop, int newLevel) {
super(block);
this.player = player;
@@ -27,14 +28,17 @@ public ComposterEmptyEvent(Block block, Player player, Item itemUsed, Item drop,
this.newLevel = Math.max(0, Math.min(newLevel, 8));
}
+ @PowerNukkitOnly
public Player getPlayer() {
return player;
}
+ @PowerNukkitOnly
public Item getDrop() {
return drop.clone();
}
+ @PowerNukkitOnly
public void setDrop(Item drop) {
if (drop == null) {
drop = Item.get(Item.AIR);
@@ -44,30 +48,37 @@ public void setDrop(Item drop) {
this.drop = drop;
}
+ @PowerNukkitOnly
public Item getItemUsed() {
return itemUsed;
}
+ @PowerNukkitOnly
public void setItemUsed(Item itemUsed) {
this.itemUsed = itemUsed;
}
+ @PowerNukkitOnly
public int getNewLevel() {
return newLevel;
}
+ @PowerNukkitOnly
public void setNewLevel(int newLevel) {
this.newLevel = Math.max(0, Math.min(newLevel, 8));
}
+ @PowerNukkitOnly
public Vector3 getMotion() {
return motion;
}
+ @PowerNukkitOnly
public void setMotion(Vector3 motion) {
this.motion = motion;
}
+ @PowerNukkitOnly
public static HandlerList getHandlers() {
return handlers;
}
diff --git a/src/main/java/cn/nukkit/event/block/ComposterFillEvent.java b/src/main/java/cn/nukkit/event/block/ComposterFillEvent.java
index f8879c3a35e..4fd733749a1 100644
--- a/src/main/java/cn/nukkit/event/block/ComposterFillEvent.java
+++ b/src/main/java/cn/nukkit/event/block/ComposterFillEvent.java
@@ -1,13 +1,13 @@
package cn.nukkit.event.block;
import cn.nukkit.Player;
-import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.HandlerList;
import cn.nukkit.item.Item;
-@PowerNukkitDifference(info = "Player is null when is filled by a hopper pushing the item", since = "1.4.0.0-PN")
+@PowerNukkitOnly
public class ComposterFillEvent extends BlockEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
@@ -17,6 +17,7 @@ public class ComposterFillEvent extends BlockEvent implements Cancellable {
private final int chance;
private boolean success;
+ @PowerNukkitOnly
public ComposterFillEvent(Block block, Player player, Item item, int chance, boolean success) {
super(block);
this.player = player;
@@ -25,26 +26,32 @@ public ComposterFillEvent(Block block, Player player, Item item, int chance, boo
this.success = success;
}
+ @PowerNukkitOnly
public Player getPlayer() {
return player;
}
+ @PowerNukkitOnly
public Item getItem() {
return item;
}
+ @PowerNukkitOnly
public int getChance() {
return chance;
}
+ @PowerNukkitOnly
public boolean isSuccess() {
return success;
}
+ @PowerNukkitOnly
public void setSuccess(boolean success) {
this.success = success;
}
+ @PowerNukkitOnly
public static HandlerList getHandlers() {
return handlers;
}
diff --git a/src/main/java/cn/nukkit/event/block/ConduitActivateEvent.java b/src/main/java/cn/nukkit/event/block/ConduitActivateEvent.java
index c65368f37d1..d4f58789d9a 100644
--- a/src/main/java/cn/nukkit/event/block/ConduitActivateEvent.java
+++ b/src/main/java/cn/nukkit/event/block/ConduitActivateEvent.java
@@ -1,16 +1,20 @@
package cn.nukkit.event.block;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.event.HandlerList;
+@PowerNukkitOnly
public class ConduitActivateEvent extends BlockEvent {
private static final HandlerList handlers = new HandlerList();
+ @PowerNukkitOnly
public ConduitActivateEvent(Block block) {
super(block);
}
+ @PowerNukkitOnly
public static HandlerList getHandlers() {
return handlers;
}
diff --git a/src/main/java/cn/nukkit/event/block/ConduitDeactivateEvent.java b/src/main/java/cn/nukkit/event/block/ConduitDeactivateEvent.java
index 47d7e5392dd..5b18a12d7cc 100644
--- a/src/main/java/cn/nukkit/event/block/ConduitDeactivateEvent.java
+++ b/src/main/java/cn/nukkit/event/block/ConduitDeactivateEvent.java
@@ -1,16 +1,20 @@
package cn.nukkit.event.block;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.event.HandlerList;
+@PowerNukkitOnly
public class ConduitDeactivateEvent extends BlockEvent {
private static final HandlerList handlers = new HandlerList();
+ @PowerNukkitOnly
public ConduitDeactivateEvent(Block block) {
super(block);
}
+ @PowerNukkitOnly
public static HandlerList getHandlers() {
return handlers;
}
diff --git a/src/main/java/cn/nukkit/event/block/LecternDropBookEvent.java b/src/main/java/cn/nukkit/event/block/LecternDropBookEvent.java
index 097ae605ed3..a9405b45d78 100644
--- a/src/main/java/cn/nukkit/event/block/LecternDropBookEvent.java
+++ b/src/main/java/cn/nukkit/event/block/LecternDropBookEvent.java
@@ -1,11 +1,13 @@
package cn.nukkit.event.block;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.blockentity.BlockEntityLectern;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.HandlerList;
import cn.nukkit.item.Item;
+@PowerNukkitOnly
public class LecternDropBookEvent extends BlockEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
@@ -13,6 +15,7 @@ public class LecternDropBookEvent extends BlockEvent implements Cancellable {
private final BlockEntityLectern lectern;
private Item book;
+ @PowerNukkitOnly
public LecternDropBookEvent(Player player, BlockEntityLectern lectern, Item book) {
super(lectern.getBlock());
this.player = player;
@@ -20,22 +23,27 @@ public LecternDropBookEvent(Player player, BlockEntityLectern lectern, Item book
this.book = book;
}
+ @PowerNukkitOnly
public static HandlerList getHandlers() {
return handlers;
}
+ @PowerNukkitOnly
public BlockEntityLectern getLectern() {
return lectern;
}
+ @PowerNukkitOnly
public Player getPlayer() {
return player;
}
+ @PowerNukkitOnly
public Item getBook() {
return book.clone();
}
+ @PowerNukkitOnly
public void setBook(Item book) {
this.book = book;
}
diff --git a/src/main/java/cn/nukkit/event/block/LecternPageChangeEvent.java b/src/main/java/cn/nukkit/event/block/LecternPageChangeEvent.java
index fe625129cf9..af0b8d50723 100644
--- a/src/main/java/cn/nukkit/event/block/LecternPageChangeEvent.java
+++ b/src/main/java/cn/nukkit/event/block/LecternPageChangeEvent.java
@@ -1,10 +1,12 @@
package cn.nukkit.event.block;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.blockentity.BlockEntityLectern;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.HandlerList;
+@PowerNukkitOnly
public class LecternPageChangeEvent extends BlockEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
@@ -12,6 +14,7 @@ public class LecternPageChangeEvent extends BlockEvent implements Cancellable {
private final BlockEntityLectern lectern;
private int newRawPage;
+ @PowerNukkitOnly
public LecternPageChangeEvent(Player player, BlockEntityLectern lectern, int newPage) {
super(lectern.getBlock());
this.player = player;
@@ -19,42 +22,52 @@ public LecternPageChangeEvent(Player player, BlockEntityLectern lectern, int new
this.newRawPage = newPage;
}
+ @PowerNukkitOnly
public static HandlerList getHandlers() {
return handlers;
}
+ @PowerNukkitOnly
public BlockEntityLectern getLectern() {
return lectern;
}
+ @PowerNukkitOnly
public int getLeftPage() {
return (newRawPage * 2) + 1;
}
+ @PowerNukkitOnly
public int getRightPage() {
return getLeftPage() + 1;
}
+ @PowerNukkitOnly
public void setLeftPage(int newLeftPage) {
this.newRawPage = (newLeftPage - 1) / 2;
}
+ @PowerNukkitOnly
public void setRightPage(int newRightPage) {
this.setLeftPage(newRightPage - 1);
}
+ @PowerNukkitOnly
public int getNewRawPage() {
return newRawPage;
}
+ @PowerNukkitOnly
public void setNewRawPage(int newRawPage) {
this.newRawPage = newRawPage;
}
+ @PowerNukkitOnly
public int getMaxPage() {
return lectern.getTotalPages();
}
+ @PowerNukkitOnly
public Player getPlayer() {
return player;
}
diff --git a/src/main/java/cn/nukkit/event/block/LecternPlaceBookEvent.java b/src/main/java/cn/nukkit/event/block/LecternPlaceBookEvent.java
index 565a3fe03fc..6458cfd676e 100644
--- a/src/main/java/cn/nukkit/event/block/LecternPlaceBookEvent.java
+++ b/src/main/java/cn/nukkit/event/block/LecternPlaceBookEvent.java
@@ -1,11 +1,13 @@
package cn.nukkit.event.block;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.blockentity.BlockEntityLectern;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.HandlerList;
import cn.nukkit.item.Item;
+@PowerNukkitOnly
public class LecternPlaceBookEvent extends BlockEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
@@ -13,6 +15,7 @@ public class LecternPlaceBookEvent extends BlockEvent implements Cancellable {
private final BlockEntityLectern lectern;
private Item book;
+ @PowerNukkitOnly
public LecternPlaceBookEvent(Player player, BlockEntityLectern lectern, Item book) {
super(lectern.getBlock());
this.player = player;
@@ -20,22 +23,27 @@ public LecternPlaceBookEvent(Player player, BlockEntityLectern lectern, Item boo
this.book = book;
}
+ @PowerNukkitOnly
public static HandlerList getHandlers() {
return handlers;
}
+ @PowerNukkitOnly
public BlockEntityLectern getLectern() {
return lectern;
}
+ @PowerNukkitOnly
public Player getPlayer() {
return player;
}
+ @PowerNukkitOnly
public Item getBook() {
return book.clone();
}
+ @PowerNukkitOnly
public void setBook(Item book) {
this.book = book;
}
diff --git a/src/main/java/cn/nukkit/event/block/TurtleEggHatchEvent.java b/src/main/java/cn/nukkit/event/block/TurtleEggHatchEvent.java
index 7b9eb36cd34..5655edec85f 100644
--- a/src/main/java/cn/nukkit/event/block/TurtleEggHatchEvent.java
+++ b/src/main/java/cn/nukkit/event/block/TurtleEggHatchEvent.java
@@ -1,11 +1,13 @@
package cn.nukkit.event.block;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockAir;
import cn.nukkit.block.BlockTurtleEgg;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.HandlerList;
+@PowerNukkitOnly
public class TurtleEggHatchEvent extends BlockEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
@@ -14,12 +16,14 @@ public class TurtleEggHatchEvent extends BlockEvent implements Cancellable {
private Block newState;
private boolean recalculateOnFailure = true;
+ @PowerNukkitOnly
public TurtleEggHatchEvent(BlockTurtleEgg turtleEgg, int eggsHatching, Block newState) {
super(turtleEgg);
this.eggsHatching = eggsHatching;
this.newState = newState;
}
+ @PowerNukkitOnly
public void recalculateNewState() {
BlockTurtleEgg turtleEgg = getBlock();
int eggCount = turtleEgg.getEggCount();
@@ -33,10 +37,12 @@ public void recalculateNewState() {
}
}
+ @PowerNukkitOnly
public Block getNewState() {
return newState;
}
+ @PowerNukkitOnly
public void setNewState(Block newState) {
this.newState = newState;
}
@@ -46,22 +52,27 @@ public BlockTurtleEgg getBlock() {
return (BlockTurtleEgg) super.getBlock();
}
+ @PowerNukkitOnly
public int getEggsHatching() {
return eggsHatching;
}
+ @PowerNukkitOnly
public void setEggsHatching(int eggsHatching) {
this.eggsHatching = eggsHatching;
}
+ @PowerNukkitOnly
public boolean isRecalculateOnFailure() {
return recalculateOnFailure;
}
+ @PowerNukkitOnly
public void setRecalculateOnFailure(boolean recalculateOnFailure) {
this.recalculateOnFailure = recalculateOnFailure;
}
+ @PowerNukkitOnly
public static HandlerList getHandlers() {
return handlers;
}
diff --git a/src/main/java/cn/nukkit/event/block/WaterFrostEvent.java b/src/main/java/cn/nukkit/event/block/WaterFrostEvent.java
index 568361c7803..70966baf66d 100644
--- a/src/main/java/cn/nukkit/event/block/WaterFrostEvent.java
+++ b/src/main/java/cn/nukkit/event/block/WaterFrostEvent.java
@@ -1,25 +1,31 @@
package cn.nukkit.event.block;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.entity.Entity;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.HandlerList;
+@PowerNukkitOnly
public class WaterFrostEvent extends BlockEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
+ @PowerNukkitOnly
public static HandlerList getHandlers() {
return handlers;
}
-
+
+ @PowerNukkitOnly
protected final Entity entity;
+ @PowerNukkitOnly
public WaterFrostEvent(Block block, Entity entity) {
super(block);
this.entity = entity;
}
-
+
+ @PowerNukkitOnly
public Entity getEntity() {
return entity;
}
diff --git a/src/main/java/cn/nukkit/event/blockstate/BlockStateRepairFinishEvent.java b/src/main/java/cn/nukkit/event/blockstate/BlockStateRepairFinishEvent.java
index d98777aa44e..76a14e89094 100644
--- a/src/main/java/cn/nukkit/event/blockstate/BlockStateRepairFinishEvent.java
+++ b/src/main/java/cn/nukkit/event/blockstate/BlockStateRepairFinishEvent.java
@@ -39,6 +39,7 @@ public List getAllRepairs() {
return allRepairs;
}
+ @PowerNukkitOnly
@Nonnull
public Block getResult() {
return result;
diff --git a/src/main/java/cn/nukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/cn/nukkit/event/entity/CreatureSpawnEvent.java
index c2efc1a3207..2e6529acf14 100644
--- a/src/main/java/cn/nukkit/event/entity/CreatureSpawnEvent.java
+++ b/src/main/java/cn/nukkit/event/entity/CreatureSpawnEvent.java
@@ -1,5 +1,6 @@
package cn.nukkit.event.entity;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.entity.Entity;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.Event;
@@ -27,6 +28,7 @@ public CreatureSpawnEvent(int networkId, Position position, CompoundTag nbt, Spa
this.compoundTag = nbt;
}
+ @PowerNukkitOnly
public CreatureSpawnEvent(int networkId, Position position, SpawnReason reason) {
this.reason = reason;
this.entityNetworkId = networkId;
diff --git a/src/main/java/cn/nukkit/event/entity/EntityDamageByEntityEvent.java b/src/main/java/cn/nukkit/event/entity/EntityDamageByEntityEvent.java
index 269a4836770..0fd4f467b3d 100644
--- a/src/main/java/cn/nukkit/event/entity/EntityDamageByEntityEvent.java
+++ b/src/main/java/cn/nukkit/event/entity/EntityDamageByEntityEvent.java
@@ -1,8 +1,12 @@
package cn.nukkit.event.entity;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
+import cn.nukkit.item.enchantment.Enchantment;
import cn.nukkit.potion.Effect;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import java.util.Map;
/**
@@ -10,29 +14,47 @@
*/
public class EntityDamageByEntityEvent extends EntityDamageEvent {
+ @Nonnull
private final Entity damager;
private float knockBack;
- public EntityDamageByEntityEvent(Entity damager, Entity entity, DamageCause cause, float damage) {
+ @Nullable
+ private Enchantment[] enchantments;
+
+ public EntityDamageByEntityEvent(@Nonnull Entity damager, @Nonnull Entity entity, @Nonnull DamageCause cause, float damage) {
this(damager, entity, cause, damage, 0.3f);
}
- public EntityDamageByEntityEvent(Entity damager, Entity entity, DamageCause cause, Map modifiers) {
+ public EntityDamageByEntityEvent(@Nonnull Entity damager, @Nonnull Entity entity, @Nonnull DamageCause cause, Map modifiers) {
this(damager, entity, cause, modifiers, 0.3f);
}
- public EntityDamageByEntityEvent(Entity damager, Entity entity, DamageCause cause, float damage, float knockBack) {
+ public EntityDamageByEntityEvent(@Nonnull Entity damager, @Nonnull Entity entity, @Nonnull DamageCause cause, float damage, float knockBack) {
super(entity, cause, damage);
this.damager = damager;
this.knockBack = knockBack;
this.addAttackerModifiers(damager);
}
- public EntityDamageByEntityEvent(Entity damager, Entity entity, DamageCause cause, Map modifiers, float knockBack) {
+ public EntityDamageByEntityEvent(@Nonnull Entity damager, @Nonnull Entity entity, @Nonnull DamageCause cause, @Nonnull Map modifiers, float knockBack) {
+ this(damager, entity, cause, modifiers, knockBack, null);
+ }
+
+ @Since("1.6.0.0-PN")
+ public EntityDamageByEntityEvent(@Nonnull Entity damager, @Nonnull Entity entity, @Nonnull DamageCause cause, @Nonnull Map modifiers, float knockBack, @Nullable Enchantment[] enchantments) {
super(entity, cause, modifiers);
+ if (enchantments != null) {
+ enchantments = enchantments.length == 0 ? Enchantment.EMPTY_ARRAY : enchantments.clone();
+ for (Enchantment enchantment : enchantments) {
+ if (enchantment != null) {
+ addSideEffects(enchantment.getAttackSideEffects(damager, entity));
+ }
+ }
+ }
this.damager = damager;
this.knockBack = knockBack;
+ this.enchantments = enchantments;
this.addAttackerModifiers(damager);
}
@@ -46,6 +68,7 @@ protected void addAttackerModifiers(Entity damager) {
}
}
+ @Nonnull
public Entity getDamager() {
return damager;
}
@@ -57,4 +80,13 @@ public float getKnockBack() {
public void setKnockBack(float knockBack) {
this.knockBack = knockBack;
}
+
+ @Since("1.6.0.0-PN")
+ @Nullable
+ public Enchantment[] getWeaponEnchantments() {
+ if (enchantments == null) {
+ return null;
+ }
+ return enchantments.length > 0? enchantments.clone() : Enchantment.EMPTY_ARRAY;
+ }
}
diff --git a/src/main/java/cn/nukkit/event/entity/EntityDamageEvent.java b/src/main/java/cn/nukkit/event/entity/EntityDamageEvent.java
index 755555c8f32..4ca95ee2058 100644
--- a/src/main/java/cn/nukkit/event/entity/EntityDamageEvent.java
+++ b/src/main/java/cn/nukkit/event/entity/EntityDamageEvent.java
@@ -1,14 +1,18 @@
package cn.nukkit.event.entity;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.HandlerList;
+import cn.nukkit.item.enchantment.sideeffect.SideEffect;
import cn.nukkit.potion.Effect;
import cn.nukkit.utils.EventException;
import com.google.common.collect.ImmutableMap;
-import java.util.EnumMap;
-import java.util.Map;
+import javax.annotation.Nonnull;
+import java.util.*;
+import java.util.stream.Stream;
/**
* @author MagicDroidX (Nukkit Project)
@@ -26,12 +30,16 @@ public static HandlerList getHandlers() {
private final Map modifiers;
private final Map originals;
+ private SideEffect[] sideEffects = SideEffect.EMPTY_ARRAY;
+
+ private static Map createDamageModifierMap(float baseDamage) {
+ Map modifiers = new EnumMap<>(DamageModifier.class);
+ modifiers.put(DamageModifier.BASE, baseDamage);
+ return modifiers;
+ }
+
public EntityDamageEvent(Entity entity, DamageCause cause, float damage) {
- this(entity, cause, new EnumMap(DamageModifier.class) {
- {
- put(DamageModifier.BASE, damage);
- }
- });
+ this(entity, cause, createDamageModifierMap(damage));
}
public EntityDamageEvent(Entity entity, DamageCause cause, Map modifiers) {
@@ -45,8 +53,8 @@ public EntityDamageEvent(Entity entity, DamageCause cause, Map sideEffects) {
+ this.setSideEffects(sideEffects.toArray(SideEffect.EMPTY_ARRAY));
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public void addSideEffects(@Nonnull SideEffect... sideEffects) {
+ Stream safeStream = Arrays.stream(sideEffects)
+ .filter(Objects::nonNull)
+ .map(SideEffect::cloneSideEffect);
+
+ this.sideEffects = Stream.concat(Arrays.stream(this.sideEffects), safeStream).toArray(SideEffect[]::new);
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public void addSideEffects(@Nonnull Collection sideEffects) {
+ this.addSideEffects(sideEffects.toArray(SideEffect.EMPTY_ARRAY));
+ }
+
public boolean canBeReducedByArmor() {
switch (this.cause) {
case FIRE_TICK:
@@ -223,6 +277,48 @@ public enum DamageCause {
/**
* Damage caused by hunger
*/
- HUNGER
+ HUNGER,
+ /**
+ * Damage caused by Wither
+ */
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ WITHER,
+ /**
+ * Damage caused by thorns
+ */
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ THORNS,
+ /**
+ * Damage caused by falling block
+ */
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ FALLING_BLOCK,
+ /**
+ * Damage caused by flying into wall
+ */
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ FLYING_INTO_WALL,
+ /**
+ * Damage caused when an entity steps on a hot block, like {@link cn.nukkit.block.BlockID#MAGMA}
+ */
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ HOT_FLOOR,
+ /**
+ * Damage caused by fireworks
+ */
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ FIREWORKS,
+ /**
+ * Damage caused by temperature
+ */
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ FREEZING,
}
}
diff --git a/src/main/java/cn/nukkit/event/entity/EntityExplodeEvent.java b/src/main/java/cn/nukkit/event/entity/EntityExplodeEvent.java
index a3f7d11b609..38909860459 100644
--- a/src/main/java/cn/nukkit/event/entity/EntityExplodeEvent.java
+++ b/src/main/java/cn/nukkit/event/entity/EntityExplodeEvent.java
@@ -25,6 +25,7 @@ public static HandlerList getHandlers() {
protected final Position position;
protected List blocks;
+ @PowerNukkitOnly
protected Set ignitions;
protected double yield;
diff --git a/src/main/java/cn/nukkit/event/entity/EntityMoveByPistonEvent.java b/src/main/java/cn/nukkit/event/entity/EntityMoveByPistonEvent.java
index c97048f7ec9..31d19360692 100644
--- a/src/main/java/cn/nukkit/event/entity/EntityMoveByPistonEvent.java
+++ b/src/main/java/cn/nukkit/event/entity/EntityMoveByPistonEvent.java
@@ -1,10 +1,13 @@
package cn.nukkit.event.entity;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.entity.Entity;
import cn.nukkit.event.Cancellable;
import cn.nukkit.math.Vector3;
+@PowerNukkitOnly
public class EntityMoveByPistonEvent extends EntityMotionEvent implements Cancellable {
+ @PowerNukkitOnly
public EntityMoveByPistonEvent(Entity entity, Vector3 pos) {
super(entity, pos);
}
diff --git a/src/main/java/cn/nukkit/event/entity/ProjectileLaunchEvent.java b/src/main/java/cn/nukkit/event/entity/ProjectileLaunchEvent.java
index 8b9b08c6036..7539c9d38e7 100644
--- a/src/main/java/cn/nukkit/event/entity/ProjectileLaunchEvent.java
+++ b/src/main/java/cn/nukkit/event/entity/ProjectileLaunchEvent.java
@@ -16,6 +16,7 @@ public ProjectileLaunchEvent(EntityProjectile entity) {
this.entity = entity;
}
+ @Override
public EntityProjectile getEntity() {
return (EntityProjectile) this.entity;
}
diff --git a/src/main/java/cn/nukkit/event/inventory/CampfireSmeltEvent.java b/src/main/java/cn/nukkit/event/inventory/CampfireSmeltEvent.java
index ea03a7888ef..07563ecf826 100644
--- a/src/main/java/cn/nukkit/event/inventory/CampfireSmeltEvent.java
+++ b/src/main/java/cn/nukkit/event/inventory/CampfireSmeltEvent.java
@@ -1,5 +1,6 @@
package cn.nukkit.event.inventory;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.blockentity.BlockEntityCampfire;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.HandlerList;
@@ -9,10 +10,12 @@
/**
* @author MagicDroidX (Nukkit Project)
*/
+@PowerNukkitOnly
public class CampfireSmeltEvent extends BlockEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
+ @PowerNukkitOnly
public static HandlerList getHandlers() {
return handlers;
}
@@ -22,6 +25,7 @@ public static HandlerList getHandlers() {
private Item result;
private boolean keepItem;
+ @PowerNukkitOnly
public CampfireSmeltEvent(BlockEntityCampfire campfire, Item source, Item result) {
super(campfire.getBlock());
this.source = source.clone();
@@ -30,26 +34,32 @@ public CampfireSmeltEvent(BlockEntityCampfire campfire, Item source, Item result
this.campfire = campfire;
}
+ @PowerNukkitOnly
public BlockEntityCampfire getCampfire() {
return campfire;
}
+ @PowerNukkitOnly
public Item getSource() {
return source;
}
+ @PowerNukkitOnly
public Item getResult() {
return result;
}
+ @PowerNukkitOnly
public void setResult(Item result) {
this.result = result;
}
+ @PowerNukkitOnly
public boolean getKeepItem() {
return keepItem;
}
+ @PowerNukkitOnly
public void setKeepItem(boolean keepItem) {
this.keepItem = keepItem;
}
diff --git a/src/main/java/cn/nukkit/event/inventory/CraftItemEvent.java b/src/main/java/cn/nukkit/event/inventory/CraftItemEvent.java
index d724e7c5107..28b1abf45b1 100644
--- a/src/main/java/cn/nukkit/event/inventory/CraftItemEvent.java
+++ b/src/main/java/cn/nukkit/event/inventory/CraftItemEvent.java
@@ -32,7 +32,7 @@ public CraftItemEvent(CraftingTransaction transaction) {
this.player = transaction.getSource();
this.input = transaction.getInputList().toArray(Item.EMPTY_ARRAY);
- this.recipe = transaction.getRecipe();
+ this.recipe = transaction.getTransactionRecipe();
}
public CraftItemEvent(Player player, Item[] input, Recipe recipe) {
diff --git a/src/main/java/cn/nukkit/event/inventory/EnchantItemEvent.java b/src/main/java/cn/nukkit/event/inventory/EnchantItemEvent.java
index 411c7b2db87..9605cd10d6a 100644
--- a/src/main/java/cn/nukkit/event/inventory/EnchantItemEvent.java
+++ b/src/main/java/cn/nukkit/event/inventory/EnchantItemEvent.java
@@ -6,11 +6,7 @@
import cn.nukkit.event.HandlerList;
import cn.nukkit.inventory.EnchantInventory;
import cn.nukkit.item.Item;
-import lombok.Getter;
-import lombok.Setter;
-@Getter
-@Setter
@Since("1.3.1.0-PN")
public class EnchantItemEvent extends InventoryEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
@@ -32,4 +28,44 @@ public EnchantItemEvent(EnchantInventory inventory, Item oldItem, Item newItem,
this.xpCost = cost;
this.enchanter = p;
}
+
+ @Since("1.3.1.0-PN")
+ public Item getOldItem() {
+ return oldItem;
+ }
+
+ @Since("1.3.1.0-PN")
+ public void setOldItem(Item oldItem) {
+ this.oldItem = oldItem;
+ }
+
+ @Since("1.3.1.0-PN")
+ public Item getNewItem() {
+ return newItem;
+ }
+
+ @Since("1.3.1.0-PN")
+ public void setNewItem(Item newItem) {
+ this.newItem = newItem;
+ }
+
+ @Since("1.3.1.0-PN")
+ public int getXpCost() {
+ return xpCost;
+ }
+
+ @Since("1.3.1.0-PN")
+ public void setXpCost(int xpCost) {
+ this.xpCost = xpCost;
+ }
+
+ @Since("1.3.1.0-PN")
+ public Player getEnchanter() {
+ return enchanter;
+ }
+
+ @Since("1.3.1.0-PN")
+ public void setEnchanter(Player enchanter) {
+ this.enchanter = enchanter;
+ }
}
diff --git a/src/main/java/cn/nukkit/event/player/PlayerBucketEmptyEvent.java b/src/main/java/cn/nukkit/event/player/PlayerBucketEmptyEvent.java
index e2487ab265d..69b2a337760 100644
--- a/src/main/java/cn/nukkit/event/player/PlayerBucketEmptyEvent.java
+++ b/src/main/java/cn/nukkit/event/player/PlayerBucketEmptyEvent.java
@@ -1,6 +1,7 @@
package cn.nukkit.event.player;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.event.HandlerList;
import cn.nukkit.item.Item;
@@ -13,6 +14,7 @@ public static HandlerList getHandlers() {
return handlers;
}
+ @PowerNukkitOnly
public PlayerBucketEmptyEvent(Player who, Block blockClicked, BlockFace blockFace, Block liquid, Item bucket, Item itemInHand) {
super(who, blockClicked, blockFace, liquid, bucket, itemInHand);
}
diff --git a/src/main/java/cn/nukkit/event/player/PlayerBucketEvent.java b/src/main/java/cn/nukkit/event/player/PlayerBucketEvent.java
index 22a5f434f44..652644b59da 100644
--- a/src/main/java/cn/nukkit/event/player/PlayerBucketEvent.java
+++ b/src/main/java/cn/nukkit/event/player/PlayerBucketEvent.java
@@ -1,6 +1,7 @@
package cn.nukkit.event.player;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.event.Cancellable;
import cn.nukkit.item.Item;
@@ -18,7 +19,7 @@ abstract class PlayerBucketEvent extends PlayerEvent implements Cancellable {
private Item item;
-
+ @PowerNukkitOnly
public PlayerBucketEvent(Player who, Block blockClicked, BlockFace blockFace, Block liquid, Item bucket, Item itemInHand) {
this.player = who;
this.blockClicked = blockClicked;
diff --git a/src/main/java/cn/nukkit/event/player/PlayerBucketFillEvent.java b/src/main/java/cn/nukkit/event/player/PlayerBucketFillEvent.java
index 1a327f420e6..4c6e5135fdc 100644
--- a/src/main/java/cn/nukkit/event/player/PlayerBucketFillEvent.java
+++ b/src/main/java/cn/nukkit/event/player/PlayerBucketFillEvent.java
@@ -1,6 +1,7 @@
package cn.nukkit.event.player;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.event.HandlerList;
import cn.nukkit.item.Item;
@@ -13,6 +14,7 @@ public static HandlerList getHandlers() {
return handlers;
}
+ @PowerNukkitOnly
public PlayerBucketFillEvent(Player who, Block blockClicked, BlockFace blockFace, Block liquid, Item bucket, Item itemInHand) {
super(who, blockClicked, blockFace, liquid, bucket, itemInHand);
}
diff --git a/src/main/java/cn/nukkit/event/vehicle/VehicleDamageByEntityEvent.java b/src/main/java/cn/nukkit/event/vehicle/VehicleDamageByEntityEvent.java
index c928e70e1b6..6413d9234c0 100644
--- a/src/main/java/cn/nukkit/event/vehicle/VehicleDamageByEntityEvent.java
+++ b/src/main/java/cn/nukkit/event/vehicle/VehicleDamageByEntityEvent.java
@@ -1,5 +1,6 @@
package cn.nukkit.event.vehicle;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.item.EntityVehicle;
import cn.nukkit.event.Cancellable;
@@ -11,6 +12,7 @@
* @author TrainmasterHD
* @since 09.09.2019
*/
+@PowerNukkitOnly
public final class VehicleDamageByEntityEvent extends VehicleDamageEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
@@ -24,13 +26,14 @@ public final class VehicleDamageByEntityEvent extends VehicleDamageEvent impleme
* @param attacker the attacking vehicle
* @param damage the caused damage on the vehicle
*/
-
+ @PowerNukkitOnly
public VehicleDamageByEntityEvent(final EntityVehicle vehicle, final Entity attacker, final double damage) {
super(vehicle, damage);
this.attacker = attacker;
}
+ @PowerNukkitOnly
public static HandlerList getHandlers() {
return handlers;
}
@@ -40,7 +43,7 @@ public static HandlerList getHandlers() {
*
* @return attacking entity
*/
-
+ @PowerNukkitOnly
public Entity getAttacker() {
return attacker;
}
diff --git a/src/main/java/cn/nukkit/event/vehicle/VehicleDamageEvent.java b/src/main/java/cn/nukkit/event/vehicle/VehicleDamageEvent.java
index fffdabb2c5d..cecceebc478 100644
--- a/src/main/java/cn/nukkit/event/vehicle/VehicleDamageEvent.java
+++ b/src/main/java/cn/nukkit/event/vehicle/VehicleDamageEvent.java
@@ -1,5 +1,6 @@
package cn.nukkit.event.vehicle;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.entity.item.EntityVehicle;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.HandlerList;
@@ -20,6 +21,7 @@ public class VehicleDamageEvent extends VehicleEvent implements Cancellable {
* @param damage the caused damage on the vehicle
*/
+ @PowerNukkitOnly
public VehicleDamageEvent(final EntityVehicle vehicle, final double damage) {
super(vehicle);
diff --git a/src/main/java/cn/nukkit/event/vehicle/VehicleDestroyByEntityEvent.java b/src/main/java/cn/nukkit/event/vehicle/VehicleDestroyByEntityEvent.java
index 436c14e314f..3f0bd8de12f 100644
--- a/src/main/java/cn/nukkit/event/vehicle/VehicleDestroyByEntityEvent.java
+++ b/src/main/java/cn/nukkit/event/vehicle/VehicleDestroyByEntityEvent.java
@@ -1,5 +1,6 @@
package cn.nukkit.event.vehicle;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.entity.Entity;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.HandlerList;
@@ -10,6 +11,7 @@
* @author TrainmasterHD
* @since 09.09.2019
*/
+@PowerNukkitOnly
public final class VehicleDestroyByEntityEvent extends VehicleDestroyEvent implements Cancellable {
private static final HandlerList HANDLER_LIST = new HandlerList();
@@ -22,13 +24,14 @@ public final class VehicleDestroyByEntityEvent extends VehicleDestroyEvent imple
* @param vehicle the destroyed vehicle
* @param destroyer the destroying entity
*/
-
+ @PowerNukkitOnly
public VehicleDestroyByEntityEvent(final Entity vehicle, final Entity destroyer) {
super(vehicle);
this.destroyer = destroyer;
}
+ @PowerNukkitOnly
public static HandlerList getHandlers() {
return HANDLER_LIST;
}
@@ -38,7 +41,7 @@ public static HandlerList getHandlers() {
*
* @return destroying entity
*/
-
+ @PowerNukkitOnly
public Entity getDestroyer() {
return destroyer;
}
diff --git a/src/main/java/cn/nukkit/event/vehicle/VehicleDestroyEvent.java b/src/main/java/cn/nukkit/event/vehicle/VehicleDestroyEvent.java
index 6b866b79e2c..ddd9cda5e53 100644
--- a/src/main/java/cn/nukkit/event/vehicle/VehicleDestroyEvent.java
+++ b/src/main/java/cn/nukkit/event/vehicle/VehicleDestroyEvent.java
@@ -1,5 +1,6 @@
package cn.nukkit.event.vehicle;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.entity.Entity;
import cn.nukkit.event.Cancellable;
import cn.nukkit.event.HandlerList;
@@ -17,6 +18,7 @@ public class VehicleDestroyEvent extends VehicleEvent implements Cancellable {
* @param vehicle the destroyed vehicle
*/
+ @PowerNukkitOnly
public VehicleDestroyEvent(final Entity vehicle) {
super(vehicle);
}
diff --git a/src/main/java/cn/nukkit/form/window/FormWindowCustom.java b/src/main/java/cn/nukkit/form/window/FormWindowCustom.java
index 1a0880329f6..6c7ca263a65 100644
--- a/src/main/java/cn/nukkit/form/window/FormWindowCustom.java
+++ b/src/main/java/cn/nukkit/form/window/FormWindowCustom.java
@@ -65,10 +65,12 @@ public void setIcon(ElementButtonImageData icon) {
this.icon = icon;
}
+ @Override
public FormResponseCustom getResponse() {
return response;
}
+ @Override
public void setResponse(String data) {
if (data.equals("null")) {
this.closed = true;
diff --git a/src/main/java/cn/nukkit/form/window/FormWindowModal.java b/src/main/java/cn/nukkit/form/window/FormWindowModal.java
index 9eb7e95c2ce..7aaa4aa7a72 100644
--- a/src/main/java/cn/nukkit/form/window/FormWindowModal.java
+++ b/src/main/java/cn/nukkit/form/window/FormWindowModal.java
@@ -51,10 +51,12 @@ public void setButton2(String button2) {
this.button2 = button2;
}
+ @Override
public FormResponseModal getResponse() {
return response;
}
+ @Override
public void setResponse(String data) {
if (data.equals("null")) {
closed = true;
diff --git a/src/main/java/cn/nukkit/form/window/FormWindowSimple.java b/src/main/java/cn/nukkit/form/window/FormWindowSimple.java
index 0b7ff67ef2e..7c5ca39b7aa 100644
--- a/src/main/java/cn/nukkit/form/window/FormWindowSimple.java
+++ b/src/main/java/cn/nukkit/form/window/FormWindowSimple.java
@@ -49,10 +49,12 @@ public void addButton(ElementButton button) {
this.buttons.add(button);
}
+ @Override
public FormResponseSimple getResponse() {
return response;
}
+ @Override
public void setResponse(String data) {
if (data.equals("null")) {
this.closed = true;
diff --git a/src/main/java/cn/nukkit/inventory/AnvilInventory.java b/src/main/java/cn/nukkit/inventory/AnvilInventory.java
index 9d7418f8fd0..c25f1c9c67a 100644
--- a/src/main/java/cn/nukkit/inventory/AnvilInventory.java
+++ b/src/main/java/cn/nukkit/inventory/AnvilInventory.java
@@ -4,7 +4,6 @@
import cn.nukkit.api.DeprecationDetails;
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
-import cn.nukkit.block.Block;
import cn.nukkit.block.BlockID;
import cn.nukkit.item.Item;
import cn.nukkit.item.ItemID;
@@ -59,6 +58,7 @@ public void onSlotChange(int index, Item before, boolean send) {
@Deprecated
@DeprecationDetails(since = "1.4.0.0-PN", by = "PowerNukkit", reason = "Experimenting the new implementation by Nukkit")
+ @PowerNukkitOnly
public void updateResult() {
Item target = getFirstItem();
Item sacrifice = getSecondItem();
diff --git a/src/main/java/cn/nukkit/inventory/BarrelInventory.java b/src/main/java/cn/nukkit/inventory/BarrelInventory.java
index c9c3dfae9f2..bd080d42133 100644
--- a/src/main/java/cn/nukkit/inventory/BarrelInventory.java
+++ b/src/main/java/cn/nukkit/inventory/BarrelInventory.java
@@ -1,14 +1,17 @@
package cn.nukkit.inventory;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockBarrel;
import cn.nukkit.blockentity.BlockEntityBarrel;
import cn.nukkit.level.Level;
import cn.nukkit.level.Sound;
+@PowerNukkitOnly
public class BarrelInventory extends ContainerInventory {
+ @PowerNukkitOnly
public BarrelInventory(BlockEntityBarrel barrel) {
super(barrel, InventoryType.BARREL);
}
diff --git a/src/main/java/cn/nukkit/inventory/BaseInventory.java b/src/main/java/cn/nukkit/inventory/BaseInventory.java
index e5ba0d467aa..2b357b328be 100644
--- a/src/main/java/cn/nukkit/inventory/BaseInventory.java
+++ b/src/main/java/cn/nukkit/inventory/BaseInventory.java
@@ -2,6 +2,7 @@
import cn.nukkit.Player;
import cn.nukkit.Server;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockID;
import cn.nukkit.blockentity.BlockEntity;
@@ -579,6 +580,7 @@ public void sendSlot(int index, Collection players) {
this.sendSlot(index, players.toArray(Player.EMPTY_ARRAY));
}
+ @PowerNukkitOnly
@Override
public void addListener(InventoryListener listener) {
if (this.listeners == null) {
@@ -588,6 +590,7 @@ public void addListener(InventoryListener listener) {
this.listeners.add(listener);
}
+ @PowerNukkitOnly
@Override
public void removeListener(InventoryListener listener) {
if (this.listeners != null) {
diff --git a/src/main/java/cn/nukkit/inventory/BlastFurnaceRecipe.java b/src/main/java/cn/nukkit/inventory/BlastFurnaceRecipe.java
index a7ac6b7c0fd..251651b469b 100644
--- a/src/main/java/cn/nukkit/inventory/BlastFurnaceRecipe.java
+++ b/src/main/java/cn/nukkit/inventory/BlastFurnaceRecipe.java
@@ -1,22 +1,27 @@
package cn.nukkit.inventory;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.Item;
+@PowerNukkitOnly
public class BlastFurnaceRecipe implements SmeltingRecipe {
private final Item output;
private Item ingredient;
+ @PowerNukkitOnly
public BlastFurnaceRecipe(Item result, Item ingredient) {
this.output = result.clone();
this.ingredient = ingredient.clone();
}
+ @PowerNukkitOnly
public void setInput(Item item) {
this.ingredient = item.clone();
}
+ @PowerNukkitOnly
@Override
public Item getInput() {
return this.ingredient.clone();
diff --git a/src/main/java/cn/nukkit/inventory/CampfireInventory.java b/src/main/java/cn/nukkit/inventory/CampfireInventory.java
index 8eb4f1c4168..1910344490c 100644
--- a/src/main/java/cn/nukkit/inventory/CampfireInventory.java
+++ b/src/main/java/cn/nukkit/inventory/CampfireInventory.java
@@ -1,14 +1,18 @@
package cn.nukkit.inventory;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.blockentity.BlockEntityCampfire;
import cn.nukkit.item.Item;
+@PowerNukkitOnly
public class CampfireInventory extends ContainerInventory {
+ @PowerNukkitOnly
public CampfireInventory(BlockEntityCampfire campfire) {
super(campfire, InventoryType.CAMPFIRE);
}
+ @PowerNukkitOnly
public CampfireInventory(BlockEntityCampfire furnace, InventoryType inventoryType) {
super(furnace, inventoryType);
}
diff --git a/src/main/java/cn/nukkit/inventory/CampfireRecipe.java b/src/main/java/cn/nukkit/inventory/CampfireRecipe.java
index 235ec906c7a..cd51e046280 100644
--- a/src/main/java/cn/nukkit/inventory/CampfireRecipe.java
+++ b/src/main/java/cn/nukkit/inventory/CampfireRecipe.java
@@ -1,22 +1,27 @@
package cn.nukkit.inventory;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.Item;
+@PowerNukkitOnly
public class CampfireRecipe implements SmeltingRecipe {
private final Item output;
private Item ingredient;
+ @PowerNukkitOnly
public CampfireRecipe(Item result, Item ingredient) {
this.output = result.clone();
this.ingredient = ingredient.clone();
}
+ @PowerNukkitOnly
public void setInput(Item item) {
this.ingredient = item.clone();
}
+ @PowerNukkitOnly
@Override
public Item getInput() {
return this.ingredient.clone();
diff --git a/src/main/java/cn/nukkit/inventory/CartographyRecipe.java b/src/main/java/cn/nukkit/inventory/CartographyRecipe.java
index 1ba2d41e7ad..a038cb5ecb4 100644
--- a/src/main/java/cn/nukkit/inventory/CartographyRecipe.java
+++ b/src/main/java/cn/nukkit/inventory/CartographyRecipe.java
@@ -1,14 +1,18 @@
package cn.nukkit.inventory;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.Item;
import java.util.Collection;
+@PowerNukkitOnly
public class CartographyRecipe extends ShapelessRecipe {
+ @PowerNukkitOnly
public CartographyRecipe(Item result, Collection- ingredients) {
super(result, ingredients);
}
-
+
+ @PowerNukkitOnly
public CartographyRecipe(String recipeId, int priority, Item result, Collection
- ingredients) {
super(recipeId, priority, result, ingredients);
}
diff --git a/src/main/java/cn/nukkit/inventory/CraftingManager.java b/src/main/java/cn/nukkit/inventory/CraftingManager.java
index a7b1ac6bc2e..513c3d369a1 100644
--- a/src/main/java/cn/nukkit/inventory/CraftingManager.java
+++ b/src/main/java/cn/nukkit/inventory/CraftingManager.java
@@ -5,6 +5,7 @@
import cn.nukkit.api.Since;
import cn.nukkit.block.BlockID;
import cn.nukkit.block.BlockUnknown;
+import cn.nukkit.blockproperty.UnknownRuntimeIdException;
import cn.nukkit.blockproperty.exception.BlockPropertyNotFoundException;
import cn.nukkit.blockstate.BlockState;
import cn.nukkit.blockstate.BlockStateRegistry;
@@ -27,8 +28,11 @@
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
+import java.io.UncheckedIOException;
import java.util.*;
+import java.util.stream.Stream;
import java.util.zip.Deflater;
/**
@@ -41,25 +45,31 @@ public class CraftingManager {
@Since("1.5.0.0-PN")
public static DataPacket packet = null;
-
-
+
+
protected final Map> shapedRecipes = new Int2ObjectOpenHashMap<>();
public final Map furnaceRecipes = new Int2ObjectOpenHashMap<>();
+ @PowerNukkitOnly
public final Map blastFurnaceRecipes = new Int2ObjectOpenHashMap<>();
+ @PowerNukkitOnly
public final Map smokerRecipes = new Int2ObjectOpenHashMap<>();
+ @PowerNukkitOnly
public final Map campfireRecipes = new Int2ObjectOpenHashMap<>();
- @Since("1.4.0.0-PN") public final Map multiRecipes = new HashMap<>();
+ @Since("1.4.0.0-PN")
+ public final Map multiRecipes = new HashMap<>();
public final Map brewingRecipes = new Int2ObjectOpenHashMap<>();
public final Map containerRecipes = new Int2ObjectOpenHashMap<>();
+ @PowerNukkitOnly
public final Map stonecutterRecipes = new Int2ObjectOpenHashMap<>();
private static int RECIPE_COUNT = 0;
protected final Map> shapelessRecipes = new Int2ObjectOpenHashMap<>();
+ @PowerNukkitOnly
protected final Map> cartographyRecipes = new Int2ObjectOpenHashMap<>();
-
+
private final Int2ObjectOpenHashMap> smithingRecipes = new Int2ObjectOpenHashMap<>();
public static final Comparator
- recipeComparator = (i1, i2) -> {
@@ -73,7 +83,7 @@ public class CraftingManager {
return -1;
} else return Integer.compare(i1.getCount(), i2.getCount());
};
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public static DataPacket getCraftingPacket() {
@@ -81,15 +91,13 @@ public static DataPacket getCraftingPacket() {
}
public CraftingManager() {
- InputStream recipesStream = Server.class.getClassLoader().getResourceAsStream("recipes.json");
- if (recipesStream == null) {
- throw new AssertionError("Unable to find recipes.json");
+ Config recipesConfig = new Config(Config.JSON);
+ try (InputStream recipesStream = Server.class.getClassLoader().getResourceAsStream("recipes.json")) {
+ recipesConfig.load(Objects.requireNonNull(recipesStream, "Unable to find recipes.json"));
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
}
- registerSmithingRecipes();
-
- Config recipesConfig = new Config(Config.JSON);
- recipesConfig.load(recipesStream);
this.loadRecipes(recipesConfig);
String path = Server.getInstance().getDataPath() + "custom_recipes.json";
@@ -103,27 +111,6 @@ public CraftingManager() {
log.info("Loaded {} recipes.", this.recipes.size());
}
-
- private void registerSmithingRecipes() {
- Item ingot = Item.get(ItemID.NETHERITE_INGOT);
- Int2IntMap ids = new Int2IntOpenHashMap();
- ids.put(ItemID.DIAMOND_HELMET, ItemID.NETHERITE_HELMET);
- ids.put(ItemID.DIAMOND_CHESTPLATE, ItemID.NETHERITE_CHESTPLATE);
- ids.put(ItemID.DIAMOND_LEGGINGS, ItemID.NETHERITE_LEGGINGS);
- ids.put(ItemID.DIAMOND_BOOTS, ItemID.NETHERITE_BOOTS);
- ids.put(ItemID.DIAMOND_SWORD, ItemID.NETHERITE_SWORD);
- ids.put(ItemID.DIAMOND_PICKAXE, ItemID.NETHERITE_PICKAXE);
- ids.put(ItemID.DIAMOND_HOE, ItemID.NETHERITE_HOE);
- ids.put(ItemID.DIAMOND_SHOVEL, ItemID.NETHERITE_SHOVEL);
- ids.put(ItemID.DIAMOND_AXE, ItemID.NETHERITE_AXE);
- ids.int2IntEntrySet().forEach(e->
- new SmithingRecipe(
- Item.get(e.getIntKey()).createFuzzyCraftingRecipe(),
- ingot,
- Item.get(e.getIntValue())
- ).registerToCraftingManager(this)
- );
- }
@SuppressWarnings("unchecked")
private void loadRecipes(Config config) {
@@ -132,11 +119,18 @@ private void loadRecipes(Config config) {
toNextRecipe:
for (Map recipe : recipes) {
try {
- switch (Utils.toInt(recipe.get("type"))) {
+ int type = Utils.toInt(recipe.get("type"));
+ switch (type) {
case 0:
+ case 5:
String craftingBlock = (String) recipe.get("block");
- if (!"crafting_table".equals(craftingBlock) && !"stonecutter".equals(craftingBlock) && !"cartography_table".equalsIgnoreCase(craftingBlock)) {
- // Ignore other recipes than crafting table, stonecutter and cartography table
+ if (type == 5) {
+ craftingBlock = "shulker_box";
+ }
+ if (!"crafting_table".equals(craftingBlock) && !"stonecutter".equals(craftingBlock)
+ && !"cartography_table".equalsIgnoreCase(craftingBlock) && !"shulker_box".equalsIgnoreCase(craftingBlock)
+ && !"smithing_table".equalsIgnoreCase(craftingBlock)) {
+ // Ignore other recipes than crafting table, stonecutter, smithing table and cartography table
continue;
}
// TODO: handle multiple result items
@@ -167,12 +161,18 @@ private void loadRecipes(Config config) {
case "crafting_table":
this.registerRecipe(new ShapelessRecipe(recipeId, priority, result, sorted));
break;
+ case "shulker_box":
+ this.registerRecipe(new ShulkerBoxRecipe(recipeId, priority, result, sorted));
+ break;
case "stonecutter":
this.registerRecipe(new StonecutterRecipe(recipeId, priority, result, sorted.get(0)));
break;
case "cartography_table":
this.registerRecipe(new CartographyRecipe(recipeId, priority, result, sorted));
break;
+ case "smithing_table":
+ this.registerRecipe(new SmithingRecipe(recipeId, priority, sorted, result));
+ break;
}
break;
case 1:
@@ -277,9 +277,9 @@ private void loadRecipes(Config config) {
int toPotionMeta = ((Number) potionMix.get("outputMeta")).intValue();
registerBrewingRecipe(new BrewingRecipe(
- Item.fromString(fromPotionId+":"+fromPotionMeta),
- Item.fromString(ingredient+":"+ingredientMeta),
- Item.fromString(toPotionId+":"+toPotionMeta)
+ Item.fromString(fromPotionId + ":" + fromPotionMeta),
+ Item.fromString(ingredient + ":" + ingredientMeta),
+ Item.fromString(toPotionId + ":" + toPotionMeta)
));
}
@@ -292,7 +292,7 @@ private void loadRecipes(Config config) {
registerContainerRecipe(new ContainerRecipe(Item.fromString(fromItemId), Item.fromString(ingredient), Item.fromString(toItemId)));
}
-
+
// Allow to rename without crafting
registerCartographyRecipe(new CartographyRecipe(Item.get(ItemID.EMPTY_MAP), Collections.singletonList(Item.get(ItemID.EMPTY_MAP))));
registerCartographyRecipe(new CartographyRecipe(Item.get(ItemID.EMPTY_MAP, 2), Collections.singletonList(Item.get(ItemID.EMPTY_MAP, 2))));
@@ -304,15 +304,68 @@ private void loadRecipes(Config config) {
private Item parseRecipeItem(Map data) {
String nbt = (String) data.get("nbt_b64");
+ boolean fuzzy = data.containsKey("fuzzy") && Boolean.parseBoolean(data.get("fuzzy").toString());
byte[] nbtBytes = nbt != null ? Base64.getDecoder().decode(nbt) : EmptyArrays.EMPTY_BYTES;
- int count = data.containsKey("count")? ((Number)data.get("count")).intValue() : 1;
- Integer legacyId = null;
- if (data.containsKey("legacyId")) {
- legacyId = Utils.toInt(data.get("legacyId"));
- }
+ int count = data.containsKey("count") ? ((Number) data.get("count")).intValue() : 1;
Item item;
+ if (data.containsKey("blockState")) {
+ String blockStateId = data.get("blockState").toString();
+ // TODO Remove this when the support is added to these blocks
+ if (Stream.of(
+ "minecraft:candle",
+ "minecraft:cracked_deepslate_bricks",
+ "minecraft:cracked_deepslate_tiles",
+ "minecraft:smooth_basalt",
+ "minecraft:moss_block",
+ "minecraft:deepslate",
+ "minecraft:copper",
+ "minecraft:raw_",
+ "minecraft:pointed_dripstone",
+ "minecraft:mud_brick",
+ "minecraft:mangrove",
+ "minecraft:stripped_mangrove",
+ "minecraft:lightning_rod",
+ "minecraft:mud",
+ "minecraft:packed_mud"
+ ).anyMatch(blockStateId::startsWith)) {
+ return Item.get(BlockID.AIR);
+ }
+ if (Stream.of(
+ "copper", "deepslate", "deepslate_slab",
+ "copper_slab", "copper_stairs"
+ ).anyMatch(blockStateId.split(";", 2)[0]::endsWith)) {
+ return Item.get(BlockID.AIR);
+ }
+ try {
+ BlockState state = BlockState.of(blockStateId);
+ item = state.asItemBlock(count);
+ item.setCompoundTag(nbtBytes);
+ if (fuzzy) {
+ item = item.createFuzzyCraftingRecipe();
+ }
+ return item;
+ } catch (BlockPropertyNotFoundException | UnknownRuntimeIdException e) {
+ int runtimeId = BlockStateRegistry.getKnownRuntimeIdByBlockStateId(blockStateId);
+ if (runtimeId == -1) {
+ log.warn("Unsupported block found in recipes.json: {}", blockStateId);
+ return Item.get(BlockID.AIR);
+ }
+ int blockId = BlockStateRegistry.getBlockIdByRuntimeId(runtimeId);
+ BlockState defaultBlockState = BlockState.of(blockId);
+ if (defaultBlockState.getProperties().equals(BlockUnknown.PROPERTIES)) {
+ log.warn("Unsupported block found in recipes.json: {}", blockStateId);
+ return Item.get(BlockID.AIR);
+ }
+ log.error("Failed to load a recipe with {}", blockStateId, e);
+ return Item.get(BlockID.AIR);
+ } catch (Exception e) {
+ log.error("Failed to load the block state {}", blockStateId, e);
+ return Item.getBlock(BlockID.AIR);
+ }
+ }
+
if (data.containsKey("blockRuntimeId")) {
int blockRuntimeId = Utils.toInt(data.get("blockRuntimeId"));
try {
@@ -325,12 +378,19 @@ private Item parseRecipeItem(Map data) {
}
item = state.asItemBlock(count);
item.setCompoundTag(nbtBytes);
+ if (fuzzy) {
+ item = item.createFuzzyCraftingRecipe();
+ }
return item;
} catch (BlockPropertyNotFoundException e) {
log.debug("Failed to load the block runtime id {}", blockRuntimeId, e);
}
}
+ Integer legacyId = null;
+ if (data.containsKey("legacyId")) {
+ legacyId = Utils.toInt(data.get("legacyId"));
+ }
if (legacyId != null && legacyId > 255) {
try {
int fullId = RuntimeItems.getRuntimeMapping().getLegacyFullId(legacyId);
@@ -340,7 +400,6 @@ private Item parseRecipeItem(Map data) {
meta = RuntimeItems.getData(fullId);
}
- boolean fuzzy = false;
if (data.containsKey("damage")) {
int damage = Utils.toInt(data.get("damage"));
if (damage == Short.MAX_VALUE) {
@@ -366,7 +425,8 @@ private Item parseRecipeItem(Map data) {
if (data.containsKey("damage")) {
int meta = Utils.toInt(data.get("damage"));
if (meta == Short.MAX_VALUE) {
- item = Item.fromString(id).createFuzzyCraftingRecipe();
+ item = Item.fromString(id);
+ fuzzy = true;
} else {
item = Item.fromString(id + ":" + meta);
}
@@ -375,6 +435,10 @@ private Item parseRecipeItem(Map data) {
}
item.setCount(count);
item.setCompoundTag(nbtBytes);
+ if (fuzzy) {
+ item = item.createFuzzyCraftingRecipe();
+ }
+
return item;
}
@@ -389,7 +453,7 @@ public void rebuildPacket() {
pk.addShapelessRecipe((ShapelessRecipe) recipe);
}
}
-
+
for (Map map : cartographyRecipes.values()) {
for (CartographyRecipe recipe : map.values()) {
pk.addCartographyRecipe(recipe);
@@ -447,18 +511,21 @@ public FurnaceRecipe matchFurnaceRecipe(Item input) {
return recipe;
}
+ @PowerNukkitOnly
public CampfireRecipe matchCampfireRecipe(Item input) {
CampfireRecipe recipe = this.campfireRecipes.get(getItemHash(input));
if (recipe == null) recipe = this.campfireRecipes.get(getItemHash(input.getId(), 0));
return recipe;
}
+ @PowerNukkitOnly
public BlastFurnaceRecipe matchBlastFurnaceRecipe(Item input) {
BlastFurnaceRecipe recipe = this.blastFurnaceRecipes.get(getItemHash(input));
if (recipe == null) recipe = this.blastFurnaceRecipes.get(getItemHash(input.getId(), 0));
return recipe;
}
+ @PowerNukkitOnly
public SmokerRecipe matchSmokerRecipe(Item input) {
SmokerRecipe recipe = this.smokerRecipes.get(getItemHash(input));
if (recipe == null) recipe = this.smokerRecipes.get(getItemHash(input.getId(), 0));
@@ -477,6 +544,7 @@ private static int getFullItemHash(Item item) {
return 31 * getItemHash(item) + item.getCount();
}
+ @PowerNukkitOnly
public void registerStonecutterRecipe(StonecutterRecipe recipe) {
this.stonecutterRecipes.put(getItemHash(recipe.getResult()), recipe);
}
@@ -486,17 +554,19 @@ public void registerFurnaceRecipe(FurnaceRecipe recipe) {
this.furnaceRecipes.put(getItemHash(input), recipe);
}
-
+ @PowerNukkitOnly
public void registerBlastFurnaceRecipe(BlastFurnaceRecipe recipe) {
Item input = recipe.getInput();
this.blastFurnaceRecipes.put(getItemHash(input), recipe);
}
+ @PowerNukkitOnly
public void registerSmokerRecipe(SmokerRecipe recipe) {
Item input = recipe.getInput();
this.smokerRecipes.put(getItemHash(input), recipe);
}
+ @PowerNukkitOnly
public void registerCampfireRecipe(CampfireRecipe recipe) {
Item input = recipe.getInput();
this.campfireRecipes.put(getItemHash(input), recipe);
@@ -532,19 +602,20 @@ public void registerRecipe(Recipe recipe) {
recipe.registerToCraftingManager(this);
}
-
+
+ @PowerNukkitOnly
public void registerCartographyRecipe(CartographyRecipe recipe) {
List
- list = recipe.getIngredientList();
list.sort(recipeComparator);
-
+
UUID hash = getMultiItemHash(list);
-
+
int resultHash = getItemHash(recipe.getResult());
Map map = cartographyRecipes.computeIfAbsent(resultHash, k -> new HashMap<>());
-
+
map.put(hash, recipe);
}
-
+
public void registerShapelessRecipe(ShapelessRecipe recipe) {
List
- list = recipe.getIngredientsAggregate();
@@ -555,7 +626,7 @@ public void registerShapelessRecipe(ShapelessRecipe recipe) {
map.put(hash, recipe);
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public void registerSmithingRecipe(@Nonnull SmithingRecipe recipe) {
@@ -585,14 +656,14 @@ public SmithingRecipe matchSmithingRecipe(Item equipment, Item ingredient) {
public SmithingRecipe matchSmithingRecipe(@Nonnull List
- inputList) {
inputList.sort(recipeComparator);
UUID inputHash = getMultiItemHash(inputList);
-
- return smithingRecipes.values().stream().flatMap(map-> map.entrySet().stream())
- .filter(entry-> entry.getKey().equals(inputHash))
+
+ return smithingRecipes.values().stream().flatMap(map -> map.entrySet().stream())
+ .filter(entry -> entry.getKey().equals(inputHash))
.map(Map.Entry::getValue)
- .findFirst().orElseGet(()->
- smithingRecipes.values().stream().flatMap(map-> map.values().stream())
- .filter(recipe -> recipe.matchItems(inputList))
- .findFirst().orElse(null)
+ .findFirst().orElseGet(() ->
+ smithingRecipes.values().stream().flatMap(map -> map.values().stream())
+ .filter(recipe -> recipe.matchItems(inputList))
+ .findFirst().orElse(null)
);
}
@@ -613,7 +684,7 @@ public SmithingRecipe matchSmithingRecipe(@Nonnull List
- inputList, @Nonnul
if (!this.smithingRecipes.containsKey(outputHash)) {
return null;
}
-
+
inputList.sort(recipeComparator);
UUID inputHash = getMultiItemHash(inputList);
@@ -673,37 +744,39 @@ public ContainerRecipe matchContainerRecipe(Item input, Item potion) {
return this.containerRecipes.get(getContainerHash(input.getId(), potion.getId()));
}
+ @PowerNukkitOnly
public StonecutterRecipe matchStonecutterRecipe(Item output) {
return this.stonecutterRecipes.get(getItemHash(output));
}
+ @PowerNukkitOnly
public CartographyRecipe matchCartographyRecipe(List
- inputList, Item primaryOutput, List
- extraOutputList) {
int outputHash = getItemHash(primaryOutput);
-
+
if (cartographyRecipes.containsKey(outputHash)) {
inputList.sort(recipeComparator);
-
+
UUID inputHash = getMultiItemHash(inputList);
-
+
Map recipes = cartographyRecipes.get(outputHash);
-
+
if (recipes == null) {
return null;
}
-
+
CartographyRecipe recipe = recipes.get(inputHash);
-
+
if (recipe != null && recipe.matchItems(inputList, extraOutputList) || matchItemsAccumulation(recipe, inputList, primaryOutput, extraOutputList)) {
return recipe;
}
-
+
for (CartographyRecipe cartographyRecipe : recipes.values()) {
if (cartographyRecipe.matchItems(inputList, extraOutputList) || matchItemsAccumulation(cartographyRecipe, inputList, primaryOutput, extraOutputList)) {
return cartographyRecipe;
}
}
}
-
+
return null;
}
diff --git a/src/main/java/cn/nukkit/inventory/DispenserInventory.java b/src/main/java/cn/nukkit/inventory/DispenserInventory.java
index 88eb5fd8fb7..bd818ac5326 100644
--- a/src/main/java/cn/nukkit/inventory/DispenserInventory.java
+++ b/src/main/java/cn/nukkit/inventory/DispenserInventory.java
@@ -1,11 +1,12 @@
package cn.nukkit.inventory;
-import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.blockentity.BlockEntityDispenser;
-@PowerNukkitDifference(since = "1.4.0.0-PN", info = "Extends EjectableInventory only in PowerNukkit")
+@PowerNukkitOnly
public class DispenserInventory extends EjectableInventory {
+ @PowerNukkitOnly
public DispenserInventory(BlockEntityDispenser blockEntity) {
super(blockEntity, InventoryType.DISPENSER);
}
diff --git a/src/main/java/cn/nukkit/inventory/DropperInventory.java b/src/main/java/cn/nukkit/inventory/DropperInventory.java
index cffd2a5e9c4..c20de0ee271 100644
--- a/src/main/java/cn/nukkit/inventory/DropperInventory.java
+++ b/src/main/java/cn/nukkit/inventory/DropperInventory.java
@@ -1,11 +1,12 @@
package cn.nukkit.inventory;
-import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.blockentity.BlockEntityDropper;
-@PowerNukkitDifference(since = "1.4.0.0-PN", info = "Extends EjectableInventory only in PowerNukkit")
+@PowerNukkitOnly
public class DropperInventory extends EjectableInventory {
+ @PowerNukkitOnly
public DropperInventory(BlockEntityDropper blockEntity) {
super(blockEntity, InventoryType.DROPPER);
}
diff --git a/src/main/java/cn/nukkit/inventory/Fuel.java b/src/main/java/cn/nukkit/inventory/Fuel.java
index 42c3f5db879..b32608d397d 100644
--- a/src/main/java/cn/nukkit/inventory/Fuel.java
+++ b/src/main/java/cn/nukkit/inventory/Fuel.java
@@ -42,7 +42,7 @@ public abstract class Fuel {
addItem(ItemID.BUCKET, (short) 20000);
addBlock(BlockID.LADDER, (short) 300);
addItem(ItemID.BOW, (short) 200);
- addItem(ItemID.BOWL, (short) 200);
+ addItem(ItemID.BOWL, (short) 100);
addBlock(BlockID.WOOD2, (short) 300);
addBlock(BlockID.WOODEN_PRESSURE_PLATE, (short) 300);
addBlock(BlockID.ACACIA_WOOD_STAIRS, (short) 300);
@@ -75,6 +75,7 @@ public abstract class Fuel {
addItem(ItemID.DARK_OAK_SIGN, (short) 200);
addItem(ItemID.JUNGLE_SIGN, (short) 200);
addBlock(BlockID.DRIED_KELP_BLOCK, (short) 4000);
+ addItem(ItemID.CROSSBOW, (short) 200);
}
private static void addItem(int itemID, short fuelDuration) {
diff --git a/src/main/java/cn/nukkit/inventory/FurnaceInventory.java b/src/main/java/cn/nukkit/inventory/FurnaceInventory.java
index 6b2106a92c9..7fe61e2d200 100644
--- a/src/main/java/cn/nukkit/inventory/FurnaceInventory.java
+++ b/src/main/java/cn/nukkit/inventory/FurnaceInventory.java
@@ -1,5 +1,6 @@
package cn.nukkit.inventory;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.blockentity.BlockEntityFurnace;
import cn.nukkit.item.Item;
@@ -12,6 +13,7 @@ public FurnaceInventory(BlockEntityFurnace furnace) {
super(furnace, InventoryType.FURNACE);
}
+ @PowerNukkitOnly
public FurnaceInventory(BlockEntityFurnace furnace, InventoryType inventoryType) {
super(furnace, inventoryType);
}
diff --git a/src/main/java/cn/nukkit/inventory/GrindstoneInventory.java b/src/main/java/cn/nukkit/inventory/GrindstoneInventory.java
index 8675221260f..9b1d2d8d120 100644
--- a/src/main/java/cn/nukkit/inventory/GrindstoneInventory.java
+++ b/src/main/java/cn/nukkit/inventory/GrindstoneInventory.java
@@ -128,6 +128,7 @@ public void onSlotChange(int index, Item before, boolean send) {
}
}
+ @PowerNukkitOnly
public boolean updateResult(boolean send) {
Item firstItem = getFirstItem();
Item secondItem = getSecondItem();
diff --git a/src/main/java/cn/nukkit/inventory/Inventory.java b/src/main/java/cn/nukkit/inventory/Inventory.java
index 512abe3e9f9..c9b099cfe4c 100644
--- a/src/main/java/cn/nukkit/inventory/Inventory.java
+++ b/src/main/java/cn/nukkit/inventory/Inventory.java
@@ -1,6 +1,7 @@
package cn.nukkit.inventory;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.Item;
import java.util.Collection;
@@ -98,7 +99,9 @@ default boolean clear(int index) {
void onSlotChange(int index, Item before, boolean send);
+ @PowerNukkitOnly
void addListener(InventoryListener listener);
+ @PowerNukkitOnly
void removeListener(InventoryListener listener);
}
diff --git a/src/main/java/cn/nukkit/inventory/InventoryListener.java b/src/main/java/cn/nukkit/inventory/InventoryListener.java
index 889b24bfc26..15c78503c89 100644
--- a/src/main/java/cn/nukkit/inventory/InventoryListener.java
+++ b/src/main/java/cn/nukkit/inventory/InventoryListener.java
@@ -1,8 +1,11 @@
package cn.nukkit.inventory;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.Item;
+@PowerNukkitOnly
public interface InventoryListener {
+ @PowerNukkitOnly
void onInventoryChanged(Inventory inventory, Item oldItem, int slot);
}
diff --git a/src/main/java/cn/nukkit/inventory/PlayerUIInventory.java b/src/main/java/cn/nukkit/inventory/PlayerUIInventory.java
index bebd5a67649..703ea8b5702 100644
--- a/src/main/java/cn/nukkit/inventory/PlayerUIInventory.java
+++ b/src/main/java/cn/nukkit/inventory/PlayerUIInventory.java
@@ -1,6 +1,7 @@
package cn.nukkit.inventory;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.Item;
import cn.nukkit.network.protocol.InventorySlotPacket;
import cn.nukkit.network.protocol.types.ContainerIds;
@@ -101,7 +102,8 @@ public void onSlotChange(int index, Item before, boolean send) {
super.onSlotChange(index, before, send);
}
}
-
+
+ @PowerNukkitOnly
public void onSlotChangeBase(int index, Item before, boolean send) {
super.onSlotChange(index, before, send);
}
diff --git a/src/main/java/cn/nukkit/inventory/RecipeType.java b/src/main/java/cn/nukkit/inventory/RecipeType.java
index b76d97c0fc3..27a983fd400 100644
--- a/src/main/java/cn/nukkit/inventory/RecipeType.java
+++ b/src/main/java/cn/nukkit/inventory/RecipeType.java
@@ -21,7 +21,7 @@ public enum RecipeType {
@PowerNukkitOnly STONECUTTER(0),
@PowerNukkitOnly CARTOGRAPHY(0),
@PowerNukkitOnly REPAIR(-1),
- @PowerNukkitOnly @Since("1.4.0.0-PN") SMITHING(-1)
+ @PowerNukkitOnly @Since("1.4.0.0-PN") SMITHING(0)
;
@PowerNukkitOnly public final int networkType;
diff --git a/src/main/java/cn/nukkit/inventory/RepairRecipe.java b/src/main/java/cn/nukkit/inventory/RepairRecipe.java
index adc882f8846..b9147e2a435 100644
--- a/src/main/java/cn/nukkit/inventory/RepairRecipe.java
+++ b/src/main/java/cn/nukkit/inventory/RepairRecipe.java
@@ -1,17 +1,20 @@
package cn.nukkit.inventory;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.Item;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+@PowerNukkitOnly
public class RepairRecipe implements Recipe {
private final Item result;
private final List
- ingredients;
private final InventoryType inventoryType;
-
+
+ @PowerNukkitOnly
public RepairRecipe(InventoryType inventoryType, Item result, Collection
- ingredients) {
this.inventoryType = inventoryType;
this.result = result.clone();
@@ -29,7 +32,8 @@ public RepairRecipe(InventoryType inventoryType, Item result, Collection
- i
public Item getResult() {
return result.clone();
}
-
+
+ @PowerNukkitOnly
public List
- getIngredientList() {
List
- ingredients = new ArrayList<>();
for (Item ingredient : this.ingredients) {
@@ -48,7 +52,8 @@ public void registerToCraftingManager(CraftingManager manager) {
public RecipeType getType() {
return RecipeType.REPAIR;
}
-
+
+ @PowerNukkitOnly
public InventoryType getInventoryType() {
return inventoryType;
}
diff --git a/src/main/java/cn/nukkit/inventory/ShapedRecipe.java b/src/main/java/cn/nukkit/inventory/ShapedRecipe.java
index 0241d57364f..04cf82ce2ac 100644
--- a/src/main/java/cn/nukkit/inventory/ShapedRecipe.java
+++ b/src/main/java/cn/nukkit/inventory/ShapedRecipe.java
@@ -212,6 +212,7 @@ public int getPriority() {
return this.priority;
}
+ @Override
public boolean matchItems(List
- inputList, List
- extraOutputList, int multiplier) {
List
- haveInputs = new ArrayList<>();
for (Item item : inputList) {
diff --git a/src/main/java/cn/nukkit/inventory/ShapelessRecipe.java b/src/main/java/cn/nukkit/inventory/ShapelessRecipe.java
index b9b2eeec1a3..489e04ab321 100644
--- a/src/main/java/cn/nukkit/inventory/ShapelessRecipe.java
+++ b/src/main/java/cn/nukkit/inventory/ShapelessRecipe.java
@@ -128,6 +128,7 @@ public int getPriority() {
return this.priority;
}
+ @Override
public boolean matchItems(List
- inputList, List
- extraOutputList, int multiplier) {
List
- haveInputs = new ArrayList<>();
for (Item item : inputList) {
diff --git a/src/main/java/cn/nukkit/inventory/ShulkerBoxRecipe.java b/src/main/java/cn/nukkit/inventory/ShulkerBoxRecipe.java
new file mode 100644
index 00000000000..6f523f5482f
--- /dev/null
+++ b/src/main/java/cn/nukkit/inventory/ShulkerBoxRecipe.java
@@ -0,0 +1,32 @@
+package cn.nukkit.inventory;
+
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+import cn.nukkit.item.Item;
+
+import java.util.Collection;
+
+/**
+ * @author joserobjr
+ * @since 2021-09-25
+ */
+@PowerNukkitOnly
+@Since("1.5.2.0-PN")
+public class ShulkerBoxRecipe extends ShapelessRecipe {
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public ShulkerBoxRecipe(Item result, Collection
- ingredients) {
+ super(result, ingredients);
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public ShulkerBoxRecipe(String recipeId, int priority, Item result, Collection
- ingredients) {
+ super(recipeId, priority, result, ingredients);
+ }
+
+ @Override
+ public RecipeType getType() {
+ return RecipeType.SHULKER_BOX;
+ }
+}
diff --git a/src/main/java/cn/nukkit/inventory/SmeltingRecipe.java b/src/main/java/cn/nukkit/inventory/SmeltingRecipe.java
index d0a96b4a023..051bbb15795 100644
--- a/src/main/java/cn/nukkit/inventory/SmeltingRecipe.java
+++ b/src/main/java/cn/nukkit/inventory/SmeltingRecipe.java
@@ -1,7 +1,10 @@
package cn.nukkit.inventory;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.Item;
+@PowerNukkitOnly
public interface SmeltingRecipe extends Recipe {
+ @PowerNukkitOnly
Item getInput();
}
diff --git a/src/main/java/cn/nukkit/inventory/SmithingRecipe.java b/src/main/java/cn/nukkit/inventory/SmithingRecipe.java
index 2247014087f..ce5fbad2da2 100644
--- a/src/main/java/cn/nukkit/inventory/SmithingRecipe.java
+++ b/src/main/java/cn/nukkit/inventory/SmithingRecipe.java
@@ -24,6 +24,7 @@
import lombok.ToString;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -36,7 +37,7 @@
@PowerNukkitOnly
@Since("1.4.0.0-PN")
@ToString
-public class SmithingRecipe implements Recipe {
+public class SmithingRecipe extends ShapelessRecipe {
private final Item equipment;
private final Item ingredient;
private final Item result;
@@ -45,9 +46,10 @@ public class SmithingRecipe implements Recipe {
@PowerNukkitOnly
@Since("1.4.0.0-PN")
- public SmithingRecipe(Item equipment, Item ingredient, Item result) {
- this.equipment = equipment;
- this.ingredient = ingredient;
+ public SmithingRecipe(String recipeId, int priority, Collection
- ingredients, Item result) {
+ super(recipeId, priority, result, ingredients);
+ this.equipment = (Item) ingredients.toArray()[0];
+ this.ingredient = (Item) ingredients.toArray()[1];
this.result = result;
ArrayList
- aggregation = new ArrayList<>(2);
diff --git a/src/main/java/cn/nukkit/inventory/SmokerRecipe.java b/src/main/java/cn/nukkit/inventory/SmokerRecipe.java
index c8284a4a354..97fee15e3af 100644
--- a/src/main/java/cn/nukkit/inventory/SmokerRecipe.java
+++ b/src/main/java/cn/nukkit/inventory/SmokerRecipe.java
@@ -1,22 +1,27 @@
package cn.nukkit.inventory;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.Item;
+@PowerNukkitOnly
public class SmokerRecipe implements SmeltingRecipe {
private final Item output;
private Item ingredient;
+ @PowerNukkitOnly
public SmokerRecipe(Item result, Item ingredient) {
this.output = result.clone();
this.ingredient = ingredient.clone();
}
+ @PowerNukkitOnly
public void setInput(Item item) {
this.ingredient = item.clone();
}
+ @PowerNukkitOnly
@Override
public Item getInput() {
return this.ingredient.clone();
diff --git a/src/main/java/cn/nukkit/inventory/StonecutterInventory.java b/src/main/java/cn/nukkit/inventory/StonecutterInventory.java
index 2184abf08f6..46bd73cea30 100644
--- a/src/main/java/cn/nukkit/inventory/StonecutterInventory.java
+++ b/src/main/java/cn/nukkit/inventory/StonecutterInventory.java
@@ -1,10 +1,13 @@
package cn.nukkit.inventory;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.Item;
import cn.nukkit.level.Position;
+@PowerNukkitOnly
public class StonecutterInventory extends FakeBlockUIComponent {
+ @PowerNukkitOnly
public StonecutterInventory(PlayerUIInventory playerUI, Position position) {
super(playerUI, InventoryType.STONECUTTER, 3, position);
}
diff --git a/src/main/java/cn/nukkit/inventory/StonecutterRecipe.java b/src/main/java/cn/nukkit/inventory/StonecutterRecipe.java
index da6c6b67970..f082b40a74e 100644
--- a/src/main/java/cn/nukkit/inventory/StonecutterRecipe.java
+++ b/src/main/java/cn/nukkit/inventory/StonecutterRecipe.java
@@ -1,10 +1,12 @@
package cn.nukkit.inventory;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.Item;
import lombok.ToString;
import java.util.UUID;
+@PowerNukkitOnly
@ToString
public class StonecutterRecipe implements Recipe {
@@ -18,10 +20,12 @@ public class StonecutterRecipe implements Recipe {
private final int priority;
+ @PowerNukkitOnly
public StonecutterRecipe(Item result, Item ingredient) {
this(null, 10, result, ingredient);
}
+ @PowerNukkitOnly
public StonecutterRecipe(String recipeId, int priority, Item result, Item ingredient) {
this.recipeId = recipeId;
this.priority = priority;
@@ -37,14 +41,17 @@ public Item getResult() {
return this.output.clone();
}
+ @PowerNukkitOnly
public String getRecipeId() {
return this.recipeId;
}
+ @PowerNukkitOnly
public UUID getId() {
return new UUID(least, most);
}
+ @PowerNukkitOnly
public void setId(UUID uuid) {
this.least = uuid.getLeastSignificantBits();
this.most = uuid.getMostSignificantBits();
@@ -54,6 +61,7 @@ public void setId(UUID uuid) {
}
}
+ @PowerNukkitOnly
public Item getIngredient() {
return ingredient.clone();
}
@@ -68,6 +76,7 @@ public RecipeType getType() {
return RecipeType.STONECUTTER;
}
+ @PowerNukkitOnly
public int getPriority() {
return this.priority;
}
diff --git a/src/main/java/cn/nukkit/inventory/transaction/CraftingTransaction.java b/src/main/java/cn/nukkit/inventory/transaction/CraftingTransaction.java
index b18d4783c0a..1cf88ed25a4 100644
--- a/src/main/java/cn/nukkit/inventory/transaction/CraftingTransaction.java
+++ b/src/main/java/cn/nukkit/inventory/transaction/CraftingTransaction.java
@@ -1,6 +1,7 @@
package cn.nukkit.inventory.transaction;
import cn.nukkit.Player;
+import cn.nukkit.api.DeprecationDetails;
import cn.nukkit.api.PowerNukkitDifference;
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
@@ -12,6 +13,7 @@
import cn.nukkit.inventory.transaction.action.TakeLevelAction;
import cn.nukkit.item.Item;
+import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
@@ -29,8 +31,16 @@ public class CraftingTransaction extends InventoryTransaction {
protected Item primaryOutput;
- protected Recipe recipe;
+ @Deprecated
+ @DeprecationDetails(since = "1.6.0.0-PN", reason = "When the recipe is not a CraftingRecipe, this is set to null instead of the recipe",
+ by = "PowerNukkit", replaceWith = "getTransactionRecipe()")
+ @Nullable
+ @Since("1.6.0.0-PN")
+ protected CraftingRecipe recipe;
+ private Recipe transactionRecipe;
+
+ @PowerNukkitOnly
protected int craftingType;
private boolean readyToExecute;
@@ -94,19 +104,38 @@ public void setPrimaryOutput(Item item) {
}
}
- public Recipe getRecipe() {
+ @Deprecated
+ @DeprecationDetails(since = "1.6.0.0-PN", reason = "When the recipe is not a CraftingRecipe, returns null instead of the recipe",
+ by = "PowerNukkit", replaceWith = "getTransactionRecipe()")
+ @Since("1.6.0.0-PN")
+ @Nullable
+ public CraftingRecipe getRecipe() {
return recipe;
}
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ public Recipe getTransactionRecipe() {
+ return transactionRecipe;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ protected void setTransactionRecipe(Recipe recipe) {
+ this.transactionRecipe = recipe;
+ this.recipe = (recipe instanceof CraftingRecipe)? (CraftingRecipe) recipe: null;
+ }
+
+ @Override
public boolean canExecute() {
CraftingManager craftingManager = source.getServer().getCraftingManager();
Inventory inventory;
switch (craftingType) {
case Player.CRAFTING_STONECUTTER:
- recipe = craftingManager.matchStonecutterRecipe(this.primaryOutput);
+ setTransactionRecipe(craftingManager.matchStonecutterRecipe(this.primaryOutput));
break;
case Player.CRAFTING_CARTOGRAPHY:
- recipe = craftingManager.matchCartographyRecipe(inputs, this.primaryOutput, this.secondaryOutputs);
+ setTransactionRecipe(craftingManager.matchCartographyRecipe(inputs, this.primaryOutput, this.secondaryOutputs));
break;
case Player.CRAFTING_SMITHING:
inventory = source.getWindowById(Player.SMITHING_WINDOW_ID);
@@ -115,7 +144,7 @@ public boolean canExecute() {
SmithingInventory smithingInventory = (SmithingInventory) inventory;
SmithingRecipe smithingRecipe = smithingInventory.matchRecipe();
if (smithingRecipe != null && this.primaryOutput.equals(smithingRecipe.getFinalResult(smithingInventory.getEquipment()), true, true)) {
- recipe = smithingRecipe;
+ setTransactionRecipe(smithingRecipe);
}
}
@@ -130,7 +159,7 @@ public boolean canExecute() {
TakeLevelAction takeLevel = new TakeLevelAction(anvil.getLevelCost());
addAction(takeLevel);
if (takeLevel.isValid(source)) {
- recipe = new RepairRecipe(InventoryType.ANVIL, this.primaryOutput, this.inputs);
+ setTransactionRecipe(new RepairRecipe(InventoryType.ANVIL, this.primaryOutput, this.inputs));
PlayerUIInventory uiInventory = source.getUIInventory();
actions.add(new DamageAnvilAction(anvil, !source.isCreative() && ThreadLocalRandom.current().nextFloat() < 0.12F, this));
actions.stream()
@@ -147,7 +176,7 @@ public boolean canExecute() {
}
}
}
- if (recipe == null) {
+ if (getTransactionRecipe() == null) {
source.sendExperienceLevel();
}
source.getUIInventory().setItem(AnvilInventory.RESULT, Item.get(0), false);
@@ -158,19 +187,20 @@ public boolean canExecute() {
GrindstoneInventory grindstone = (GrindstoneInventory) inventory;
addInventory(grindstone);
if (grindstone.updateResult(false) && this.primaryOutput.equals(grindstone.getResult(), true, true)) {
- recipe = new RepairRecipe(InventoryType.GRINDSTONE, this.primaryOutput, this.inputs);
+ setTransactionRecipe(new RepairRecipe(InventoryType.GRINDSTONE, this.primaryOutput, this.inputs));
grindstone.setResult(Item.get(0), false);
}
}
break;
default:
- recipe = craftingManager.matchRecipe(inputs, this.primaryOutput, this.secondaryOutputs);
+ setTransactionRecipe(craftingManager.matchRecipe(inputs, this.primaryOutput, this.secondaryOutputs));
break;
}
- return this.recipe != null && super.canExecute();
+ return this.getTransactionRecipe() != null && super.canExecute();
}
+ @Override
protected boolean callExecuteEvent() {
CraftItemEvent ev;
@@ -178,11 +208,13 @@ protected boolean callExecuteEvent() {
return !ev.isCancelled();
}
+ @Override
@PowerNukkitDifference(since = "1.4.0.0-PN", info = "No longer closes the inventory")
protected void sendInventories() {
super.sendInventories();
}
+ @Override
public boolean execute() {
if (super.execute()) {
switch (this.primaryOutput.getId()) {
diff --git a/src/main/java/cn/nukkit/inventory/transaction/EnchantTransaction.java b/src/main/java/cn/nukkit/inventory/transaction/EnchantTransaction.java
index a45385d0107..fe230613883 100644
--- a/src/main/java/cn/nukkit/inventory/transaction/EnchantTransaction.java
+++ b/src/main/java/cn/nukkit/inventory/transaction/EnchantTransaction.java
@@ -10,13 +10,9 @@
import cn.nukkit.item.Item;
import cn.nukkit.item.ItemDye;
import cn.nukkit.network.protocol.types.NetworkInventoryAction;
-import lombok.Getter;
-import lombok.Setter;
import java.util.List;
-@Getter
-@Setter
@Since("1.3.1.0-PN")
public class EnchantTransaction extends InventoryTransaction {
private Item inputItem;
@@ -113,4 +109,34 @@ public boolean checkForEnchantPart(List actions) {
}
return false;
}
+
+ @Since("1.3.1.0-PN")
+ public Item getInputItem() {
+ return inputItem;
+ }
+
+ @Since("1.3.1.0-PN")
+ public void setInputItem(Item inputItem) {
+ this.inputItem = inputItem;
+ }
+
+ @Since("1.3.1.0-PN")
+ public Item getOutputItem() {
+ return outputItem;
+ }
+
+ @Since("1.3.1.0-PN")
+ public void setOutputItem(Item outputItem) {
+ this.outputItem = outputItem;
+ }
+
+ @Since("1.3.1.0-PN")
+ public int getCost() {
+ return cost;
+ }
+
+ @Since("1.3.1.0-PN")
+ public void setCost(int cost) {
+ this.cost = cost;
+ }
}
diff --git a/src/main/java/cn/nukkit/inventory/transaction/InventoryTransaction.java b/src/main/java/cn/nukkit/inventory/transaction/InventoryTransaction.java
index ce166042b4b..7e9a179c9ac 100644
--- a/src/main/java/cn/nukkit/inventory/transaction/InventoryTransaction.java
+++ b/src/main/java/cn/nukkit/inventory/transaction/InventoryTransaction.java
@@ -6,7 +6,6 @@
import cn.nukkit.event.inventory.InventoryClickEvent;
import cn.nukkit.event.inventory.InventoryTransactionEvent;
import cn.nukkit.inventory.Inventory;
-import cn.nukkit.inventory.PlayerInventory;
import cn.nukkit.inventory.transaction.action.InventoryAction;
import cn.nukkit.inventory.transaction.action.SlotChangeAction;
import cn.nukkit.inventory.transaction.action.TakeLevelAction;
diff --git a/src/main/java/cn/nukkit/inventory/transaction/RepairItemTransaction.java b/src/main/java/cn/nukkit/inventory/transaction/RepairItemTransaction.java
index 898dc72a116..5e2374a9ab0 100644
--- a/src/main/java/cn/nukkit/inventory/transaction/RepairItemTransaction.java
+++ b/src/main/java/cn/nukkit/inventory/transaction/RepairItemTransaction.java
@@ -3,6 +3,10 @@
import cn.nukkit.Player;
import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
+import cn.nukkit.block.BlockAnvil;
+import cn.nukkit.block.BlockID;
+import cn.nukkit.blockproperty.value.AnvilDamage;
+import cn.nukkit.blockstate.BlockState;
import cn.nukkit.event.block.AnvilDamageEvent;
import cn.nukkit.event.block.AnvilDamageEvent.DamageCause;
import cn.nukkit.event.inventory.RepairItemEvent;
@@ -86,17 +90,15 @@ public boolean execute() {
ev.setCancelled(oldDamage == newDamage);
this.source.getServer().getPluginManager().callEvent(ev);
if (!ev.isCancelled()) {
- newDamage = ev.getNewDamage();
- if (newDamage > 2) {
+ BlockState newState = ev.getNewBlockState();
+ if (newState.getBlockId() == BlockID.AIR
+ || newState.getBlockId() == BlockID.ANVIL && newState.getPropertyValue(BlockAnvil.DAMAGE).equals(AnvilDamage.BROKEN)) {
this.source.level.setBlock(block, Block.get(Block.AIR), true);
this.source.level.addLevelEvent(block, LevelEventPacket.EVENT_SOUND_ANVIL_BREAK);
} else {
- if (newDamage < 0) {
- newDamage = 0;
- }
- if (newDamage != oldDamage) {
- block.setDamage((newDamage << 2) | (block.getDamage() & 0x3));
- this.source.level.setBlock(block, block, true);
+ if (!newState.equals(ev.getOldBlockState())) {
+ Block newBlock = newState.getBlockRepairing(block);
+ this.source.level.setBlock(block, newBlock, true);
}
this.source.level.addLevelEvent(block, LevelEventPacket.EVENT_SOUND_ANVIL_USE);
}
diff --git a/src/main/java/cn/nukkit/inventory/transaction/action/CraftingTakeResultAction.java b/src/main/java/cn/nukkit/inventory/transaction/action/CraftingTakeResultAction.java
index 0a4f7f78e1e..a0d0c186158 100644
--- a/src/main/java/cn/nukkit/inventory/transaction/action/CraftingTakeResultAction.java
+++ b/src/main/java/cn/nukkit/inventory/transaction/action/CraftingTakeResultAction.java
@@ -16,6 +16,7 @@ public CraftingTakeResultAction(Item sourceItem, Item targetItem) {
super(sourceItem, targetItem);
}
+ @Override
public void onAddToTransaction(InventoryTransaction transaction) {
if (transaction instanceof CraftingTransaction) {
((CraftingTransaction) transaction).setPrimaryOutput(this.getSourceItem());
diff --git a/src/main/java/cn/nukkit/inventory/transaction/action/CreativeInventoryAction.java b/src/main/java/cn/nukkit/inventory/transaction/action/CreativeInventoryAction.java
index 595f6465efc..c9122aa8971 100644
--- a/src/main/java/cn/nukkit/inventory/transaction/action/CreativeInventoryAction.java
+++ b/src/main/java/cn/nukkit/inventory/transaction/action/CreativeInventoryAction.java
@@ -30,6 +30,7 @@ public CreativeInventoryAction(Item source, Item target, int action) {
* @param source player
* @return valid
*/
+ @Override
public boolean isValid(Player source) {
return source.isCreative() &&
(this.actionType == TYPE_DELETE_ITEM || Item.getCreativeItemIndex(this.sourceItem) != -1);
@@ -50,14 +51,17 @@ public int getActionType() {
* @param source playere
* @return successfully executed
*/
+ @Override
public boolean execute(Player source) {
return true;
}
+ @Override
public void onExecuteSuccess(Player source) {
}
+ @Override
public void onExecuteFail(Player source) {
}
diff --git a/src/main/java/cn/nukkit/inventory/transaction/action/DamageAnvilAction.java b/src/main/java/cn/nukkit/inventory/transaction/action/DamageAnvilAction.java
index c027b985a73..1a9117cd86d 100644
--- a/src/main/java/cn/nukkit/inventory/transaction/action/DamageAnvilAction.java
+++ b/src/main/java/cn/nukkit/inventory/transaction/action/DamageAnvilAction.java
@@ -1,6 +1,7 @@
package cn.nukkit.inventory.transaction.action;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockAnvil;
import cn.nukkit.block.BlockID;
@@ -11,13 +12,15 @@
import cn.nukkit.level.Sound;
import lombok.ToString;
+@PowerNukkitOnly
@ToString(callSuper = true)
public class DamageAnvilAction extends InventoryAction {
private final AnvilInventory anvil;
private boolean shouldDamage;
private CraftingTransaction transaction;
-
+
+ @PowerNukkitOnly
public DamageAnvilAction(AnvilInventory anvil, boolean shouldDamage, CraftingTransaction transaction) {
super(Item.get(0), Item.get(0));
this.anvil = anvil;
@@ -43,7 +46,7 @@ public boolean execute(Player source) {
} else {
newState.setDamage(newState.getDamage() & (Block.DATA_MASK ^ 0b1100) | (damage << 2));
}
- AnvilDamageEvent ev = new AnvilDamageEvent(levelBlock, newState, source, transaction, AnvilDamageEvent.Cause.USE);
+ AnvilDamageEvent ev = new AnvilDamageEvent(levelBlock, newState, source, transaction, AnvilDamageEvent.DamageCause.USE);
ev.setCancelled(!shouldDamage);
source.getServer().getPluginManager().callEvent(ev);
if (ev.isCancelled()) {
diff --git a/src/main/java/cn/nukkit/inventory/transaction/action/DropItemAction.java b/src/main/java/cn/nukkit/inventory/transaction/action/DropItemAction.java
index 0beaeec6b20..9b61237387a 100644
--- a/src/main/java/cn/nukkit/inventory/transaction/action/DropItemAction.java
+++ b/src/main/java/cn/nukkit/inventory/transaction/action/DropItemAction.java
@@ -19,6 +19,7 @@ public DropItemAction(Item source, Item target) {
* Verifies that the source item of a drop-item action must be air. This is not strictly necessary, just a sanity
* check.
*/
+ @Override
public boolean isValid(Player source) {
return this.sourceItem.isNull();
}
@@ -33,14 +34,17 @@ public boolean onPreExecute(Player source) {
/**
* Drops the target item in front of the player.
*/
+ @Override
public boolean execute(Player source) {
return source.dropItem(this.targetItem);
}
+ @Override
public void onExecuteSuccess(Player source) {
}
+ @Override
public void onExecuteFail(Player source) {
}
diff --git a/src/main/java/cn/nukkit/inventory/transaction/action/EnchantingAction.java b/src/main/java/cn/nukkit/inventory/transaction/action/EnchantingAction.java
index c3c1c3ff1dd..ad16934b53b 100644
--- a/src/main/java/cn/nukkit/inventory/transaction/action/EnchantingAction.java
+++ b/src/main/java/cn/nukkit/inventory/transaction/action/EnchantingAction.java
@@ -1,15 +1,15 @@
package cn.nukkit.inventory.transaction.action;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitDifference;
import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
-import lombok.Getter;
import lombok.ToString;
@Since("1.3.1.0-PN")
@ToString(callSuper = true)
-public class EnchantingAction extends InventoryAction {
- @Getter @Since("1.3.1.0-PN")
+@PowerNukkitDifference(extendsOnlyInPowerNukkit = NoOpIventoryAction.class, insteadOf = InventoryAction.class)
+public class EnchantingAction extends NoOpIventoryAction {
private int type;
@Since("1.3.1.0-PN")
@@ -23,17 +23,8 @@ public boolean isValid(Player source) {
return source.getWindowById(Player.ENCHANT_WINDOW_ID) != null;
}
- @Override
- public boolean execute(Player source) {
- return true;
- }
-
- @Override
- public void onExecuteSuccess(Player source) {
- }
-
- @Override
- public void onExecuteFail(Player source) {
-
+ @Since("1.3.1.0-PN")
+ public int getType() {
+ return type;
}
}
diff --git a/src/main/java/cn/nukkit/inventory/transaction/action/NoOpIventoryAction.java b/src/main/java/cn/nukkit/inventory/transaction/action/NoOpIventoryAction.java
new file mode 100644
index 00000000000..632734b66b0
--- /dev/null
+++ b/src/main/java/cn/nukkit/inventory/transaction/action/NoOpIventoryAction.java
@@ -0,0 +1,35 @@
+package cn.nukkit.inventory.transaction.action;
+
+import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+import cn.nukkit.item.Item;
+
+/**
+ * @author joserobjr
+ * @since 2021-12-11
+ */
+@PowerNukkitOnly
+@Since("1.6.0.0-PN")
+public abstract class NoOpIventoryAction extends InventoryAction {
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ protected NoOpIventoryAction(Item sourceItem, Item targetItem) {
+ super(sourceItem, targetItem);
+ }
+
+ @Override
+ public boolean execute(Player source) {
+ return true;
+ }
+
+ @Override
+ public void onExecuteSuccess(Player source) {
+ // Does nothing
+ }
+
+ @Override
+ public void onExecuteFail(Player source) {
+ // Does nothing
+ }
+}
diff --git a/src/main/java/cn/nukkit/inventory/transaction/action/RepairItemAction.java b/src/main/java/cn/nukkit/inventory/transaction/action/RepairItemAction.java
index 1fb3f4a8f26..7c6cd48a14c 100644
--- a/src/main/java/cn/nukkit/inventory/transaction/action/RepairItemAction.java
+++ b/src/main/java/cn/nukkit/inventory/transaction/action/RepairItemAction.java
@@ -1,11 +1,15 @@
package cn.nukkit.inventory.transaction.action;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitDifference;
import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
+import lombok.ToString;
@Since("1.4.0.0-PN")
-public class RepairItemAction extends InventoryAction {
+@ToString(callSuper = true)
+@PowerNukkitDifference(extendsOnlyInPowerNukkit = NoOpIventoryAction.class, insteadOf = InventoryAction.class)
+public class RepairItemAction extends NoOpIventoryAction {
private int type;
@@ -20,21 +24,6 @@ public boolean isValid(Player source) {
return source.getWindowById(Player.ANVIL_WINDOW_ID) != null;
}
- @Override
- public boolean execute(Player source) {
- return true;
- }
-
- @Override
- public void onExecuteSuccess(Player source) {
-
- }
-
- @Override
- public void onExecuteFail(Player source) {
-
- }
-
@Since("1.4.0.0-PN")
public int getType() {
return this.type;
diff --git a/src/main/java/cn/nukkit/inventory/transaction/action/SlotChangeAction.java b/src/main/java/cn/nukkit/inventory/transaction/action/SlotChangeAction.java
index 15ed52a0f87..92277d1fbd8 100644
--- a/src/main/java/cn/nukkit/inventory/transaction/action/SlotChangeAction.java
+++ b/src/main/java/cn/nukkit/inventory/transaction/action/SlotChangeAction.java
@@ -4,7 +4,6 @@
import cn.nukkit.inventory.Inventory;
import cn.nukkit.inventory.transaction.InventoryTransaction;
import cn.nukkit.item.Item;
-import lombok.ToString;
import java.util.HashSet;
import java.util.Set;
@@ -12,7 +11,6 @@
/**
* @author CreeperFace
*/
-@ToString(callSuper = true)
public class SlotChangeAction extends InventoryAction {
protected Inventory inventory;
@@ -48,6 +46,7 @@ public int getSlot() {
* @param source player
* @return valid
*/
+ @Override
public boolean isValid(Player source) {
Item check = inventory.getItem(this.inventorySlot);
@@ -60,6 +59,7 @@ public boolean isValid(Player source) {
* @param source player
* @return successfully executed
*/
+ @Override
public boolean execute(Player source) {
return this.inventory.setItem(this.inventorySlot, this.targetItem, false);
}
@@ -69,6 +69,7 @@ public boolean execute(Player source) {
*
* @param source player
*/
+ @Override
public void onExecuteSuccess(Player source) {
Set viewers = new HashSet<>(this.inventory.getViewers());
viewers.remove(source);
@@ -81,6 +82,7 @@ public void onExecuteSuccess(Player source) {
*
* @param source player
*/
+ @Override
public void onExecuteFail(Player source) {
this.inventory.sendSlot(this.inventorySlot, source);
}
diff --git a/src/main/java/cn/nukkit/inventory/transaction/action/TakeLevelAction.java b/src/main/java/cn/nukkit/inventory/transaction/action/TakeLevelAction.java
index 8bb17dee89d..757a2e03901 100644
--- a/src/main/java/cn/nukkit/inventory/transaction/action/TakeLevelAction.java
+++ b/src/main/java/cn/nukkit/inventory/transaction/action/TakeLevelAction.java
@@ -1,19 +1,23 @@
package cn.nukkit.inventory.transaction.action;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.Item;
import lombok.ToString;
+@PowerNukkitOnly
@ToString(callSuper = true)
public class TakeLevelAction extends InventoryAction {
private final int levels;
-
+
+ @PowerNukkitOnly
public TakeLevelAction(int levels) {
super(Item.get(0), Item.get(0));
this.levels = levels;
}
-
+
+ @PowerNukkitOnly
public int getLevels() {
return levels;
}
diff --git a/src/main/java/cn/nukkit/item/Item.java b/src/main/java/cn/nukkit/item/Item.java
index e1e97f434e7..b6af8542441 100644
--- a/src/main/java/cn/nukkit/item/Item.java
+++ b/src/main/java/cn/nukkit/item/Item.java
@@ -3,17 +3,20 @@
import cn.nukkit.Player;
import cn.nukkit.Server;
import cn.nukkit.api.*;
-import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockID;
+import cn.nukkit.block.BlockUnknown;
import cn.nukkit.blockproperty.UnknownRuntimeIdException;
+import cn.nukkit.blockproperty.exception.BlockPropertyNotFoundException;
import cn.nukkit.blockproperty.exception.InvalidBlockPropertyMetaException;
import cn.nukkit.blockstate.BlockState;
import cn.nukkit.blockstate.BlockStateRegistry;
import cn.nukkit.blockstate.exception.InvalidBlockStateException;
import cn.nukkit.entity.Entity;
import cn.nukkit.inventory.Fuel;
+import cn.nukkit.item.RuntimeItemMapping.RuntimeEntry;
import cn.nukkit.item.enchantment.Enchantment;
+import cn.nukkit.item.enchantment.sideeffect.SideEffect;
import cn.nukkit.level.Level;
import cn.nukkit.math.BlockFace;
import cn.nukkit.math.Vector3;
@@ -28,6 +31,7 @@
import lombok.SneakyThrows;
import lombok.extern.log4j.Log4j2;
+import javax.annotation.Nonnull;
import java.io.IOException;
import java.io.InputStream;
import java.io.UncheckedIOException;
@@ -48,7 +52,7 @@ public class Item implements Cloneable, BlockID, ItemID {
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public static final Item[] EMPTY_ARRAY = new Item[0];
-
+
/**
* Groups:
*
@@ -65,7 +69,7 @@ public class Item implements Cloneable, BlockID, ItemID {
protected static String UNKNOWN_STR = "Unknown";
public static Class[] list = null;
-
+
private static Map itemIds = Arrays.stream(ItemID.class.getDeclaredFields())
.filter(field-> field.getModifiers() == (Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL))
.filter(field -> field.getType().equals(int.class))
@@ -223,7 +227,7 @@ public static void init() {
list[SIGN] = ItemSign.class; //323
list[WOODEN_DOOR] = ItemDoorWood.class; //324
list[BUCKET] = ItemBucket.class; //325
-
+
list[MINECART] = ItemMinecart.class; //328
list[SADDLE] = ItemSaddle.class; //329
list[IRON_DOOR] = ItemDoorIron.class; //330
@@ -232,7 +236,6 @@ public static void init() {
list[BOAT] = ItemBoat.class; //333
list[LEATHER] = ItemLeather.class; //334
list[KELP] = ItemKelp.class; //335
-
list[BRICK] = ItemBrick.class; //336
list[CLAY] = ItemClay.class; //337
list[SUGARCANE] = ItemSugarcane.class; //338
@@ -299,7 +302,7 @@ public static void init() {
list[NETHER_STAR] = ItemNetherStar.class; //399
list[PUMPKIN_PIE] = ItemPumpkinPie.class; //400
list[FIREWORKS] = ItemFirework.class; //401
-
+ list[FIREWORKSCHARGE] = ItemFireworkStar.class; //402
list[ENCHANTED_BOOK] = ItemBookEnchanted.class; //403
list[COMPARATOR] = ItemRedstoneComparator.class; //404
list[NETHER_BRICK] = ItemNetherBrick.class; //405
@@ -339,16 +342,14 @@ public static void init() {
list[LINGERING_POTION] = ItemPotionLingering.class; //441
list[ELYTRA] = ItemElytra.class; //444
-
list[SHULKER_SHELL] = ItemShulkerShell.class; //445
list[BANNER] = ItemBanner.class; //446
list[TOTEM] = ItemTotem.class; //450
-
+
list[IRON_NUGGET] = ItemNuggetIron.class; //452
-
- list[TRIDENT] = ItemTrident.class; //455
+ list[TRIDENT] = ItemTrident.class; //455
list[BEETROOT] = ItemBeetroot.class; //457
list[BEETROOT_SEEDS] = ItemSeedsBeetroot.class; //458
list[BEETROOT_SOUP] = ItemBeetrootSoup.class; //459
@@ -357,11 +358,12 @@ public static void init() {
list[PUFFERFISH] = ItemPufferfish.class; //462
list[COOKED_SALMON] = ItemSalmonCooked.class; //463
list[DRIED_KELP] = ItemDriedKelp.class; //464
-
+ list[NAUTILUS_SHELL] = ItemNautilusShell.class; //465
list[GOLDEN_APPLE_ENCHANTED] = ItemAppleGoldEnchanted.class; //466
-
+ list[HEART_OF_THE_SEA] = ItemHeartOfTheSea.class; //467
+ list[SCUTE] = ItemScute.class; //468
list[TURTLE_SHELL] = ItemTurtleShell.class; //469
-
+ list[PHANTOM_MEMBRANE] = ItemPhantomMembrane.class; //470
list[CROSSBOW] = ItemCrossbow.class; //471
list[SPRUCE_SIGN] = ItemSpruceSign.class; //472
list[BIRCH_SIGN] = ItemBirchSign.class; //473
@@ -391,7 +393,7 @@ public static void init() {
list[HONEYCOMB] = ItemHoneycomb.class; //736
list[HONEY_BOTTLE] = ItemHoneyBottle.class; //737
-
+
list[LODESTONECOMPASS] = ItemCompassLodestone.class; //741;
list[NETHERITE_INGOT] = ItemIngotNetherite.class; //742
list[NETHERITE_SWORD] = ItemSwordNetherite.class; //743
@@ -413,8 +415,10 @@ public static void init() {
list[RECORD_PIGSTEP] = ItemRecordPigstep.class; //759
list[NETHER_SPROUTS] = ItemNetherSprouts.class; //760
+ list[SPYGLASS] = ItemSpyglass.class; //772
+
list[SOUL_CAMPFIRE] = ItemCampfireSoul.class; //801
-
+
for (int i = 0; i < 256; ++i) {
if (Block.list[i] != null) {
list[i] = Block.list[i];
@@ -476,6 +480,50 @@ private static Item loadCreativeItemEntry(Map data) {
String nbt = (String) data.get("nbt_b64");
byte[] nbtBytes = nbt != null ? Base64.getDecoder().decode(nbt) : EmptyArrays.EMPTY_BYTES;
+ if (data.containsKey("blockState")) {
+ String blockStateId = data.get("blockState").toString();
+ // TODO Remove this when the support is added to these blocks
+ if (Stream.of(
+ "minecraft:candle",
+ "minecraft:deepslate",
+ "minecraft:cracked_deepslate_bricks",
+ "minecraft:cracked_deepslate_tiles",
+ "minecraft:smooth_basalt"
+ ).anyMatch(blockStateId::startsWith)) {
+ return null;
+ }
+ try {
+ // TODO Remove this when the support is added to these blocks
+ String[] stateParts = blockStateId.split(";", 2);
+ Integer blockId = BlockStateRegistry.getBlockId(stateParts[0]);
+ if (blockId != null && blockId > BlockID.QUARTZ_BRICKS) {
+ return Item.getBlock(BlockID.AIR);
+ }
+
+ BlockState state = BlockState.of(blockStateId);
+ Item item = state.asItemBlock();
+ item.setCompoundTag(nbtBytes);
+ return item;
+ } catch (BlockPropertyNotFoundException | UnknownRuntimeIdException e) {
+ int runtimeId = BlockStateRegistry.getKnownRuntimeIdByBlockStateId(blockStateId);
+ if (runtimeId == -1) {
+ log.warn("Unsupported block found in creativeitems.json: {}", blockStateId);
+ return null;
+ }
+ int blockId = BlockStateRegistry.getBlockIdByRuntimeId(runtimeId);
+ BlockState defaultBlockState = BlockState.of(blockId);
+ if (defaultBlockState.getProperties().equals(BlockUnknown.PROPERTIES)) {
+ log.warn("Unsupported block found in creativeitems.json: {}", blockStateId);
+ return null;
+ }
+ log.error("Failed to load the creative item with {}", blockStateId, e);
+ return null;
+ } catch (Exception e) {
+ log.error("Failed to load the creative item {}", blockStateId, e);
+ return null;
+ }
+ }
+
String id = data.get("id").toString();
Item item = null;
if (data.containsKey("damage")) {
@@ -550,18 +598,22 @@ public static int getCreativeItemIndex(Item item) {
return -1;
}
+ @PowerNukkitOnly
public static Item getBlock(int id) {
return getBlock(id, 0);
}
+ @PowerNukkitOnly
public static Item getBlock(int id, Integer meta) {
return getBlock(id, meta, 1);
}
+ @PowerNukkitOnly
public static Item getBlock(int id, Integer meta, int count) {
return getBlock(id, meta, count, EmptyArrays.EMPTY_BYTES);
}
+ @PowerNukkitOnly
public static Item getBlock(int id, Integer meta, int count, byte[] tags) {
if (id > 255) {
id = 255 - id;
@@ -617,7 +669,7 @@ public static Item get(int id, Integer meta, int count, byte[] tags) {
} catch (UnknownRuntimeIdException e) {
log.warn("Attempted to get an illegal item block {}:{} ({}), the runtime id was unknown and the meta was changed to 0",
id, meta, blockId, e);
- item = BlockState.of(id).asItemBlock(count);
+ item = BlockState.of(blockId).asItemBlock(count);
}
}
} else if (c == null) {
@@ -633,10 +685,10 @@ public static Item get(int id, Integer meta, int count, byte[] tags) {
if (tags.length != 0) {
item.setCompoundTag(tags);
}
-
+
return item;
} catch (Exception e) {
- log.error("Error getting the item {}:{}{}! Returning an unsafe item stack!",
+ log.error("Error getting the item {}:{}{}! Returning an unsafe item stack!",
id, meta, id < 0? " ("+(255 - id)+")":"", e);
return new Item(id, meta, count).setCompoundTag(tags);
}
@@ -649,7 +701,7 @@ public static Item fromString(String str) {
if (!matcher.matches()) {
return get(AIR);
}
-
+
String name = matcher.group(2);
OptionalInt meta = OptionalInt.empty();
String metaGroup;
@@ -690,7 +742,7 @@ public static Item fromString(String str) {
int id = Integer.parseInt(numericIdGroup);
return get(id, meta.orElse(0));
}
-
+
if (name == null) {
return get(AIR);
}
@@ -876,15 +928,6 @@ public boolean hasEnchantments() {
return false;
}
- /**
- * Convenience method to check if the item stack has positive level on a specific enchantment by it's id.
- * @param id The enchantment ID from {@link Enchantment} constants.
- */
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
- public boolean hasEnchantment(int id) {
- return getEnchantmentLevel(id) > 0;
- }
/**
* Find the enchantment level by the enchantment id.
@@ -903,7 +946,7 @@ public int getEnchantmentLevel(int id) {
return entry.getShort("lvl");
}
}
-
+
return 0;
}
@@ -990,6 +1033,26 @@ public Enchantment[] getEnchantments() {
return enchantments.toArray(Enchantment.EMPTY_ARRAY);
}
+ /**
+ * Convenience method to check if the item stack has positive level on a specific enchantment by it's id.
+ * @param id The enchantment ID from {@link Enchantment} constants.
+ */
+ @Since("1.4.0.0-PN")
+ public boolean hasEnchantment(int id) {
+ return this.getEnchantmentLevel(id) > 0;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Nonnull
+ public SideEffect[] getAttackSideEffects(@Nonnull Entity attacker, @Nonnull Entity entity) {
+ return Arrays.stream(getEnchantments())
+ .flatMap(enchantment -> Arrays.stream(enchantment.getAttackSideEffects(attacker, entity)))
+ .filter(Objects::nonNull)
+ .toArray(SideEffect[]::new)
+ ;
+ }
+
@Since("1.4.0.0-PN")
public int getRepairCost() {
if (this.hasCompoundTag()) {
@@ -1237,11 +1300,6 @@ public final int getNetworkFullId() throws UnknownNetworkIdException {
}
}
- @Since("1.4.0.0-PN")
- public final int getNetworkId() throws UnknownNetworkIdException {
- return RuntimeItems.getNetworkId(getNetworkFullId());
- }
-
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public String getNamespaceId() {
@@ -1250,7 +1308,7 @@ public String getNamespaceId() {
RuntimeItems.getNetworkId(runtimeMapping.getNetworkFullId(this))
);
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getBlockId() {
@@ -1272,7 +1330,7 @@ public void setDamage(Integer meta) {
this.hasMeta = false;
}
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public Item createFuzzyCraftingRecipe() {
@@ -1388,19 +1446,21 @@ public boolean isUnbreakable() {
public boolean isLavaResistant() {
return false;
}
-
+
public boolean onUse(Player player, int ticksUsed) {
return false;
}
+ /**
+ * Allows the item to execute code when the player releases the item after long clicking it.
+ * @param player The player who released the click button
+ * @param ticksUsed How many ticks the item was held.
+ * @return If an inventory contents update should be sent to the player
+ */
public boolean onRelease(Player player, int ticksUsed) {
return false;
}
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
- public boolean damageWhenBreaking() { return true; }
-
@Override
final public String toString() {
return "Item " + this.name + " (" + this.id + ":" + (!this.hasMeta ? "?" : this.meta) + ")x" + this.count + (this.hasCompoundTag() ? " tags:0x" + Binary.bytesToHexString(this.getCompoundTag()) : "");
@@ -1492,6 +1552,8 @@ public final boolean equalsExact(Item other) {
* Same as {@link #equals(Item, boolean)} but the enchantment order of the items does not affect the result.
* @since 1.2.1.0-PN
*/
+ @PowerNukkitOnly
+ @Since("1.2.1.0-PN")
public final boolean equalsIgnoringEnchantmentOrder(Item item, boolean checkDamage) {
if (!this.equals(item, checkDamage, false)) {
return false;
@@ -1567,4 +1629,14 @@ public Item clone() {
}
}
+ @Since("1.6.0.0-PN")
+ public final RuntimeEntry getRuntimeEntry() {
+ //TODO Implement
+ throw new UnsupportedOperationException();
+ }
+
+ @Since("1.4.0.0-PN")
+ public final int getNetworkId() throws UnknownNetworkIdException {
+ return RuntimeItems.getNetworkId(getNetworkFullId());
+ }
}
diff --git a/src/main/java/cn/nukkit/item/ItemAcaciaSign.java b/src/main/java/cn/nukkit/item/ItemAcaciaSign.java
index 4040026a888..fc29c1a818e 100644
--- a/src/main/java/cn/nukkit/item/ItemAcaciaSign.java
+++ b/src/main/java/cn/nukkit/item/ItemAcaciaSign.java
@@ -1,17 +1,22 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.BlockAcaciaSignPost;
+@PowerNukkitOnly
public class ItemAcaciaSign extends ItemSign {
+ @PowerNukkitOnly
public ItemAcaciaSign() {
this(0, 1);
}
+ @PowerNukkitOnly
public ItemAcaciaSign(Integer meta) {
this(meta, 1);
}
+ @PowerNukkitOnly
public ItemAcaciaSign(Integer meta, int count) {
super(ACACIA_SIGN, meta, count, "Acacia Sign", new BlockAcaciaSignPost());
}
diff --git a/src/main/java/cn/nukkit/item/ItemAmethystShard.java b/src/main/java/cn/nukkit/item/ItemAmethystShard.java
new file mode 100644
index 00000000000..6ac047bd3bc
--- /dev/null
+++ b/src/main/java/cn/nukkit/item/ItemAmethystShard.java
@@ -0,0 +1,30 @@
+package cn.nukkit.item;
+
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+
+/**
+ * @author GoodLucky777
+ */
+@PowerNukkitOnly
+@Since("FUTURE")
+public class ItemAmethystShard extends Item {
+
+ @PowerNukkitOnly
+ @Since("FUTURE")
+ public ItemAmethystShard() {
+ this(0, 1);
+ }
+
+ @PowerNukkitOnly
+ @Since("FUTURE")
+ public ItemAmethystShard(Integer meta) {
+ this(meta, 1);
+ }
+
+ @PowerNukkitOnly
+ @Since("FUTURE")
+ public ItemAmethystShard(Integer meta, int count) {
+ super(AMETHYST_SHARD, meta, count, "Amethyst Shard");
+ }
+}
diff --git a/src/main/java/cn/nukkit/item/ItemArmor.java b/src/main/java/cn/nukkit/item/ItemArmor.java
index 9bd7254c170..87ba82924ac 100644
--- a/src/main/java/cn/nukkit/item/ItemArmor.java
+++ b/src/main/java/cn/nukkit/item/ItemArmor.java
@@ -1,7 +1,6 @@
package cn.nukkit.item;
import cn.nukkit.Player;
-import cn.nukkit.api.DeprecationDetails;
import cn.nukkit.api.PowerNukkitDifference;
import cn.nukkit.api.Since;
import cn.nukkit.level.Sound;
@@ -9,6 +8,8 @@
import cn.nukkit.nbt.tag.ByteTag;
import cn.nukkit.nbt.tag.Tag;
+import static cn.nukkit.utils.Utils.dynamic;
+
/**
* @author MagicDroidX (Nukkit Project)
*/
@@ -21,13 +22,7 @@ abstract public class ItemArmor extends Item implements ItemDurable {
public static final int TIER_DIAMOND = 5;
@Since("1.4.0.0-PN") public static final int TIER_NETHERITE = 6;
- @Deprecated
- @DeprecationDetails(since = "1.4.0.0-PN",
- reason = "The value of this 'constant' is unstable, it may change if new tiers gets added. Refrain from using it. " +
- "Changes in this value will not be considered as an API breaking change and will not affect code that " +
- "is already compiled."
- )
- public static final int TIER_OTHER = 1000;
+ public static final int TIER_OTHER = dynamic(1000);
public ItemArmor(int id) {
super(id);
@@ -83,7 +78,8 @@ public boolean onClickAir(Player player, Vector3 directionVector) {
}
if (equip) {
player.getInventory().setItem(player.getInventory().getHeldItemIndex(), oldSlotItem);
- switch (this.getTier()) {
+ final int tier = this.getTier();
+ switch (tier) {
case TIER_CHAIN:
player.getLevel().addSound(player, Sound.ARMOR_EQUIP_CHAIN);
break;
@@ -102,7 +98,6 @@ public boolean onClickAir(Player player, Vector3 directionVector) {
case TIER_NETHERITE:
player.getLevel().addSound(player, Sound.ARMOR_EQUIP_NETHERITE);
break;
- case TIER_OTHER:
default:
player.getLevel().addSound(player, Sound.ARMOR_EQUIP_GENERIC);
}
diff --git a/src/main/java/cn/nukkit/item/ItemArmorStand.java b/src/main/java/cn/nukkit/item/ItemArmorStand.java
index fa66588519c..e8b50dcf4c1 100644
--- a/src/main/java/cn/nukkit/item/ItemArmorStand.java
+++ b/src/main/java/cn/nukkit/item/ItemArmorStand.java
@@ -18,23 +18,19 @@
import static cn.nukkit.math.CompassRoseDirection.Precision.PRIMARY_INTER_CARDINAL;
-@PowerNukkitOnly
@Since("1.4.0.0-PN")
public class ItemArmorStand extends Item {
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemArmorStand() {
this(0);
}
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemArmorStand(Integer meta) {
this(meta, 1);
}
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemArmorStand(Integer meta, int count) {
super(ARMOR_STAND, meta, count, "Armor Stand");
diff --git a/src/main/java/cn/nukkit/item/ItemArrow.java b/src/main/java/cn/nukkit/item/ItemArrow.java
index ba63bfe1659..8f6cdc5a32b 100644
--- a/src/main/java/cn/nukkit/item/ItemArrow.java
+++ b/src/main/java/cn/nukkit/item/ItemArrow.java
@@ -1,10 +1,19 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+import cn.nukkit.potion.Potion;
+import cn.nukkit.utils.ServerException;
+
+import javax.annotation.Nullable;
+
/**
* @author MagicDroidX (Nukkit Project)
*/
public class ItemArrow extends Item {
+ private static final String GENERIC_NAME = "Arrow";
+
public ItemArrow() {
this(0, 1);
}
@@ -14,7 +23,52 @@ public ItemArrow(Integer meta) {
}
public ItemArrow(Integer meta, int count) {
- super(ARROW, meta, count, "Arrow");
+ super(ARROW, meta, count, GENERIC_NAME);
+ updateName();
+ }
+
+ @Override
+ public void setDamage(Integer meta) {
+ super.setDamage(meta);
+ updateName();
}
+ private void updateName() {
+ final int type = getDamage();
+ if (type <= 0) {
+ name = GENERIC_NAME;
+ return;
+ }
+
+ final int potionId = type - 1;
+ switch (potionId) {
+ case Potion.WATER:
+ name = "Arrow of Splashing";
+ return;
+ case Potion.MUNDANE:
+ case Potion.MUNDANE_II:
+ case Potion.THICK:
+ case Potion.AWKWARD:
+ name = "Tipped Arrow";
+ return;
+ default:
+ name = ItemPotion.buildName(potionId, GENERIC_NAME, false);
+ }
+ }
+
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ @Nullable
+ public Potion getTippedArrowPotion() {
+ final int damage = getDamage();
+ if (damage > 0) {
+ try {
+ return Potion.getPotion(damage - 1);
+ } catch (ServerException ignored) {
+ // Not found
+ return null;
+ }
+ }
+ return null;
+ }
}
diff --git a/src/main/java/cn/nukkit/item/ItemAxeGold.java b/src/main/java/cn/nukkit/item/ItemAxeGold.java
index 0d80331684b..373ba31df46 100644
--- a/src/main/java/cn/nukkit/item/ItemAxeGold.java
+++ b/src/main/java/cn/nukkit/item/ItemAxeGold.java
@@ -14,7 +14,7 @@ public ItemAxeGold(Integer meta) {
}
public ItemAxeGold(Integer meta, int count) {
- super(GOLD_AXE, meta, count, "Gold Axe");
+ super(GOLD_AXE, meta, count, "Golden Axe");
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemAxeNetherite.java b/src/main/java/cn/nukkit/item/ItemAxeNetherite.java
index f9d632e5871..24cd75b02f5 100644
--- a/src/main/java/cn/nukkit/item/ItemAxeNetherite.java
+++ b/src/main/java/cn/nukkit/item/ItemAxeNetherite.java
@@ -1,5 +1,6 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
@Since("1.4.0.0-PN")
@@ -40,6 +41,7 @@ public int getAttackDamage() {
return 8;
}
+ @PowerNukkitOnly
@Override
public boolean isLavaResistant() {
return true;
diff --git a/src/main/java/cn/nukkit/item/ItemBanner.java b/src/main/java/cn/nukkit/item/ItemBanner.java
index 40e54c4f48f..fcef40eb8f8 100644
--- a/src/main/java/cn/nukkit/item/ItemBanner.java
+++ b/src/main/java/cn/nukkit/item/ItemBanner.java
@@ -9,6 +9,9 @@
import cn.nukkit.utils.BannerPattern;
import cn.nukkit.utils.DyeColor;
+import javax.annotation.Nonnull;
+import java.util.Objects;
+
/**
* @author PetteriM1
*/
@@ -25,6 +28,17 @@ public ItemBanner(Integer meta) {
public ItemBanner(Integer meta, int count) {
super(BANNER, meta, count, "Banner");
this.block = Block.get(Block.STANDING_BANNER);
+ updateName();
+ }
+
+ @Override
+ public void setDamage(Integer meta) {
+ super.setDamage(meta);
+ updateName();
+ }
+
+ private void updateName() {
+ name = getBaseDyeColor().getName() + " Banner";
}
@Override
@@ -36,10 +50,17 @@ public int getBaseColor() {
return this.getDamage() & 0x0f;
}
- public void setBaseColor(DyeColor color) {
+ public void setBaseColor(@Nonnull DyeColor color) {
this.setDamage(color.getDyeData() & 0x0f);
}
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ @Nonnull
+ public DyeColor getBaseDyeColor() {
+ return Objects.requireNonNull(DyeColor.getByDyeData(getBaseColor()));
+ }
+
public int getType() {
return this.getNamedTag().getInt("Type");
}
diff --git a/src/main/java/cn/nukkit/item/ItemBannerPattern.java b/src/main/java/cn/nukkit/item/ItemBannerPattern.java
index 4b7ab52e132..2b85d1a6bb2 100644
--- a/src/main/java/cn/nukkit/item/ItemBannerPattern.java
+++ b/src/main/java/cn/nukkit/item/ItemBannerPattern.java
@@ -5,7 +5,6 @@
import cn.nukkit.utils.BannerPattern;
@Since("1.2.1.0-PN")
-@PowerNukkitOnly
public class ItemBannerPattern extends Item {
@PowerNukkitOnly
public static final int PATTERN_CREEPER_CHARGE = 0;
@@ -26,16 +25,17 @@ public class ItemBannerPattern extends Item {
public static final int PATTERN_BORDURE_INDENTED = 5;
@PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ public static final int PATTERN_SNOUT = 6;
+
public ItemBannerPattern() {
this(0, 1);
}
- @PowerNukkitOnly
public ItemBannerPattern(Integer meta) {
this(meta, 1);
}
- @PowerNukkitOnly
public ItemBannerPattern(Integer meta, int count) {
super(BANNER_PATTERN, meta, count, "Bone");
updateName();
@@ -72,14 +72,16 @@ public BannerPattern.Type getPatternType() {
case PATTERN_THING: return BannerPattern.Type.PATTERN_MOJANG;
case PATTERN_FIELD_MASONED: return BannerPattern.Type.PATTERN_BRICK;
case PATTERN_BORDURE_INDENTED: return BannerPattern.Type.PATTERN_CURLY_BORDER;
+ case PATTERN_SNOUT: return BannerPattern.Type.PATTERN_SNOUT;
}
}
+ @PowerNukkitOnly
protected void updateName() {
if (getId() != BANNER_PATTERN) {
return;
}
- switch (super.meta % 6) {
+ switch (super.meta) {
case PATTERN_CREEPER_CHARGE:
name = "Creeper Charge Banner Pattern";
return;
@@ -96,7 +98,10 @@ protected void updateName() {
name = "Field Banner Pattern";
return;
case PATTERN_BORDURE_INDENTED:
- name = "Bordure Idented Banner Pattern";
+ name = "Bordure Indented Banner Pattern";
+ return;
+ case PATTERN_SNOUT:
+ name = "Snout Banner Pattern";
return;
default:
name = "Banner Pattern";
diff --git a/src/main/java/cn/nukkit/item/ItemBed.java b/src/main/java/cn/nukkit/item/ItemBed.java
index 93595eb9056..8cb8dba0cc4 100644
--- a/src/main/java/cn/nukkit/item/ItemBed.java
+++ b/src/main/java/cn/nukkit/item/ItemBed.java
@@ -18,8 +18,19 @@ public ItemBed(Integer meta) {
}
public ItemBed(Integer meta, int count) {
- super(BED, meta, count, DyeColor.getByWoolData(meta).getName() + " Bed");
+ super(BED, meta, count, "Bed");
this.block = Block.get(BlockID.BED_BLOCK);
+ updateName();
+ }
+
+ @Override
+ public void setDamage(Integer meta) {
+ super.setDamage(meta);
+ updateName();
+ }
+
+ private void updateName() {
+ name = DyeColor.getByWoolData(meta).getName() + " Bed";
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemBirchSign.java b/src/main/java/cn/nukkit/item/ItemBirchSign.java
index 9f21864b020..a0b8ff9a243 100644
--- a/src/main/java/cn/nukkit/item/ItemBirchSign.java
+++ b/src/main/java/cn/nukkit/item/ItemBirchSign.java
@@ -1,16 +1,21 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.BlockBirchSignPost;
+@PowerNukkitOnly
public class ItemBirchSign extends ItemSign {
+ @PowerNukkitOnly
public ItemBirchSign() {
this(0, 1);
}
+ @PowerNukkitOnly
public ItemBirchSign(Integer meta) {
this(meta, 1);
}
+ @PowerNukkitOnly
public ItemBirchSign(Integer meta, int count) {
super(BIRCH_SIGN, meta, count, "Birch Sign", new BlockBirchSignPost());
}
diff --git a/src/main/java/cn/nukkit/item/ItemBlock.java b/src/main/java/cn/nukkit/item/ItemBlock.java
index d771cfc6cfd..78b6d178ec3 100644
--- a/src/main/java/cn/nukkit/item/ItemBlock.java
+++ b/src/main/java/cn/nukkit/item/ItemBlock.java
@@ -1,5 +1,6 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockUnknown;
import cn.nukkit.blockstate.BlockState;
@@ -24,6 +25,7 @@ public ItemBlock(Block block, Integer meta, int count) {
this.block = block;
}
+ @Override
public void setDamage(Integer meta) {
int blockMeta;
if (meta != null) {
@@ -65,10 +67,12 @@ public ItemBlock clone() {
return block;
}
+ @Override
public Block getBlock() {
return this.block;
}
+ @PowerNukkitOnly
@Override
public boolean isLavaResistant() {
return block.isLavaResistant();
diff --git a/src/main/java/cn/nukkit/item/ItemBoat.java b/src/main/java/cn/nukkit/item/ItemBoat.java
index 256b07d9898..a7c6a649519 100644
--- a/src/main/java/cn/nukkit/item/ItemBoat.java
+++ b/src/main/java/cn/nukkit/item/ItemBoat.java
@@ -14,8 +14,6 @@
import cn.nukkit.nbt.tag.FloatTag;
import cn.nukkit.nbt.tag.ListTag;
-import java.util.OptionalInt;
-
/**
* @author yescallop
* @since 2016/2/13
@@ -31,27 +29,44 @@ public ItemBoat(Integer meta) {
}
public ItemBoat(Integer meta, int count) {
- super(BOAT, meta, count, "Boat");
+ this(BOAT, meta, count, "Boat");
}
@PowerNukkitOnly
@Since("1.4.0.0-PN")
protected ItemBoat(int id, Integer meta, int count, String name) {
super(id, meta, count, name);
+ adjustName();
}
@Override
- public int getDamage() {
- return super.getDamage();
+ public void setDamage(Integer meta) {
+ super.setDamage(meta);
+ adjustName();
}
-
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
- public OptionalInt getLegacyBoatDamage() {
- if (getId() == BOAT) {
- return OptionalInt.of(super.getDamage());
- } else {
- return OptionalInt.empty();
+
+ private void adjustName() {
+ switch (getDamage()) {
+ case 0:
+ name = "Oak Boat";
+ return;
+ case 1:
+ name = "Spruce Boat";
+ return;
+ case 2:
+ name = "Birch Boat";
+ return;
+ case 3:
+ name = "Jungle Boat";
+ return;
+ case 4:
+ name = "Acacia Boat";
+ return;
+ case 5:
+ name = "Dark Oak Boat";
+ return;
+ default:
+ name = "Boat";
}
}
@@ -76,7 +91,7 @@ public boolean onActivate(Level level, Player player, Block block, Block target,
.putList(new ListTag("Rotation")
.add(new FloatTag("", (float) ((player.yaw + 90f) % 360)))
.add(new FloatTag("", 0)))
- .putInt("Variant", getLegacyBoatDamage().orElse(0))
+ .putInt("Variant", getDamage())
);
if (boat == null) {
diff --git a/src/main/java/cn/nukkit/item/ItemBootsGold.java b/src/main/java/cn/nukkit/item/ItemBootsGold.java
index a7b5553a940..fcbcdc83e75 100644
--- a/src/main/java/cn/nukkit/item/ItemBootsGold.java
+++ b/src/main/java/cn/nukkit/item/ItemBootsGold.java
@@ -14,7 +14,7 @@ public ItemBootsGold(Integer meta) {
}
public ItemBootsGold(Integer meta, int count) {
- super(GOLD_BOOTS, meta, count, "Gold Boots");
+ super(GOLD_BOOTS, meta, count, "Golden Boots");
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemBootsNetherite.java b/src/main/java/cn/nukkit/item/ItemBootsNetherite.java
index e3c6f3aff89..3361ef54af5 100644
--- a/src/main/java/cn/nukkit/item/ItemBootsNetherite.java
+++ b/src/main/java/cn/nukkit/item/ItemBootsNetherite.java
@@ -1,5 +1,6 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
@Since("1.4.0.0-PN")
@@ -45,6 +46,7 @@ public int getToughness() {
return 3;
}
+ @PowerNukkitOnly
@Override
public boolean isLavaResistant() {
return true;
diff --git a/src/main/java/cn/nukkit/item/ItemBow.java b/src/main/java/cn/nukkit/item/ItemBow.java
index f2dd086063b..4db6ed992a4 100644
--- a/src/main/java/cn/nukkit/item/ItemBow.java
+++ b/src/main/java/cn/nukkit/item/ItemBow.java
@@ -71,7 +71,7 @@ public boolean onRelease(Player player, int ticksUsed) {
Enchantment bowDamage = this.getEnchantment(Enchantment.ID_BOW_POWER);
if (bowDamage != null && bowDamage.getLevel() > 0) {
- damage += 0.25 * (bowDamage.getLevel() + 1);
+ damage += (double) bowDamage.getLevel() * 0.5 + 0.5;
}
Enchantment flameEnchant = this.getEnchantment(Enchantment.ID_BOW_FLAME);
@@ -118,7 +118,7 @@ public boolean onRelease(Player player, int ticksUsed) {
boolean infinity = infinityEnchant != null && infinityEnchant.getLevel() > 0;
EntityProjectile projectile;
if (infinity && (projectile = entityShootBowEvent.getProjectile()) instanceof EntityArrow) {
- ((EntityArrow) projectile).setPickupMode(EntityArrow.PICKUP_CREATIVE);
+ ((EntityArrow) projectile).setPickupMode(EntityProjectile.PICKUP_CREATIVE);
}
if (player.isAdventure() || player.isSurvival()) {
if (!infinity) {
diff --git a/src/main/java/cn/nukkit/item/ItemCampfire.java b/src/main/java/cn/nukkit/item/ItemCampfire.java
index ba287a7ce75..0a0a653aa5b 100644
--- a/src/main/java/cn/nukkit/item/ItemCampfire.java
+++ b/src/main/java/cn/nukkit/item/ItemCampfire.java
@@ -1,17 +1,22 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.BlockCampfire;
+@PowerNukkitOnly
public class ItemCampfire extends Item {
+ @PowerNukkitOnly
public ItemCampfire() {
this(0, 1);
}
+ @PowerNukkitOnly
public ItemCampfire(Integer meta) {
this(meta, 1);
}
+ @PowerNukkitOnly
public ItemCampfire(Integer meta, int count) {
super(CAMPFIRE, meta, count, "Campfire");
this.block = new BlockCampfire();
diff --git a/src/main/java/cn/nukkit/item/ItemCarrotOnAStick.java b/src/main/java/cn/nukkit/item/ItemCarrotOnAStick.java
index 85f1c7f0c37..9e6737fb300 100644
--- a/src/main/java/cn/nukkit/item/ItemCarrotOnAStick.java
+++ b/src/main/java/cn/nukkit/item/ItemCarrotOnAStick.java
@@ -15,7 +15,12 @@ public ItemCarrotOnAStick(Integer meta) {
}
public ItemCarrotOnAStick(Integer meta, int count) {
- super(CARROT_ON_A_STICK, meta, count, "Carrot on a stick");
+ super(CARROT_ON_A_STICK, meta, count, "Carrot on a Stick");
+ }
+
+ @Override
+ public int getMaxDurability() {
+ return ItemTool.DURABILITY_CARROT_ON_A_STICK;
}
@Override
@@ -24,8 +29,13 @@ public int getMaxStackSize() {
}
@Override
- public int getMaxDurability() {
- return 25;
+ public boolean noDamageOnAttack() {
+ return true;
+ }
+
+ @Override
+ public boolean noDamageOnBreak() {
+ return true;
}
}
diff --git a/src/main/java/cn/nukkit/item/ItemChestplateChain.java b/src/main/java/cn/nukkit/item/ItemChestplateChain.java
index ce0f5778ef3..c6e4c70b563 100644
--- a/src/main/java/cn/nukkit/item/ItemChestplateChain.java
+++ b/src/main/java/cn/nukkit/item/ItemChestplateChain.java
@@ -14,7 +14,7 @@ public ItemChestplateChain(Integer meta) {
}
public ItemChestplateChain(Integer meta, int count) {
- super(CHAIN_CHESTPLATE, meta, count, "Chain Chestplate");
+ super(CHAIN_CHESTPLATE, meta, count, "Chainmail Chestplate");
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemChestplateGold.java b/src/main/java/cn/nukkit/item/ItemChestplateGold.java
index dbbac37d3bd..11b27ca31ac 100644
--- a/src/main/java/cn/nukkit/item/ItemChestplateGold.java
+++ b/src/main/java/cn/nukkit/item/ItemChestplateGold.java
@@ -14,7 +14,7 @@ public ItemChestplateGold(Integer meta) {
}
public ItemChestplateGold(Integer meta, int count) {
- super(GOLD_CHESTPLATE, meta, count, "Gold Chestplate");
+ super(GOLD_CHESTPLATE, meta, count, "Golden Chestplate");
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemChestplateNetherite.java b/src/main/java/cn/nukkit/item/ItemChestplateNetherite.java
index 6af802dfa09..0b29a33e5c1 100644
--- a/src/main/java/cn/nukkit/item/ItemChestplateNetherite.java
+++ b/src/main/java/cn/nukkit/item/ItemChestplateNetherite.java
@@ -1,5 +1,6 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
@Since("1.4.0.0-PN")
@@ -45,6 +46,7 @@ public int getToughness() {
return 3;
}
+ @PowerNukkitOnly
@Override
public boolean isLavaResistant() {
return true;
diff --git a/src/main/java/cn/nukkit/item/ItemChorusFruitPopped.java b/src/main/java/cn/nukkit/item/ItemChorusFruitPopped.java
index de4da6f50b4..25218b5f5e8 100644
--- a/src/main/java/cn/nukkit/item/ItemChorusFruitPopped.java
+++ b/src/main/java/cn/nukkit/item/ItemChorusFruitPopped.java
@@ -1,24 +1,21 @@
package cn.nukkit.item;
-import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
-@PowerNukkitOnly
@Since("1.4.0.0-PN")
public class ItemChorusFruitPopped extends Item {
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemChorusFruitPopped() {
this(0, 1);
}
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemChorusFruitPopped(Integer meta) {
this(meta, 1);
}
+ @Since("1.4.0.0-PN")
public ItemChorusFruitPopped(Integer meta, int count) {
super(POPPED_CHORUS_FRUIT, meta, count, "Popped Chorus Fruit");
}
diff --git a/src/main/java/cn/nukkit/item/ItemClay.java b/src/main/java/cn/nukkit/item/ItemClay.java
index 1510e25a15c..4fe3893afae 100644
--- a/src/main/java/cn/nukkit/item/ItemClay.java
+++ b/src/main/java/cn/nukkit/item/ItemClay.java
@@ -14,6 +14,6 @@ public ItemClay(Integer meta) {
}
public ItemClay(Integer meta, int count) {
- super(CLAY, meta, count, "Clay");
+ super(CLAY, meta, count, "Clay Ball");
}
}
diff --git a/src/main/java/cn/nukkit/item/ItemClownfish.java b/src/main/java/cn/nukkit/item/ItemClownfish.java
index 1c08ae370e3..654ca68f80a 100644
--- a/src/main/java/cn/nukkit/item/ItemClownfish.java
+++ b/src/main/java/cn/nukkit/item/ItemClownfish.java
@@ -15,6 +15,6 @@ public ItemClownfish(Integer meta) {
}
public ItemClownfish(Integer meta, int count) {
- super(CLOWNFISH, meta, count, "Clownfish");
+ super(CLOWNFISH, meta, count, "Tropical Fish");
}
}
diff --git a/src/main/java/cn/nukkit/item/ItemDarkOakSign.java b/src/main/java/cn/nukkit/item/ItemDarkOakSign.java
index 72fec903807..205ccd87754 100644
--- a/src/main/java/cn/nukkit/item/ItemDarkOakSign.java
+++ b/src/main/java/cn/nukkit/item/ItemDarkOakSign.java
@@ -1,17 +1,22 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.BlockDarkOakSignPost;
+@PowerNukkitOnly
public class ItemDarkOakSign extends ItemSign {
+ @PowerNukkitOnly
public ItemDarkOakSign() {
this(0, 1);
}
+ @PowerNukkitOnly
public ItemDarkOakSign(Integer meta) {
this(meta, 1);
}
+ @PowerNukkitOnly
public ItemDarkOakSign(Integer meta, int count) {
super(DARKOAK_SIGN, meta, count, "Dark Oak Sign", new BlockDarkOakSignPost());
}
diff --git a/src/main/java/cn/nukkit/item/ItemDragonBreath.java b/src/main/java/cn/nukkit/item/ItemDragonBreath.java
index cad3937ae33..890b39f4f2c 100644
--- a/src/main/java/cn/nukkit/item/ItemDragonBreath.java
+++ b/src/main/java/cn/nukkit/item/ItemDragonBreath.java
@@ -1,25 +1,20 @@
package cn.nukkit.item;
-import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
-@PowerNukkitOnly
@Since("1.4.0.0-PN")
public class ItemDragonBreath extends Item {
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemDragonBreath() {
this(0, 1);
}
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemDragonBreath(Integer meta) {
this(meta, 1);
}
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemDragonBreath(Integer meta, int count) {
super(DRAGON_BREATH, meta, count, "Dragon's Breath");
diff --git a/src/main/java/cn/nukkit/item/ItemEdible.java b/src/main/java/cn/nukkit/item/ItemEdible.java
index e850b55ef76..9ea6bdc1d69 100644
--- a/src/main/java/cn/nukkit/item/ItemEdible.java
+++ b/src/main/java/cn/nukkit/item/ItemEdible.java
@@ -3,12 +3,15 @@
import cn.nukkit.Player;
import cn.nukkit.event.player.PlayerItemConsumeEvent;
import cn.nukkit.item.food.Food;
+import cn.nukkit.level.Sound;
import cn.nukkit.math.Vector3;
+import cn.nukkit.network.protocol.CompletedUsingItemPacket;
/**
* @author MagicDroidX (Nukkit Project)
*/
public abstract class ItemEdible extends Item {
+
public ItemEdible(int id, Integer meta, int count, String name) {
super(id, meta, count, name);
}
@@ -36,19 +39,36 @@ public boolean onClickAir(Player player, Vector3 directionVector) {
@Override
public boolean onUse(Player player, int ticksUsed) {
+ if (player.isSpectator()) {
+ player.getInventory().sendContents(player);
+ return false;
+ }
+
+ Food food = Food.getByRelative(this);
+
+ if (food == null || ticksUsed < food.getEatingTick()) {
+ return false;
+ }
+
PlayerItemConsumeEvent consumeEvent = new PlayerItemConsumeEvent(player, this);
-
+
player.getServer().getPluginManager().callEvent(consumeEvent);
if (consumeEvent.isCancelled()) {
player.getInventory().sendContents(player);
return false;
}
-
- Food food = Food.getByRelative(this);
- if ((player.isAdventure() || player.isSurvival()) && food != null && food.eatenBy(player)) {
- --this.count;
- player.getInventory().setItemInHand(this);
+
+ if (food.eatenBy(player)) {
+ player.completeUsingItem(this.getNetworkId(), CompletedUsingItemPacket.ACTION_EAT);
+
+ if (player.isAdventure() || player.isSurvival()) {
+ --this.count;
+ player.getInventory().setItemInHand(this);
+
+ player.getLevel().addSound(player, Sound.RANDOM_BURP);
+ }
}
+
return true;
}
}
diff --git a/src/main/java/cn/nukkit/item/ItemElytra.java b/src/main/java/cn/nukkit/item/ItemElytra.java
index d5215ebcd0e..520a5dcfe2c 100644
--- a/src/main/java/cn/nukkit/item/ItemElytra.java
+++ b/src/main/java/cn/nukkit/item/ItemElytra.java
@@ -19,7 +19,7 @@ public ItemElytra(Integer meta, int count) {
@Override
public int getMaxDurability() {
- return 431;
+ return 433;
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemEmptyMap.java b/src/main/java/cn/nukkit/item/ItemEmptyMap.java
index af7483735c7..64668bb8dbd 100644
--- a/src/main/java/cn/nukkit/item/ItemEmptyMap.java
+++ b/src/main/java/cn/nukkit/item/ItemEmptyMap.java
@@ -1,7 +1,7 @@
package cn.nukkit.item;
public class ItemEmptyMap extends Item {
-
+
public ItemEmptyMap() {
this(0, 1);
}
@@ -12,9 +12,20 @@ public ItemEmptyMap(Integer meta) {
public ItemEmptyMap(Integer meta, int count) {
super(EMPTY_MAP, meta, count, "Empty Map");
- if (meta == 2) {
- this.name = "Empty Locator Map";
+ updateName();
+ }
+
+ @Override
+ public void setDamage(Integer meta) {
+ super.setDamage(meta);
+ updateName();
+ }
+
+ private void updateName() {
+ if (getDamage() == 2) {
+ name = "Empty Locator Map";
+ } else {
+ name = "Empty Map";
}
}
-
}
diff --git a/src/main/java/cn/nukkit/item/ItemEnderPearl.java b/src/main/java/cn/nukkit/item/ItemEnderPearl.java
index 927818beeed..8016b135bf2 100644
--- a/src/main/java/cn/nukkit/item/ItemEnderPearl.java
+++ b/src/main/java/cn/nukkit/item/ItemEnderPearl.java
@@ -1,6 +1,7 @@
package cn.nukkit.item;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.projectile.EntityEnderPearl;
@@ -33,6 +34,7 @@ public float getThrowForce() {
return 1.5f;
}
+ @PowerNukkitOnly
@Override
protected Entity correctProjectile(Player player, Entity projectile) {
if (projectile instanceof EntityEnderPearl) {
diff --git a/src/main/java/cn/nukkit/item/ItemFireCharge.java b/src/main/java/cn/nukkit/item/ItemFireCharge.java
index 7970061c530..1482cee2f88 100644
--- a/src/main/java/cn/nukkit/item/ItemFireCharge.java
+++ b/src/main/java/cn/nukkit/item/ItemFireCharge.java
@@ -6,13 +6,10 @@
import cn.nukkit.block.BlockID;
import cn.nukkit.event.block.BlockIgniteEvent;
import cn.nukkit.level.Level;
-import cn.nukkit.level.Sound;
-import cn.nukkit.Player;
import cn.nukkit.math.BlockFace;
+import cn.nukkit.network.protocol.LevelEventPacket;
import java.util.concurrent.ThreadLocalRandom;
-import cn.nukkit.event.block.BlockIgniteEvent;
-import cn.nukkit.network.protocol.LevelEventPacket;
/**
* @author PetteriM1
diff --git a/src/main/java/cn/nukkit/item/ItemFirework.java b/src/main/java/cn/nukkit/item/ItemFirework.java
index 0958bccb834..de971a2c567 100644
--- a/src/main/java/cn/nukkit/item/ItemFirework.java
+++ b/src/main/java/cn/nukkit/item/ItemFirework.java
@@ -33,7 +33,7 @@ public ItemFirework(Integer meta) {
@PowerNukkitDifference(info = "Will not add compound tag automatically")
public ItemFirework(Integer meta, int count) {
- super(FIREWORKS, meta, count, "Fireworks");
+ super(FIREWORKS, meta, count, "Firework Rocket");
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemFireworkStar.java b/src/main/java/cn/nukkit/item/ItemFireworkStar.java
new file mode 100644
index 00000000000..dbcf0e27f6f
--- /dev/null
+++ b/src/main/java/cn/nukkit/item/ItemFireworkStar.java
@@ -0,0 +1,22 @@
+package cn.nukkit.item;
+
+import cn.nukkit.api.Since;
+
+@Since("1.6.0.0-PN")
+public class ItemFireworkStar extends Item {
+
+ @Since("1.6.0.0-PN")
+ public ItemFireworkStar() {
+ this(0, 1);
+ }
+
+ @Since("1.6.0.0-PN")
+ public ItemFireworkStar(Integer meta) {
+ this(meta, 1);
+ }
+
+ @Since("1.6.0.0-PN")
+ public ItemFireworkStar(Integer meta, int count) {
+ super(FIREWORKSCHARGE, meta, count, "Firework Star");
+ }
+}
diff --git a/src/main/java/cn/nukkit/item/ItemFish.java b/src/main/java/cn/nukkit/item/ItemFish.java
index e401a1d71ae..8e1cd8d51f9 100644
--- a/src/main/java/cn/nukkit/item/ItemFish.java
+++ b/src/main/java/cn/nukkit/item/ItemFish.java
@@ -14,7 +14,7 @@ public ItemFish(Integer meta) {
}
public ItemFish(Integer meta, int count) {
- super(RAW_FISH, meta, count, "Raw Fish");
+ super(RAW_FISH, meta, count, "Cod");
}
protected ItemFish(int id, Integer meta, int count, String name) {
diff --git a/src/main/java/cn/nukkit/item/ItemFishCooked.java b/src/main/java/cn/nukkit/item/ItemFishCooked.java
index 9fb0d9eaff5..21edd0a459e 100644
--- a/src/main/java/cn/nukkit/item/ItemFishCooked.java
+++ b/src/main/java/cn/nukkit/item/ItemFishCooked.java
@@ -14,7 +14,7 @@ public ItemFishCooked(Integer meta) {
}
public ItemFishCooked(Integer meta, int count) {
- super(COOKED_FISH, meta, count, "Cooked Fish");
+ super(COOKED_FISH, meta, count, "Cooked Cod");
}
}
diff --git a/src/main/java/cn/nukkit/item/ItemFishingRod.java b/src/main/java/cn/nukkit/item/ItemFishingRod.java
index 52d082f3f44..e3bfa8e8794 100644
--- a/src/main/java/cn/nukkit/item/ItemFishingRod.java
+++ b/src/main/java/cn/nukkit/item/ItemFishingRod.java
@@ -26,11 +26,6 @@ public int getEnchantAbility() {
return 1;
}
- @Override
- public int getMaxStackSize() {
- return 1;
- }
-
@Override
public boolean onClickAir(Player player, Vector3 directionVector) {
if (player.fishing != null) {
@@ -48,7 +43,12 @@ public int getMaxDurability() {
}
@Override
- public boolean damageWhenBreaking() {
- return false;
+ public boolean noDamageOnAttack() {
+ return true;
+ }
+
+ @Override
+ public boolean noDamageOnBreak() {
+ return true;
}
}
diff --git a/src/main/java/cn/nukkit/item/ItemHeartOfTheSea.java b/src/main/java/cn/nukkit/item/ItemHeartOfTheSea.java
new file mode 100644
index 00000000000..cfe5eb2094b
--- /dev/null
+++ b/src/main/java/cn/nukkit/item/ItemHeartOfTheSea.java
@@ -0,0 +1,22 @@
+package cn.nukkit.item;
+
+import cn.nukkit.api.Since;
+
+@Since("1.6.0.0-PN")
+public class ItemHeartOfTheSea extends Item {
+
+ @Since("1.6.0.0-PN")
+ public ItemHeartOfTheSea() {
+ this(0, 1);
+ }
+
+ @Since("1.6.0.0-PN")
+ public ItemHeartOfTheSea(Integer meta) {
+ this(meta, 1);
+ }
+
+ @Since("1.6.0.0-PN")
+ public ItemHeartOfTheSea(Integer meta, int count) {
+ super(HEART_OF_THE_SEA, meta, count, "Heart Of The Sea");
+ }
+}
diff --git a/src/main/java/cn/nukkit/item/ItemHelmetGold.java b/src/main/java/cn/nukkit/item/ItemHelmetGold.java
index 4499770b205..e530cbf8650 100644
--- a/src/main/java/cn/nukkit/item/ItemHelmetGold.java
+++ b/src/main/java/cn/nukkit/item/ItemHelmetGold.java
@@ -14,7 +14,7 @@ public ItemHelmetGold(Integer meta) {
}
public ItemHelmetGold(Integer meta, int count) {
- super(GOLD_HELMET, meta, count, "Gold Helmet");
+ super(GOLD_HELMET, meta, count, "Golden Helmet");
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemHelmetNetherite.java b/src/main/java/cn/nukkit/item/ItemHelmetNetherite.java
index 59f2f3b9f17..293533e8d6d 100644
--- a/src/main/java/cn/nukkit/item/ItemHelmetNetherite.java
+++ b/src/main/java/cn/nukkit/item/ItemHelmetNetherite.java
@@ -1,5 +1,6 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
@Since("1.4.0.0-PN")
@@ -45,6 +46,7 @@ public int getToughness() {
return 3;
}
+ @PowerNukkitOnly
@Override
public boolean isLavaResistant() {
return true;
diff --git a/src/main/java/cn/nukkit/item/ItemHoeGold.java b/src/main/java/cn/nukkit/item/ItemHoeGold.java
index 716b7c22f0f..45a082c5616 100644
--- a/src/main/java/cn/nukkit/item/ItemHoeGold.java
+++ b/src/main/java/cn/nukkit/item/ItemHoeGold.java
@@ -14,7 +14,7 @@ public ItemHoeGold(Integer meta) {
}
public ItemHoeGold(Integer meta, int count) {
- super(GOLD_HOE, meta, count, "Gold Hoe");
+ super(GOLD_HOE, meta, count, "Golden Hoe");
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemHoeNetherite.java b/src/main/java/cn/nukkit/item/ItemHoeNetherite.java
index 5faca0659e1..d2e68441536 100644
--- a/src/main/java/cn/nukkit/item/ItemHoeNetherite.java
+++ b/src/main/java/cn/nukkit/item/ItemHoeNetherite.java
@@ -1,5 +1,6 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
@Since("1.4.0.0-PN")
@@ -39,7 +40,8 @@ public int getTier() {
public int getMaxDurability() {
return ItemTool.DURABILITY_NETHERITE;
}
-
+
+ @PowerNukkitOnly
@Override
public boolean isLavaResistant() {
return true;
diff --git a/src/main/java/cn/nukkit/item/ItemHorseArmorGold.java b/src/main/java/cn/nukkit/item/ItemHorseArmorGold.java
index 5cb642ee643..0263c64ad98 100644
--- a/src/main/java/cn/nukkit/item/ItemHorseArmorGold.java
+++ b/src/main/java/cn/nukkit/item/ItemHorseArmorGold.java
@@ -10,7 +10,7 @@ public ItemHorseArmorGold(Integer meta) {
}
public ItemHorseArmorGold(Integer meta, int count) {
- super(GOLD_HORSE_ARMOR, meta, count, "Gold Horse Armor");
+ super(GOLD_HORSE_ARMOR, meta, count, "Golden Horse Armor");
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemID.java b/src/main/java/cn/nukkit/item/ItemID.java
index 511ce8b97cc..3122420057f 100644
--- a/src/main/java/cn/nukkit/item/ItemID.java
+++ b/src/main/java/cn/nukkit/item/ItemID.java
@@ -202,7 +202,7 @@ public interface ItemID {
int DARK_OAK_DOOR = 431;
int CHORUS_FRUIT = 432;
int POPPED_CHORUS_FRUIT = 433;
- @Since("1.2.1.0-PN") @PowerNukkitOnly int BANNER_PATTERN = 434;
+ @Since("1.2.1.0-PN") int BANNER_PATTERN = 434;
int DRAGON_BREATH = 437;
int SPLASH_POTION = 438;
@@ -214,7 +214,7 @@ public interface ItemID {
int SHULKER_SHELL = 445;
int BANNER = 446;
int TOTEM = 450;
-
+
int IRON_NUGGET = 452;
int TRIDENT = 455;
@@ -260,8 +260,8 @@ public interface ItemID {
@PowerNukkitOnly int CAMPFIRE = 720;
- @PowerNukkitOnly int SUSPICIOUS_STEW = 734;
-
+ int SUSPICIOUS_STEW = 734;
+
int HONEYCOMB = 736;
int HONEY_BOTTLE = 737;
@@ -287,8 +287,11 @@ public interface ItemID {
@Since("1.4.0.0-PN") int RECORD_PIGSTEP = 759;
@Since("1.4.0.0-PN") @PowerNukkitOnly int NETHER_SPROUTS = 760;
+ @PowerNukkitOnly @Since("FUTURE") int AMETHYST_SHARD = 771;
+ @Since("1.6.0.0-PN") int SPYGLASS = 772;
+
@Since("1.4.0.0-PN") @PowerNukkitOnly int SOUL_CAMPFIRE = 801;
//@PowerNukkitOnly int DEBUG_STICK = 802+;
-
+
}
diff --git a/src/main/java/cn/nukkit/item/ItemIngotNetherite.java b/src/main/java/cn/nukkit/item/ItemIngotNetherite.java
index 6427e231794..d3b65d89055 100644
--- a/src/main/java/cn/nukkit/item/ItemIngotNetherite.java
+++ b/src/main/java/cn/nukkit/item/ItemIngotNetherite.java
@@ -1,5 +1,6 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
@Since("1.4.0.0-PN")
@@ -19,6 +20,7 @@ public ItemIngotNetherite(Integer meta, int count) {
super(NETHERITE_INGOT, 0, count, "Netherite Ingot");
}
+ @PowerNukkitOnly
@Override
public boolean isLavaResistant() {
return true;
diff --git a/src/main/java/cn/nukkit/item/ItemJungleSign.java b/src/main/java/cn/nukkit/item/ItemJungleSign.java
index 9e0859871a0..8e2d152f363 100644
--- a/src/main/java/cn/nukkit/item/ItemJungleSign.java
+++ b/src/main/java/cn/nukkit/item/ItemJungleSign.java
@@ -1,17 +1,22 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.BlockJungleSignPost;
+@PowerNukkitOnly
public class ItemJungleSign extends ItemSign {
+ @PowerNukkitOnly
public ItemJungleSign() {
this(0, 1);
}
+ @PowerNukkitOnly
public ItemJungleSign(Integer meta) {
this(meta, 1);
}
+ @PowerNukkitOnly
public ItemJungleSign(Integer meta, int count) {
super(JUNGLE_SIGN, meta, count, "Jungle Sign", new BlockJungleSignPost());
}
diff --git a/src/main/java/cn/nukkit/item/ItemKelp.java b/src/main/java/cn/nukkit/item/ItemKelp.java
index 781a9688245..c6e896ba700 100644
--- a/src/main/java/cn/nukkit/item/ItemKelp.java
+++ b/src/main/java/cn/nukkit/item/ItemKelp.java
@@ -1,17 +1,22 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.BlockKelp;
+@PowerNukkitOnly
public class ItemKelp extends Item {
-
+
+ @PowerNukkitOnly
public ItemKelp() {
this(0, 1);
}
-
+
+ @PowerNukkitOnly
public ItemKelp(Integer meta) {
this(meta, 1);
}
-
+
+ @PowerNukkitOnly
public ItemKelp(Integer meta, int count) {
super(KELP, meta, count, "Kelp");
this.block = new BlockKelp();
diff --git a/src/main/java/cn/nukkit/item/ItemLead.java b/src/main/java/cn/nukkit/item/ItemLead.java
index 1bc326c4f70..5482fdfa64a 100644
--- a/src/main/java/cn/nukkit/item/ItemLead.java
+++ b/src/main/java/cn/nukkit/item/ItemLead.java
@@ -1,25 +1,20 @@
package cn.nukkit.item;
-import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
-@PowerNukkitOnly
@Since("1.4.0.0-PN")
public class ItemLead extends Item {
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemLead() {
this(0, 1);
}
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemLead(Integer meta) {
this(meta, 1);
}
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemLead(Integer meta, int count) {
super(LEAD, meta, count, "Lead");
diff --git a/src/main/java/cn/nukkit/item/ItemLeggingsChain.java b/src/main/java/cn/nukkit/item/ItemLeggingsChain.java
index 4127e17e0f6..d4a92283372 100644
--- a/src/main/java/cn/nukkit/item/ItemLeggingsChain.java
+++ b/src/main/java/cn/nukkit/item/ItemLeggingsChain.java
@@ -14,7 +14,7 @@ public ItemLeggingsChain(Integer meta) {
}
public ItemLeggingsChain(Integer meta, int count) {
- super(CHAIN_LEGGINGS, meta, count, "Chain Leggings");
+ super(CHAIN_LEGGINGS, meta, count, "Chainmail Leggings");
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemLeggingsGold.java b/src/main/java/cn/nukkit/item/ItemLeggingsGold.java
index ffd00cc0614..bc30e41d8b5 100644
--- a/src/main/java/cn/nukkit/item/ItemLeggingsGold.java
+++ b/src/main/java/cn/nukkit/item/ItemLeggingsGold.java
@@ -14,7 +14,7 @@ public ItemLeggingsGold(Integer meta) {
}
public ItemLeggingsGold(Integer meta, int count) {
- super(GOLD_LEGGINGS, meta, count, "Gold Leggings");
+ super(GOLD_LEGGINGS, meta, count, "Golden Leggings");
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemLeggingsNetherite.java b/src/main/java/cn/nukkit/item/ItemLeggingsNetherite.java
index 691cb6883ec..0ac8bc01cca 100644
--- a/src/main/java/cn/nukkit/item/ItemLeggingsNetherite.java
+++ b/src/main/java/cn/nukkit/item/ItemLeggingsNetherite.java
@@ -1,6 +1,7 @@
package cn.nukkit.item;
import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
@Since("1.4.0.0-PN")
@@ -47,6 +48,7 @@ public int getToughness() {
return 3;
}
+ @PowerNukkitOnly
@Override
public boolean isLavaResistant() {
return true;
diff --git a/src/main/java/cn/nukkit/item/ItemMap.java b/src/main/java/cn/nukkit/item/ItemMap.java
index db0dc744f5e..d6f11085e76 100644
--- a/src/main/java/cn/nukkit/item/ItemMap.java
+++ b/src/main/java/cn/nukkit/item/ItemMap.java
@@ -35,12 +35,7 @@ public ItemMap(Integer meta) {
public ItemMap(Integer meta, int count) {
super(MAP, meta, count, "Map");
- switch (meta) {
- case 3: this.name = "Ocean Explorer Map"; break;
- case 4: this.name = "Woodland Explorer Map"; break;
- case 5: this.name = "Treasure Map"; break;
- }
-
+ updateName();
if (!hasCompoundTag() || !getNamedTag().contains("map_uuid")) {
CompoundTag tag = new CompoundTag();
tag.putLong("map_uuid", mapCount++);
@@ -48,6 +43,21 @@ public ItemMap(Integer meta, int count) {
}
}
+ @Override
+ public void setDamage(Integer meta) {
+ super.setDamage(meta);
+ updateName();
+ }
+
+ private void updateName() {
+ switch (meta) {
+ case 3: this.name = "Ocean Explorer Map"; break;
+ case 4: this.name = "Woodland Explorer Map"; break;
+ case 5: this.name = "Treasure Map"; break;
+ default: this.name = "Map"; break;
+ }
+ }
+
public void setImage(File file) throws IOException {
setImage(ImageIO.read(file));
}
diff --git a/src/main/java/cn/nukkit/item/ItemMelon.java b/src/main/java/cn/nukkit/item/ItemMelon.java
index 1cd107bfae3..6fb7619b9c7 100644
--- a/src/main/java/cn/nukkit/item/ItemMelon.java
+++ b/src/main/java/cn/nukkit/item/ItemMelon.java
@@ -14,6 +14,6 @@ public ItemMelon(Integer meta) {
}
public ItemMelon(Integer meta, int count) {
- super(MELON, meta, count, "Melon");
+ super(MELON, meta, count, "Melon Slice");
}
}
diff --git a/src/main/java/cn/nukkit/item/ItemMelonGlistering.java b/src/main/java/cn/nukkit/item/ItemMelonGlistering.java
index 9581bcdb0c8..c40c062bb6c 100644
--- a/src/main/java/cn/nukkit/item/ItemMelonGlistering.java
+++ b/src/main/java/cn/nukkit/item/ItemMelonGlistering.java
@@ -15,6 +15,6 @@ public ItemMelonGlistering(Integer meta) {
}
public ItemMelonGlistering(Integer meta, int count) {
- super(GLISTERING_MELON, meta, count, "Glistering Melon");
+ super(GLISTERING_MELON, meta, count, "Glistering Melon Slice");
}
}
diff --git a/src/main/java/cn/nukkit/item/ItemNautilusShell.java b/src/main/java/cn/nukkit/item/ItemNautilusShell.java
new file mode 100644
index 00000000000..98efdf35042
--- /dev/null
+++ b/src/main/java/cn/nukkit/item/ItemNautilusShell.java
@@ -0,0 +1,22 @@
+package cn.nukkit.item;
+
+import cn.nukkit.api.Since;
+
+@Since("1.6.0.0-PN")
+public class ItemNautilusShell extends Item {
+
+ @Since("1.6.0.0-PN")
+ public ItemNautilusShell() {
+ this(0, 1);
+ }
+
+ @Since("1.6.0.0-PN")
+ public ItemNautilusShell(Integer meta) {
+ this(meta, 1);
+ }
+
+ @Since("1.6.0.0-PN")
+ public ItemNautilusShell(Integer meta, int count) {
+ super(NAUTILUS_SHELL, meta, count, "Nautilus Shell");
+ }
+}
diff --git a/src/main/java/cn/nukkit/item/ItemNuggetIron.java b/src/main/java/cn/nukkit/item/ItemNuggetIron.java
index 540840b679b..c264eee8171 100644
--- a/src/main/java/cn/nukkit/item/ItemNuggetIron.java
+++ b/src/main/java/cn/nukkit/item/ItemNuggetIron.java
@@ -1,28 +1,23 @@
package cn.nukkit.item;
-import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
/**
* @author good777LUCKY
*/
-@PowerNukkitOnly
@Since("1.4.0.0-PN")
public class ItemNuggetIron extends Item {
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemNuggetIron() {
this(0, 1);
}
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemNuggetIron(Integer meta) {
this(meta, 1);
}
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemNuggetIron(Integer meta, int count) {
super(IRON_NUGGET, meta, count, "Iron Nugget");
diff --git a/src/main/java/cn/nukkit/item/ItemPhantomMembrane.java b/src/main/java/cn/nukkit/item/ItemPhantomMembrane.java
new file mode 100644
index 00000000000..8b72b2137c5
--- /dev/null
+++ b/src/main/java/cn/nukkit/item/ItemPhantomMembrane.java
@@ -0,0 +1,22 @@
+package cn.nukkit.item;
+
+import cn.nukkit.api.Since;
+
+@Since("1.6.0.0-PN")
+public class ItemPhantomMembrane extends Item {
+
+ @Since("1.6.0.0-PN")
+ public ItemPhantomMembrane() {
+ this(0, 1);
+ }
+
+ @Since("1.6.0.0-PN")
+ public ItemPhantomMembrane(Integer meta) {
+ this(meta, 1);
+ }
+
+ @Since("1.6.0.0-PN")
+ public ItemPhantomMembrane(Integer meta, int count) {
+ super(PHANTOM_MEMBRANE, meta, count, "Phantom Membrane");
+ }
+}
diff --git a/src/main/java/cn/nukkit/item/ItemPickaxeGold.java b/src/main/java/cn/nukkit/item/ItemPickaxeGold.java
index 9cccee8ac4a..62b9b1e8baf 100644
--- a/src/main/java/cn/nukkit/item/ItemPickaxeGold.java
+++ b/src/main/java/cn/nukkit/item/ItemPickaxeGold.java
@@ -14,7 +14,7 @@ public ItemPickaxeGold(Integer meta) {
}
public ItemPickaxeGold(Integer meta, int count) {
- super(GOLD_PICKAXE, meta, count, "Gold Pickaxe");
+ super(GOLD_PICKAXE, meta, count, "Golden Pickaxe");
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemPickaxeNetherite.java b/src/main/java/cn/nukkit/item/ItemPickaxeNetherite.java
index bff545100d9..9966a9213fc 100644
--- a/src/main/java/cn/nukkit/item/ItemPickaxeNetherite.java
+++ b/src/main/java/cn/nukkit/item/ItemPickaxeNetherite.java
@@ -1,5 +1,6 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
@Since("1.4.0.0-PN")
@@ -40,6 +41,7 @@ public int getAttackDamage() {
return 6;
}
+ @PowerNukkitOnly
@Override
public boolean isLavaResistant() {
return true;
diff --git a/src/main/java/cn/nukkit/item/ItemPotion.java b/src/main/java/cn/nukkit/item/ItemPotion.java
index 70d9bb6d6b9..95e431e143c 100644
--- a/src/main/java/cn/nukkit/item/ItemPotion.java
+++ b/src/main/java/cn/nukkit/item/ItemPotion.java
@@ -1,9 +1,15 @@
package cn.nukkit.item;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.event.player.PlayerItemConsumeEvent;
import cn.nukkit.math.Vector3;
import cn.nukkit.potion.Potion;
+import cn.nukkit.utils.ServerException;
+
+import javax.annotation.Nullable;
+import java.util.Objects;
public class ItemPotion extends Item {
@@ -55,6 +61,62 @@ public ItemPotion(Integer meta) {
public ItemPotion(Integer meta, int count) {
super(POTION, meta, count, "Potion");
+ updateName();
+ }
+
+ @Override
+ public void setDamage(Integer meta) {
+ super.setDamage(meta);
+ updateName();
+ }
+
+ private void updateName() {
+ int potionId = getDamage();
+ if (potionId == Potion.WATER) {
+ name = buildName(potionId, "Bottle", true);
+ } else {
+ name = buildName(potionId, "Potion", true);
+ }
+ }
+
+ static String buildName(int potionId, String type, boolean includeLevel) {
+ switch (potionId) {
+ case Potion.WATER:
+ return "Water " + type;
+ case Potion.MUNDANE:
+ case Potion.MUNDANE_II:
+ return "Mundane " + type;
+ case Potion.THICK:
+ return "Thick " + type;
+ case Potion.AWKWARD:
+ return "Awkward " + type;
+ case Potion.TURTLE_MASTER:
+ case Potion.TURTLE_MASTER_II:
+ case Potion.TURTLE_MASTER_LONG: {
+ String name = type + " of the Turtle Master";
+ if (!includeLevel) {
+ return name;
+ }
+ Potion potion = Objects.requireNonNull(getPotion(potionId));
+ if (potion.getLevel() <= 1) {
+ return name;
+ }
+ return name + " " + potion.getRomanLevel();
+ }
+ default: {
+ Potion potion = getPotion(potionId);
+ String finalName = potion != null ? potion.getPotionTypeName() : "";
+ if (finalName.isEmpty()) {
+ finalName = type;
+ } else {
+ finalName = type + " of " + finalName;
+ }
+ if (includeLevel && potion != null && potion.getLevel() > 1) {
+ finalName += " " + potion.getRomanLevel();
+ }
+ return finalName;
+ }
+ }
}
@Override
@@ -87,4 +149,19 @@ public boolean onUse(Player player, int ticksUsed) {
}
return true;
}
-}
\ No newline at end of file
+
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ @Nullable
+ public Potion getPotion() {
+ return getPotion(getDamage());
+ }
+
+ static Potion getPotion(int damage) {
+ try {
+ return Potion.getPotion(damage);
+ } catch (ServerException ignored) {
+ return null;
+ }
+ }
+}
diff --git a/src/main/java/cn/nukkit/item/ItemPotionLingering.java b/src/main/java/cn/nukkit/item/ItemPotionLingering.java
index a31695bcc17..2d5e54478b7 100644
--- a/src/main/java/cn/nukkit/item/ItemPotionLingering.java
+++ b/src/main/java/cn/nukkit/item/ItemPotionLingering.java
@@ -1,6 +1,9 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.entity.item.EntityPotion;
import cn.nukkit.nbt.tag.CompoundTag;
+import cn.nukkit.potion.Potion;
public class ItemPotionLingering extends ProjectileItem {
@@ -14,6 +17,22 @@ public ItemPotionLingering(Integer meta) {
public ItemPotionLingering(Integer meta, int count) {
super(LINGERING_POTION, meta, count, "Lingering Potion");
+ updateName();
+ }
+
+ @Override
+ public void setDamage(Integer meta) {
+ super.setDamage(meta);
+ updateName();
+ }
+
+ private void updateName() {
+ int potionId = getDamage();
+ if (potionId == Potion.WATER) {
+ name = "Lingering Water Bottle";
+ } else {
+ name = ItemPotion.buildName(potionId, "Lingering Potion", true);
+ }
}
@Override
@@ -25,19 +44,24 @@ public int getMaxStackSize() {
public boolean canBeActivated() {
return true;
}
-
+
+ @PowerNukkitOnly
+
@Override
public String getProjectileEntityType() {
return "LingeringPotion";
}
-
+
+ @PowerNukkitOnly
@Override
public float getThrowForce() {
return 0.5f;
}
-
+
+ @PowerNukkitOnly
+
@Override
protected void correctNBT(CompoundTag nbt) {
- nbt.putInt("PotionId", this.meta);
+ nbt.putInt(EntityPotion.NBT_POTION_ID, this.meta);
}
}
diff --git a/src/main/java/cn/nukkit/item/ItemPotionSplash.java b/src/main/java/cn/nukkit/item/ItemPotionSplash.java
index 383f1686c6a..6d96b38ecd6 100644
--- a/src/main/java/cn/nukkit/item/ItemPotionSplash.java
+++ b/src/main/java/cn/nukkit/item/ItemPotionSplash.java
@@ -1,6 +1,10 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+import cn.nukkit.entity.item.EntityPotion;
import cn.nukkit.nbt.tag.CompoundTag;
+import cn.nukkit.potion.Potion;
/**
* @author xtypr
@@ -8,12 +12,34 @@
*/
public class ItemPotionSplash extends ProjectileItem {
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ public ItemPotionSplash() {
+ this(0, 1);
+ }
+
public ItemPotionSplash(Integer meta) {
this(meta, 1);
}
public ItemPotionSplash(Integer meta, int count) {
super(SPLASH_POTION, meta, count, "Splash Potion");
+ updateName();
+ }
+
+ @Override
+ public void setDamage(Integer meta) {
+ super.setDamage(meta);
+ updateName();
+ }
+
+ private void updateName() {
+ int potionId = getDamage();
+ if (potionId == Potion.WATER) {
+ name = "Splash Water Bottle";
+ } else {
+ name = ItemPotion.buildName(potionId, "Splash Potion", true);
+ }
}
@Override
@@ -38,6 +64,6 @@ public float getThrowForce() {
@Override
protected void correctNBT(CompoundTag nbt) {
- nbt.putInt("PotionId", this.meta);
+ nbt.putInt(EntityPotion.NBT_POTION_ID, this.meta);
}
}
diff --git a/src/main/java/cn/nukkit/item/ItemRabbitHide.java b/src/main/java/cn/nukkit/item/ItemRabbitHide.java
index 36144b65f94..13824e2a7dd 100644
--- a/src/main/java/cn/nukkit/item/ItemRabbitHide.java
+++ b/src/main/java/cn/nukkit/item/ItemRabbitHide.java
@@ -1,25 +1,20 @@
package cn.nukkit.item;
-import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
-@PowerNukkitOnly
@Since("1.4.0.0-PN")
public class ItemRabbitHide extends Item {
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemRabbitHide() {
this(0, 1);
}
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemRabbitHide(Integer meta) {
this(meta, 1);
}
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemRabbitHide(Integer meta, int count) {
super(RABBIT_HIDE, meta, count, "Rabbit Hide");
diff --git a/src/main/java/cn/nukkit/item/ItemRecord11.java b/src/main/java/cn/nukkit/item/ItemRecord11.java
index 56f3b8f7a50..523a13bc89f 100644
--- a/src/main/java/cn/nukkit/item/ItemRecord11.java
+++ b/src/main/java/cn/nukkit/item/ItemRecord11.java
@@ -15,6 +15,7 @@ public ItemRecord11(Integer meta) {
public ItemRecord11(Integer meta, int count) {
super(RECORD_11, meta, count);
+ name = "Music Disc 11";
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemRecord13.java b/src/main/java/cn/nukkit/item/ItemRecord13.java
index 173e8b029fb..50a8454dd47 100644
--- a/src/main/java/cn/nukkit/item/ItemRecord13.java
+++ b/src/main/java/cn/nukkit/item/ItemRecord13.java
@@ -15,6 +15,7 @@ public ItemRecord13(Integer meta) {
public ItemRecord13(Integer meta, int count) {
super(RECORD_13, meta, count);
+ name = "Music Disc 13";
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemRecordBlocks.java b/src/main/java/cn/nukkit/item/ItemRecordBlocks.java
index 00be58db636..6c15a82b757 100644
--- a/src/main/java/cn/nukkit/item/ItemRecordBlocks.java
+++ b/src/main/java/cn/nukkit/item/ItemRecordBlocks.java
@@ -15,6 +15,7 @@ public ItemRecordBlocks(Integer meta) {
public ItemRecordBlocks(Integer meta, int count) {
super(RECORD_BLOCKS, meta, count);
+ name = "Music Disc Blocks";
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemRecordCat.java b/src/main/java/cn/nukkit/item/ItemRecordCat.java
index 8f4eef89fb9..8d76cb96e03 100644
--- a/src/main/java/cn/nukkit/item/ItemRecordCat.java
+++ b/src/main/java/cn/nukkit/item/ItemRecordCat.java
@@ -15,6 +15,7 @@ public ItemRecordCat(Integer meta) {
public ItemRecordCat(Integer meta, int count) {
super(RECORD_CAT, meta, count);
+ name = "Music Disc Cat";
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemRecordChirp.java b/src/main/java/cn/nukkit/item/ItemRecordChirp.java
index 82bd15366a9..65ea24053b0 100644
--- a/src/main/java/cn/nukkit/item/ItemRecordChirp.java
+++ b/src/main/java/cn/nukkit/item/ItemRecordChirp.java
@@ -15,6 +15,7 @@ public ItemRecordChirp(Integer meta) {
public ItemRecordChirp(Integer meta, int count) {
super(RECORD_CHIRP, meta, count);
+ name = "Music Disc Chirp";
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemRecordFar.java b/src/main/java/cn/nukkit/item/ItemRecordFar.java
index 9f8d1a29c1c..d72a44448e6 100644
--- a/src/main/java/cn/nukkit/item/ItemRecordFar.java
+++ b/src/main/java/cn/nukkit/item/ItemRecordFar.java
@@ -15,6 +15,7 @@ public ItemRecordFar(Integer meta) {
public ItemRecordFar(Integer meta, int count) {
super(RECORD_FAR, meta, count);
+ name = "Music Disc Far";
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemRecordMall.java b/src/main/java/cn/nukkit/item/ItemRecordMall.java
index aa49939e6b6..398a794c572 100644
--- a/src/main/java/cn/nukkit/item/ItemRecordMall.java
+++ b/src/main/java/cn/nukkit/item/ItemRecordMall.java
@@ -15,6 +15,7 @@ public ItemRecordMall(Integer meta) {
public ItemRecordMall(Integer meta, int count) {
super(RECORD_MALL, meta, count);
+ name = "Music Disc Mall";
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemRecordMellohi.java b/src/main/java/cn/nukkit/item/ItemRecordMellohi.java
index 9c5119d950b..ab09d4418ba 100644
--- a/src/main/java/cn/nukkit/item/ItemRecordMellohi.java
+++ b/src/main/java/cn/nukkit/item/ItemRecordMellohi.java
@@ -15,6 +15,7 @@ public ItemRecordMellohi(Integer meta) {
public ItemRecordMellohi(Integer meta, int count) {
super(RECORD_MELLOHI, meta, count);
+ name = "Music Disc Mellohi";
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemRecordPigstep.java b/src/main/java/cn/nukkit/item/ItemRecordPigstep.java
index 4cf113a5362..8abb9921715 100644
--- a/src/main/java/cn/nukkit/item/ItemRecordPigstep.java
+++ b/src/main/java/cn/nukkit/item/ItemRecordPigstep.java
@@ -21,6 +21,7 @@ public ItemRecordPigstep(Integer meta) {
@Since("1.4.0.0-PN")
public ItemRecordPigstep(Integer meta, int count) {
super(RECORD_PIGSTEP, meta, count);
+ name = "Music Disc Pigstep";
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemRecordStal.java b/src/main/java/cn/nukkit/item/ItemRecordStal.java
index ec3b623f8d2..f9e50374262 100644
--- a/src/main/java/cn/nukkit/item/ItemRecordStal.java
+++ b/src/main/java/cn/nukkit/item/ItemRecordStal.java
@@ -15,6 +15,7 @@ public ItemRecordStal(Integer meta) {
public ItemRecordStal(Integer meta, int count) {
super(RECORD_STAL, meta, count);
+ name = "Music Disc Stal";
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemRecordStrad.java b/src/main/java/cn/nukkit/item/ItemRecordStrad.java
index 2edf6eb9b6c..a62b1186871 100644
--- a/src/main/java/cn/nukkit/item/ItemRecordStrad.java
+++ b/src/main/java/cn/nukkit/item/ItemRecordStrad.java
@@ -15,6 +15,7 @@ public ItemRecordStrad(Integer meta) {
public ItemRecordStrad(Integer meta, int count) {
super(RECORD_STRAD, meta, count);
+ name = "Music Disc Strad";
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemRecordWait.java b/src/main/java/cn/nukkit/item/ItemRecordWait.java
index 8816d6d8e2e..1756d4c0a8f 100644
--- a/src/main/java/cn/nukkit/item/ItemRecordWait.java
+++ b/src/main/java/cn/nukkit/item/ItemRecordWait.java
@@ -15,6 +15,7 @@ public ItemRecordWait(Integer meta) {
public ItemRecordWait(Integer meta, int count) {
super(RECORD_WAIT, meta, count);
+ name = "Music Disc Wait";
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemRecordWard.java b/src/main/java/cn/nukkit/item/ItemRecordWard.java
index 0d65d8fb8df..b271be461dc 100644
--- a/src/main/java/cn/nukkit/item/ItemRecordWard.java
+++ b/src/main/java/cn/nukkit/item/ItemRecordWard.java
@@ -15,6 +15,7 @@ public ItemRecordWard(Integer meta) {
public ItemRecordWard(Integer meta, int count) {
super(RECORD_WARD, meta, count);
+ name = "Music Disc Ward";
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemRedstone.java b/src/main/java/cn/nukkit/item/ItemRedstone.java
index df9d7130a63..b35824d1cf1 100644
--- a/src/main/java/cn/nukkit/item/ItemRedstone.java
+++ b/src/main/java/cn/nukkit/item/ItemRedstone.java
@@ -17,7 +17,7 @@ public ItemRedstone(Integer meta) {
}
public ItemRedstone(Integer meta, int count) {
- super(REDSTONE, meta, count, "Redstone");
+ super(REDSTONE, meta, count, "Redstone Dust");
this.block = Block.get(BlockID.REDSTONE_WIRE);
}
diff --git a/src/main/java/cn/nukkit/item/ItemScrapNetherite.java b/src/main/java/cn/nukkit/item/ItemScrapNetherite.java
index 41131d63c35..a9a044567f8 100644
--- a/src/main/java/cn/nukkit/item/ItemScrapNetherite.java
+++ b/src/main/java/cn/nukkit/item/ItemScrapNetherite.java
@@ -1,5 +1,6 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
@Since("1.4.0.0-PN")
@@ -20,6 +21,7 @@ public ItemScrapNetherite(Integer meta, int count) {
super(NETHERITE_SCRAP, 0, count, "Netherite Scrap");
}
+ @PowerNukkitOnly
@Override
public boolean isLavaResistant() {
return true;
diff --git a/src/main/java/cn/nukkit/item/ItemScute.java b/src/main/java/cn/nukkit/item/ItemScute.java
new file mode 100644
index 00000000000..10c8ee4a964
--- /dev/null
+++ b/src/main/java/cn/nukkit/item/ItemScute.java
@@ -0,0 +1,22 @@
+package cn.nukkit.item;
+
+import cn.nukkit.api.Since;
+
+@Since("1.6.0.0-PN")
+public class ItemScute extends Item {
+
+ @Since("1.6.0.0-PN")
+ public ItemScute() {
+ this(0, 1);
+ }
+
+ @Since("1.6.0.0-PN")
+ public ItemScute(Integer meta) {
+ this(meta, 1);
+ }
+
+ @Since("1.6.0.0-PN")
+ public ItemScute(Integer meta, int count) {
+ super(SCUTE, meta, count, "Scute");
+ }
+}
diff --git a/src/main/java/cn/nukkit/item/ItemShield.java b/src/main/java/cn/nukkit/item/ItemShield.java
index 68221020f49..9de765fbe5c 100644
--- a/src/main/java/cn/nukkit/item/ItemShield.java
+++ b/src/main/java/cn/nukkit/item/ItemShield.java
@@ -24,6 +24,6 @@ public int getMaxStackSize() {
@Override
public int getMaxDurability() {
- return 336;
+ return DURABILITY_SHIELD;
}
}
diff --git a/src/main/java/cn/nukkit/item/ItemShovelGold.java b/src/main/java/cn/nukkit/item/ItemShovelGold.java
index 40ef032e44f..1e3abbdfbf4 100644
--- a/src/main/java/cn/nukkit/item/ItemShovelGold.java
+++ b/src/main/java/cn/nukkit/item/ItemShovelGold.java
@@ -14,7 +14,7 @@ public ItemShovelGold(Integer meta) {
}
public ItemShovelGold(Integer meta, int count) {
- super(GOLD_SHOVEL, meta, count, "Gold Shovel");
+ super(GOLD_SHOVEL, meta, count, "Golden Shovel");
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemShovelNetherite.java b/src/main/java/cn/nukkit/item/ItemShovelNetherite.java
index be5c6934766..04a0e65a28b 100644
--- a/src/main/java/cn/nukkit/item/ItemShovelNetherite.java
+++ b/src/main/java/cn/nukkit/item/ItemShovelNetherite.java
@@ -1,5 +1,6 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
@Since("1.4.0.0-PN")
@@ -40,6 +41,7 @@ public int getAttackDamage() {
return 5;
}
+ @PowerNukkitOnly
@Override
public boolean isLavaResistant() {
return true;
diff --git a/src/main/java/cn/nukkit/item/ItemSign.java b/src/main/java/cn/nukkit/item/ItemSign.java
index b984b5c53a6..b0005a0370a 100644
--- a/src/main/java/cn/nukkit/item/ItemSign.java
+++ b/src/main/java/cn/nukkit/item/ItemSign.java
@@ -1,5 +1,6 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockID;
import cn.nukkit.block.BlockSignPost;
@@ -17,13 +18,14 @@ public ItemSign(Integer meta) {
this(meta, 1);
}
+ @PowerNukkitOnly
protected ItemSign(int id, Integer meta, int count, String name, BlockSignPost block) {
super(id, meta, count, name);
this.block = block;
}
public ItemSign(Integer meta, int count) {
- super(SIGN, 0, count, "Sign");
+ super(SIGN, 0, count, "Oak Sign");
this.block = Block.get(BlockID.SIGN_POST);
}
diff --git a/src/main/java/cn/nukkit/item/ItemSkull.java b/src/main/java/cn/nukkit/item/ItemSkull.java
index 96a57e4a29a..744112d751e 100644
--- a/src/main/java/cn/nukkit/item/ItemSkull.java
+++ b/src/main/java/cn/nukkit/item/ItemSkull.java
@@ -23,8 +23,19 @@ public ItemSkull(Integer meta) {
}
public ItemSkull(Integer meta, int count) {
- super(SKULL, meta, count, getItemSkullName(meta));
+ super(SKULL, meta, count, "Skull");
this.block = Block.get(Block.SKULL_BLOCK);
+ updateName();
+ }
+
+ @Override
+ public void setDamage(Integer meta) {
+ super.setDamage(meta);
+ updateName();
+ }
+
+ private void updateName() {
+ name = getItemSkullName(getDamage());
}
public static String getItemSkullName(int meta) {
diff --git a/src/main/java/cn/nukkit/item/ItemSpawnEgg.java b/src/main/java/cn/nukkit/item/ItemSpawnEgg.java
index 3f6de6fe43f..e0c6e4ceb32 100644
--- a/src/main/java/cn/nukkit/item/ItemSpawnEgg.java
+++ b/src/main/java/cn/nukkit/item/ItemSpawnEgg.java
@@ -15,6 +15,7 @@
import cn.nukkit.nbt.tag.FloatTag;
import cn.nukkit.nbt.tag.ListTag;
+import javax.annotation.Nullable;
import java.util.Random;
/**
@@ -31,7 +32,8 @@ public ItemSpawnEgg(Integer meta) {
}
public ItemSpawnEgg(Integer meta, int count) {
- super(SPAWN_EGG, meta, count, "Spawn EntityEgg");
+ this(SPAWN_EGG, meta, count, "Spawn Egg");
+ updateName();
}
@PowerNukkitOnly
@@ -40,6 +42,23 @@ protected ItemSpawnEgg(int id, Integer meta, int count, String name) {
super(id, meta, count, name);
}
+ @Override
+ public void setDamage(Integer meta) {
+ super.setDamage(meta);
+ updateName();
+ }
+
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ protected void updateName() {
+ String entityName = getEntityName();
+ if (entityName == null) {
+ name = "Spawn Egg";
+ } else {
+ name = entityName + " Spawn Egg";
+ }
+ }
+
@Override
public boolean canBeActivated() {
return true;
@@ -95,15 +114,29 @@ public boolean onActivate(Level level, Player player, Block block, Block target,
return false;
}
- @Since("1.4.0.0-PN")
- @PowerNukkitOnly
- public Item getLegacySpawnEgg() {
- return Item.get(SPAWN_EGG, getEntityNetworkId(), getCount(), getCompoundTag());
- }
-
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getEntityNetworkId() {
return this.meta;
}
+
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ @Nullable
+ public String getEntityName() {
+ String saveId = Entity.getSaveId(getEntityNetworkId());
+ if (saveId == null) {
+ return null;
+ }
+ switch (saveId) {
+ case "VillagerV1":
+ return "Villager";
+ case "ZombieVillagerV1":
+ return "Zombie Villager";
+ case "NPC":
+ return "NPC";
+ default:
+ return String.join(" ", saveId.split("(?=\\p{Lu})"));
+ }
+ }
}
diff --git a/src/main/java/cn/nukkit/item/ItemSpiderEye.java b/src/main/java/cn/nukkit/item/ItemSpiderEye.java
index 66b9961481a..9ac84bfc59b 100644
--- a/src/main/java/cn/nukkit/item/ItemSpiderEye.java
+++ b/src/main/java/cn/nukkit/item/ItemSpiderEye.java
@@ -1,9 +1,10 @@
package cn.nukkit.item;
+
/**
* @author Snake1999
* @since 2016/1/14
*/
-public class ItemSpiderEye extends Item {
+public class ItemSpiderEye extends ItemEdible {
public ItemSpiderEye() {
this(0, 1);
diff --git a/src/main/java/cn/nukkit/item/ItemSpruceSign.java b/src/main/java/cn/nukkit/item/ItemSpruceSign.java
index c640f425b74..fd48e639ba3 100644
--- a/src/main/java/cn/nukkit/item/ItemSpruceSign.java
+++ b/src/main/java/cn/nukkit/item/ItemSpruceSign.java
@@ -1,16 +1,21 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.BlockSpruceSignPost;
+@PowerNukkitOnly
public class ItemSpruceSign extends ItemSign {
+ @PowerNukkitOnly
public ItemSpruceSign() {
this(0, 1);
}
+ @PowerNukkitOnly
public ItemSpruceSign(Integer meta) {
this(meta, 1);
}
+ @PowerNukkitOnly
public ItemSpruceSign(Integer meta, int count) {
super(SPRUCE_SIGN, meta, count, "Spruce Sign", new BlockSpruceSignPost());
}
diff --git a/src/main/java/cn/nukkit/item/ItemSpyglass.java b/src/main/java/cn/nukkit/item/ItemSpyglass.java
new file mode 100644
index 00000000000..dcaf61fc08b
--- /dev/null
+++ b/src/main/java/cn/nukkit/item/ItemSpyglass.java
@@ -0,0 +1,30 @@
+package cn.nukkit.item;
+
+import cn.nukkit.api.Since;
+
+/**
+ * @author LT_Name
+ */
+@Since("1.6.0.0-PN")
+public class ItemSpyglass extends Item {
+
+ @Since("1.6.0.0-PN")
+ public ItemSpyglass() {
+ this(0, 1);
+ }
+
+ @Since("1.6.0.0-PN")
+ public ItemSpyglass(Integer meta) {
+ this(meta, 1);
+ }
+
+ @Since("1.6.0.0-PN")
+ public ItemSpyglass(Integer meta, int count) {
+ super(SPYGLASS, meta, count, "Spyglass");
+ }
+
+ @Override
+ public int getMaxStackSize() {
+ return 1;
+ }
+}
diff --git a/src/main/java/cn/nukkit/item/ItemString.java b/src/main/java/cn/nukkit/item/ItemString.java
index 5620ec50cb9..4ac82ec9e6e 100644
--- a/src/main/java/cn/nukkit/item/ItemString.java
+++ b/src/main/java/cn/nukkit/item/ItemString.java
@@ -18,6 +18,6 @@ public ItemString(Integer meta) {
public ItemString(Integer meta, int count) {
super(STRING, meta, count, "String");
- this.block = Block.get(BlockID.TRIPWIRE);
+ this.block = Block.get(BlockID.TRIP_WIRE);
}
}
diff --git a/src/main/java/cn/nukkit/item/ItemSuspiciousStew.java b/src/main/java/cn/nukkit/item/ItemSuspiciousStew.java
index c752f9f71bd..8ad9d10be4f 100644
--- a/src/main/java/cn/nukkit/item/ItemSuspiciousStew.java
+++ b/src/main/java/cn/nukkit/item/ItemSuspiciousStew.java
@@ -18,5 +18,4 @@ public ItemSuspiciousStew(Integer meta, int count) {
public int getMaxStackSize() {
return 1;
}
-
}
diff --git a/src/main/java/cn/nukkit/item/ItemSwordGold.java b/src/main/java/cn/nukkit/item/ItemSwordGold.java
index b262f73a8a1..6c66e3300ee 100644
--- a/src/main/java/cn/nukkit/item/ItemSwordGold.java
+++ b/src/main/java/cn/nukkit/item/ItemSwordGold.java
@@ -14,7 +14,7 @@ public ItemSwordGold(Integer meta) {
}
public ItemSwordGold(Integer meta, int count) {
- super(GOLD_SWORD, meta, count, "Gold Sword");
+ super(GOLD_SWORD, meta, count, "Golden Sword");
}
@Override
diff --git a/src/main/java/cn/nukkit/item/ItemSwordNetherite.java b/src/main/java/cn/nukkit/item/ItemSwordNetherite.java
index ec2ab642b4b..ecef2daf365 100644
--- a/src/main/java/cn/nukkit/item/ItemSwordNetherite.java
+++ b/src/main/java/cn/nukkit/item/ItemSwordNetherite.java
@@ -1,5 +1,6 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
@Since("1.4.0.0-PN")
@@ -40,6 +41,7 @@ public int getAttackDamage() {
return 8;
}
+ @PowerNukkitOnly
@Override
public boolean isLavaResistant() {
return true;
diff --git a/src/main/java/cn/nukkit/item/ItemTool.java b/src/main/java/cn/nukkit/item/ItemTool.java
index 6d1a5fff6cf..84af777983e 100644
--- a/src/main/java/cn/nukkit/item/ItemTool.java
+++ b/src/main/java/cn/nukkit/item/ItemTool.java
@@ -32,7 +32,7 @@ public abstract class ItemTool extends Item implements ItemDurable {
public static final int TYPE_AXE = 4;
public static final int TYPE_SHEARS = 5;
@Since("1.4.0.0-PN") public static final int TYPE_HOE = 6;
-
+
/**
* Same breaking speed independent of the tool.
*/
@@ -49,9 +49,12 @@ public abstract class ItemTool extends Item implements ItemDurable {
public static final int DURABILITY_SHEARS = dynamic(239);
public static final int DURABILITY_BOW = dynamic(385);
public static final int DURABILITY_TRIDENT = dynamic(251);
- public static final int DURABILITY_FISHING_ROD = dynamic(65);
- @Since("1.4.0.0-PN") public static final int DURABILITY_CROSSBOW = dynamic(465);
-
+ public static final int DURABILITY_FISHING_ROD = dynamic(384);
+ @Since("1.4.0.0-PN") public static final int DURABILITY_CROSSBOW = dynamic(464);
+ @Since("1.6.0.0-PN") public static final int DURABILITY_CARROT_ON_A_STICK = dynamic(26);
+ @Since("1.6.0.0-PN") public static final int DURABILITY_WARPED_FUNGUS_ON_A_STICK = dynamic(101);
+ @Since("1.6.0.0-PN") @PowerNukkitOnly public static final int DURABILITY_SHIELD = dynamic(337);
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
@Nonnull
@@ -103,7 +106,7 @@ public int getMaxStackSize() {
@Override
public boolean useOn(Block block) {
- if (this.isUnbreakable() || isDurable() || !damageWhenBreaking()) {
+ if (this.isUnbreakable() || isDurable() || noDamageOnBreak()) {
return true;
}
@@ -130,7 +133,7 @@ public boolean useOn(Block block) {
@Override
public boolean useOn(Entity entity) {
- if (this.isUnbreakable() || isDurable() || !damageWhenBreaking()) {
+ if (this.isUnbreakable() || isDurable() || noDamageOnAttack()) {
return true;
}
@@ -190,16 +193,7 @@ public boolean isShears() {
@Override
public boolean isTool() {
- switch (this.id) {
- case FLINT_STEEL:
- case SHEARS:
- case BOW:
- case CROSSBOW:
- case SHIELD:
- return true;
- default:
- return this.isPickaxe() || this.isAxe() || this.isShovel() || this.isSword() || this.isHoe();
- }
+ return true;
}
@Override
@@ -216,11 +210,28 @@ public int getEnchantAbility() {
case TIER_IRON:
return 14;
}
-
+
if (tier == TIER_NETHERITE) {
return 15;
}
return 0;
}
+ /**
+ * No damage to item when it's used to attack entities
+ * @return whether the item should take damage when used to attack entities
+ */
+ @Since("1.6.0.0-PN")
+ public boolean noDamageOnAttack() {
+ return false;
+ }
+
+ /**
+ * No damage to item when it's used to break blocks
+ * @return whether the item should take damage when used to break blocks
+ */
+ @Since("1.6.0.0-PN")
+ public boolean noDamageOnBreak() {
+ return false;
+ }
}
diff --git a/src/main/java/cn/nukkit/item/ItemTotem.java b/src/main/java/cn/nukkit/item/ItemTotem.java
index bc9397bd18d..8208a244c5b 100644
--- a/src/main/java/cn/nukkit/item/ItemTotem.java
+++ b/src/main/java/cn/nukkit/item/ItemTotem.java
@@ -1,7 +1,10 @@
package cn.nukkit.item;
+import cn.nukkit.api.PowerNukkitOnly;
+
public class ItemTotem extends Item {
+ @PowerNukkitOnly
public ItemTotem() {
this(0, 1);
}
diff --git a/src/main/java/cn/nukkit/item/ItemTrident.java b/src/main/java/cn/nukkit/item/ItemTrident.java
index 780594d3b41..da10838fb70 100644
--- a/src/main/java/cn/nukkit/item/ItemTrident.java
+++ b/src/main/java/cn/nukkit/item/ItemTrident.java
@@ -3,7 +3,6 @@
import cn.nukkit.Player;
import cn.nukkit.Server;
import cn.nukkit.api.PowerNukkitDifference;
-import cn.nukkit.entity.Entity;
import cn.nukkit.entity.projectile.EntityProjectile;
import cn.nukkit.entity.projectile.EntityThrownTrident;
import cn.nukkit.event.entity.EntityShootBowEvent;
@@ -37,12 +36,7 @@ public ItemTrident(Integer meta, int count) {
public int getMaxDurability() {
return ItemTool.DURABILITY_TRIDENT;
}
-
- @Override
- public boolean isSword() {
- return true;
- }
-
+
@Override
public int getAttackDamage() {
return 9;
@@ -55,11 +49,12 @@ public boolean onClickAir(Player player, Vector3 directionVector) {
@PowerNukkitDifference(info = "Using new method to play sounds", since = "1.4.0.0-PN")
@Override
+ @SuppressWarnings("java:S3516")
public boolean onRelease(Player player, int ticksUsed) {
- if (this.getEnchantmentLevel(Enchantment.ID_TRIDENT_RIPTIDE) > 0) {
+ if (this.hasEnchantment(Enchantment.ID_TRIDENT_RIPTIDE)) {
return true;
}
-
+
this.useOn(player);
CompoundTag nbt = new CompoundTag()
@@ -75,23 +70,18 @@ public boolean onRelease(Player player, int ticksUsed) {
.add(new FloatTag("", (player.yaw > 180 ? 360 : 0) - (float) player.yaw))
.add(new FloatTag("", (float) -player.pitch)));
- double p = (double) ticksUsed / 20;
-
- double f = Math.min((p * p + p * 2) / 3, 1) * 2;
- EntityThrownTrident trident = (EntityThrownTrident) Entity.createEntity("ThrownTrident", player.chunk, nbt, player, f == 2);
+ EntityThrownTrident trident = new EntityThrownTrident(player.chunk, nbt, player);
+ trident.setItem(this);
- if (trident == null) {
- return false;
- }
+ double p = (double) ticksUsed / 20;
+ double f = Math.min((p * p + p * 2) / 3, 1) * 2.5;
- trident.setItem(this);
-
if (player.isCreative()) {
- trident.setCreative(true);
+ trident.setPickupMode(EntityProjectile.PICKUP_CREATIVE);
}
-
+
trident.setFavoredSlot(player.getInventory().getHeldItemIndex());
-
+
EntityShootBowEvent entityShootBowEvent = new EntityShootBowEvent(player, this, trident, f);
if (f < 0.1 || ticksUsed < 5) {
@@ -100,21 +90,19 @@ public boolean onRelease(Player player, int ticksUsed) {
Server.getInstance().getPluginManager().callEvent(entityShootBowEvent);
if (entityShootBowEvent.isCancelled()) {
- entityShootBowEvent.getProjectile().kill();
+ entityShootBowEvent.getProjectile().close();
} else {
entityShootBowEvent.getProjectile().setMotion(entityShootBowEvent.getProjectile().getMotion().multiply(entityShootBowEvent.getForce()));
- if (entityShootBowEvent.getProjectile() instanceof EntityProjectile) {
- ProjectileLaunchEvent ev = new ProjectileLaunchEvent(entityShootBowEvent.getProjectile());
- Server.getInstance().getPluginManager().callEvent(ev);
- if (ev.isCancelled()) {
- entityShootBowEvent.getProjectile().kill();
- } else {
- entityShootBowEvent.getProjectile().spawnToAll();
+ ProjectileLaunchEvent ev = new ProjectileLaunchEvent(entityShootBowEvent.getProjectile());
+ Server.getInstance().getPluginManager().callEvent(ev);
+ if (ev.isCancelled()) {
+ entityShootBowEvent.getProjectile().close();
+ } else {
+ entityShootBowEvent.getProjectile().spawnToAll();
player.getLevel().addSound(player, Sound.ITEM_TRIDENT_THROW);
- if (!player.isCreative()) {
- this.count--;
- player.getInventory().setItemInHand(this);
- }
+ if (!player.isCreative()) {
+ this.count--;
+ player.getInventory().setItemInHand(this);
}
}
}
diff --git a/src/main/java/cn/nukkit/item/ItemWarpedFungusOnAStick.java b/src/main/java/cn/nukkit/item/ItemWarpedFungusOnAStick.java
index 88909384b5d..50a8a5da679 100644
--- a/src/main/java/cn/nukkit/item/ItemWarpedFungusOnAStick.java
+++ b/src/main/java/cn/nukkit/item/ItemWarpedFungusOnAStick.java
@@ -18,29 +18,24 @@
package cn.nukkit.item;
-import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
/**
* @author joserobjr
* @since 2021-02-16
*/
-@PowerNukkitOnly
@Since("1.4.0.0-PN")
public class ItemWarpedFungusOnAStick extends ItemTool {
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemWarpedFungusOnAStick() {
this(0, 1);
}
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemWarpedFungusOnAStick(Integer meta) {
this(meta, 1);
}
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
public ItemWarpedFungusOnAStick(Integer meta, int count) {
super(WARPED_FUNGUS_ON_A_STICK, meta, count, "Warped Fungus on a Stick");
@@ -53,11 +48,11 @@ public int getMaxStackSize() {
@Override
public int getMaxDurability() {
- return 100;
+ return ItemTool.DURABILITY_WARPED_FUNGUS_ON_A_STICK;
}
@Override
- public boolean damageWhenBreaking() {
- return false;
+ public boolean noDamageOnBreak() {
+ return true;
}
}
diff --git a/src/main/java/cn/nukkit/item/MinecraftItemID.java b/src/main/java/cn/nukkit/item/MinecraftItemID.java
index 8a43dbef25c..1d2e9a2b5a1 100644
--- a/src/main/java/cn/nukkit/item/MinecraftItemID.java
+++ b/src/main/java/cn/nukkit/item/MinecraftItemID.java
@@ -953,7 +953,8 @@ public enum MinecraftItemID {
@PowerNukkitOnly @Since("1.4.0.0-PN") WATER_BUCKET,
@PowerNukkitOnly @Since("1.4.0.0-PN") LIGHT_GRAY_DYE,
@PowerNukkitOnly @Since("1.4.0.0-PN") CHARCOAL,
- @PowerNukkitOnly @Since("1.4.0.0-PN") AGENT_SPAWN_EGG(false, false, true)
+ @PowerNukkitOnly @Since("1.4.0.0-PN") AGENT_SPAWN_EGG(false, false, true),
+ @PowerNukkitOnly @Since("1.6.0.0-PN") SPYGLASS
;
private static final Map namespacedIdMap = Arrays.stream(values())
.flatMap(id->
diff --git a/src/main/java/cn/nukkit/item/PNAlphaItemID.java b/src/main/java/cn/nukkit/item/PNAlphaItemID.java
index 28eac648cfa..1b7a5f43f5a 100644
--- a/src/main/java/cn/nukkit/item/PNAlphaItemID.java
+++ b/src/main/java/cn/nukkit/item/PNAlphaItemID.java
@@ -24,7 +24,6 @@
import cn.nukkit.api.Since;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
@@ -39,7 +38,6 @@
"This interface was created to map item ids which were used in v1.4.0.0-PN-ALPHA.1, v1.4.0.0-PN-ALPHA.2 and v1.4.0.0-PN-ALPHA.1 " +
"and will no longer be used because Nukkit took an other way and we will follow it to keep plugin compatibility in future.")
@RequiredArgsConstructor
-@Getter
public enum PNAlphaItemID {
@Since("1.4.0.0-PN") @PowerNukkitOnly COD_BUCKET(802, MinecraftItemID.COD_BUCKET),
@Since("1.4.0.0-PN") @PowerNukkitOnly GHAST_SPAWN_EGG(803, MinecraftItemID.GHAST_SPAWN_EGG),
@@ -163,4 +161,16 @@ public enum PNAlphaItemID {
public static PNAlphaItemID getBadAlphaId(int id) {
return byId.get(id);
}
+
+ @PowerNukkitOnly
+ @Since("1.4.0.0-PN")
+ public int getBadItemId() {
+ return badItemId;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.4.0.0-PN")
+ public MinecraftItemID getMinecraftItemId() {
+ return minecraftItemId;
+ }
}
diff --git a/src/main/java/cn/nukkit/item/ProjectileItem.java b/src/main/java/cn/nukkit/item/ProjectileItem.java
index 7c903fa35ab..3eb7326f536 100644
--- a/src/main/java/cn/nukkit/item/ProjectileItem.java
+++ b/src/main/java/cn/nukkit/item/ProjectileItem.java
@@ -1,6 +1,7 @@
package cn.nukkit.item;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.projectile.EntityEnderPearl;
import cn.nukkit.entity.projectile.EntityProjectile;
@@ -25,6 +26,7 @@ public ProjectileItem(int id, Integer meta, int count, String name) {
abstract public float getThrowForce();
+ @Override
public boolean onClickAir(Player player, Vector3 directionVector) {
CompoundTag nbt = new CompoundTag()
.putList(new ListTag("Pos")
@@ -73,10 +75,12 @@ public boolean onClickAir(Player player, Vector3 directionVector) {
return true;
}
+ @PowerNukkitOnly
protected void addThrowSound(Player player) {
player.getLevel().addLevelSoundEvent(player, LevelSoundEventPacketV2.SOUND_THROW, -1, "minecraft:player", false, false);
}
+ @PowerNukkitOnly
protected Entity correctProjectile(Player player, Entity projectile) {
return projectile;
}
diff --git a/src/main/java/cn/nukkit/item/RuntimeItemMapping.java b/src/main/java/cn/nukkit/item/RuntimeItemMapping.java
index 664c05ae7f9..bc0a30fc3a2 100644
--- a/src/main/java/cn/nukkit/item/RuntimeItemMapping.java
+++ b/src/main/java/cn/nukkit/item/RuntimeItemMapping.java
@@ -6,6 +6,9 @@
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import lombok.Data;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -37,6 +40,7 @@ public class RuntimeItemMapping {
private final Int2ObjectMap networkNamespaceMap;
@Since("1.4.0.0-PN")
+ @PowerNukkitOnly
public RuntimeItemMapping(byte[] itemDataPalette, Int2IntMap legacyNetworkMap, Int2IntMap networkLegacyMap) {
this.itemDataPalette = itemDataPalette;
this.legacyNetworkMap = legacyNetworkMap;
@@ -70,6 +74,7 @@ public RuntimeItemMapping(
* @return The network id
* @throws IllegalArgumentException If the mapping of the full id to the network id is unknown
*/
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getNetworkFullId(Item item) {
int fullId = RuntimeItems.getFullId(item.getId(), item.hasMeta() ? item.getDamage() : -1);
@@ -93,6 +98,7 @@ public int getNetworkFullId(Item item) {
* @return The full id
* @throws IllegalArgumentException If the mapping of the full id to the network id is unknown
*/
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getLegacyFullId(int networkId) {
int fullId = networkLegacyMap.get(networkId);
@@ -102,6 +108,7 @@ public int getLegacyFullId(int networkId) {
return fullId;
}
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public byte[] getItemDataPalette() {
return this.itemDataPalette;
@@ -154,4 +161,28 @@ public Item getItemByNamespaceId(@Nonnull String namespaceId, int amount) {
return item;
}
}
+
+ @Data
+ @Getter(onMethod = @__(@Since("1.6.0.0-PN")))
+ @RequiredArgsConstructor(onConstructor = @__(@Since("1.6.0.0-PN")))
+ @Since("1.6.0.0-PN")
+ public static class LegacyEntry {
+ private final int legacyId;
+ private final boolean hasDamage;
+ private final int damage;
+
+ public int getDamage() {
+ return this.hasDamage ? this.damage : 0;
+ }
+ }
+
+ @Data
+ @Getter(onMethod = @__(@Since("1.6.0.0-PN")))
+ @RequiredArgsConstructor(onConstructor = @__(@Since("1.6.0.0-PN")))
+ @Since("1.6.0.0-PN")
+ public static class RuntimeEntry {
+ private final String identifier;
+ private final int runtimeId;
+ private final boolean hasDamage;
+ }
}
diff --git a/src/main/java/cn/nukkit/item/RuntimeItems.java b/src/main/java/cn/nukkit/item/RuntimeItems.java
index 2f770ebaf0a..661ae1eec5a 100644
--- a/src/main/java/cn/nukkit/item/RuntimeItems.java
+++ b/src/main/java/cn/nukkit/item/RuntimeItems.java
@@ -15,8 +15,10 @@
import lombok.experimental.UtilityClass;
import lombok.extern.log4j.Log4j2;
+import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.UncheckedIOException;
import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -38,13 +40,17 @@ public class RuntimeItems {
static {
log.debug("Loading runtime items...");
- InputStream stream = Server.class.getClassLoader().getResourceAsStream("runtime_item_ids.json");
- if (stream == null) {
- throw new AssertionError("Unable to load runtime_item_ids.json");
- }
+ Collection entries;
+ try(InputStream stream = Server.class.getClassLoader().getResourceAsStream("runtime_item_ids.json")) {
+ if (stream == null) {
+ throw new AssertionError("Unable to load runtime_item_ids.json");
+ }
- InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8);
- Collection entries = GSON.fromJson(reader, ENTRY_TYPE);
+ InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8);
+ entries = GSON.fromJson(reader, ENTRY_TYPE);
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
BinaryStream paletteBuffer = new BinaryStream();
paletteBuffer.putUnsignedVarInt(entries.size());
@@ -78,31 +84,37 @@ public class RuntimeItems {
namespaceNetworkMap, networkNamespaceMap);
}
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public static RuntimeItemMapping getRuntimeMapping() {
return itemPalette;
}
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public static int getId(int fullId) {
return (short) (fullId >> 16);
}
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public static int getData(int fullId) {
return ((fullId >> 1) & 0x7fff);
}
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public static int getFullId(int id, int data) {
return (((short) id) << 16) | ((data & 0x7fff) << 1);
}
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public static int getNetworkId(int networkFullId) {
return networkFullId >> 1;
}
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public static boolean hasData(int id) {
return (id & 0x1) != 0;
diff --git a/src/main/java/cn/nukkit/item/enchantment/Enchantment.java b/src/main/java/cn/nukkit/item/enchantment/Enchantment.java
index ade48707aaa..c7e1025da35 100644
--- a/src/main/java/cn/nukkit/item/enchantment/Enchantment.java
+++ b/src/main/java/cn/nukkit/item/enchantment/Enchantment.java
@@ -21,6 +21,7 @@
import cn.nukkit.item.enchantment.loot.EnchantmentLootFishing;
import cn.nukkit.item.enchantment.loot.EnchantmentLootWeapon;
import cn.nukkit.item.enchantment.protection.*;
+import cn.nukkit.item.enchantment.sideeffect.SideEffect;
import cn.nukkit.item.enchantment.trident.EnchantmentTridentChanneling;
import cn.nukkit.item.enchantment.trident.EnchantmentTridentImpaling;
import cn.nukkit.item.enchantment.trident.EnchantmentTridentLoyalty;
@@ -368,6 +369,11 @@ public void doPostAttack(Entity attacker, Entity entity) {
}
+ @Since("1.6.0.0-PN")
+ public void doAttack(Entity attacker, Entity entity) {
+
+ }
+
public void doPostHurt(Entity attacker, Entity entity) {
}
@@ -418,6 +424,13 @@ public boolean isMajor() {
return false;
}
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Nonnull
+ public SideEffect[] getAttackSideEffects(@Nonnull Entity attacker, @Nonnull Entity entity) {
+ return SideEffect.EMPTY_ARRAY;
+ }
+
@Override
protected Enchantment clone() {
try {
diff --git a/src/main/java/cn/nukkit/item/enchantment/EnchantmentDurability.java b/src/main/java/cn/nukkit/item/enchantment/EnchantmentDurability.java
index b6983767232..16e73107cf8 100644
--- a/src/main/java/cn/nukkit/item/enchantment/EnchantmentDurability.java
+++ b/src/main/java/cn/nukkit/item/enchantment/EnchantmentDurability.java
@@ -1,5 +1,6 @@
package cn.nukkit.item.enchantment;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.Item;
import java.util.Random;
@@ -35,7 +36,8 @@ public boolean canEnchant(Item item) {
public static boolean negateDamage(Item item, int level, Random random) {
return !(item.isArmor() && random.nextFloat() < 0.6f) && random.nextInt(level + 1) > 0;
}
-
+
+ @PowerNukkitOnly
@Override
public boolean isItemAcceptable(Item item) {
if (!item.isNull() && item.getMaxDurability() != -1 && !item.isUnbreakable()) {
diff --git a/src/main/java/cn/nukkit/item/enchantment/EnchantmentEfficiency.java b/src/main/java/cn/nukkit/item/enchantment/EnchantmentEfficiency.java
index 363f8f216e8..a6db0f4f599 100644
--- a/src/main/java/cn/nukkit/item/enchantment/EnchantmentEfficiency.java
+++ b/src/main/java/cn/nukkit/item/enchantment/EnchantmentEfficiency.java
@@ -1,5 +1,6 @@
package cn.nukkit.item.enchantment;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.Item;
/**
@@ -29,7 +30,8 @@ public int getMaxLevel() {
public boolean canEnchant(Item item) {
return item.isShears() || super.canEnchant(item);
}
-
+
+ @PowerNukkitOnly
@Override
public boolean isItemAcceptable(Item item) {
if (item.isShears()) {
diff --git a/src/main/java/cn/nukkit/item/enchantment/EnchantmentFireAspect.java b/src/main/java/cn/nukkit/item/enchantment/EnchantmentFireAspect.java
index 2ffa06f89fc..b98258e0a50 100644
--- a/src/main/java/cn/nukkit/item/enchantment/EnchantmentFireAspect.java
+++ b/src/main/java/cn/nukkit/item/enchantment/EnchantmentFireAspect.java
@@ -1,8 +1,14 @@
package cn.nukkit.item.enchantment;
-import cn.nukkit.Server;
+import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+import cn.nukkit.Player;
import cn.nukkit.entity.Entity;
-import cn.nukkit.event.entity.EntityCombustByEntityEvent;
+import cn.nukkit.item.enchantment.sideeffect.SideEffect;
+import cn.nukkit.item.enchantment.sideeffect.SideEffectCombust;
+
+import javax.annotation.Nonnull;
/**
* @author MagicDroidX (Nukkit Project)
@@ -27,15 +33,22 @@ public int getMaxLevel() {
return 2;
}
+ @PowerNukkitDifference(since = "1.5.1.0-PN", info = "The entity combustion code was moved to SideEffectCombust, obtained by getAttackSideEffects(Entity, Entity)")
@Override
public void doPostAttack(Entity attacker, Entity entity) {
- int duration = Math.max(entity.fireTicks / 20, getLevel() * 4);
-
- EntityCombustByEntityEvent ev = new EntityCombustByEntityEvent(attacker, entity, duration);
- Server.getInstance().getPluginManager().callEvent(ev);
+ super.doPostAttack(attacker, entity);
+ }
- if (!ev.isCancelled()) {
- entity.setOnFire(ev.getDuration());
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ @Nonnull
+ @Override
+ public SideEffect[] getAttackSideEffects(@Nonnull Entity attacker, @Nonnull Entity entity) {
+ if (entity instanceof Player && ((Player) entity).isCreative()) {
+ return SideEffect.EMPTY_ARRAY;
}
+ return new SideEffect[]{
+ new SideEffectCombust(Math.max(entity.fireTicks / 20, getLevel() << 2))
+ };
}
}
diff --git a/src/main/java/cn/nukkit/item/enchantment/EnchantmentSilkTouch.java b/src/main/java/cn/nukkit/item/enchantment/EnchantmentSilkTouch.java
index f1fa6e45d91..e10023c6dad 100644
--- a/src/main/java/cn/nukkit/item/enchantment/EnchantmentSilkTouch.java
+++ b/src/main/java/cn/nukkit/item/enchantment/EnchantmentSilkTouch.java
@@ -1,5 +1,6 @@
package cn.nukkit.item.enchantment;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.Item;
/**
@@ -29,8 +30,8 @@ public boolean checkCompatibility(Enchantment enchantment) {
public boolean canEnchant(Item item) {
return item.isShears() || super.canEnchant(item);
}
-
-
+
+ @PowerNukkitOnly
@Override
public boolean isItemAcceptable(Item item) {
if (item.isShears()) {
diff --git a/src/main/java/cn/nukkit/item/enchantment/EnchantmentThorns.java b/src/main/java/cn/nukkit/item/enchantment/EnchantmentThorns.java
index 4277a2df082..fa5bd2a66f3 100644
--- a/src/main/java/cn/nukkit/item/enchantment/EnchantmentThorns.java
+++ b/src/main/java/cn/nukkit/item/enchantment/EnchantmentThorns.java
@@ -1,5 +1,6 @@
package cn.nukkit.item.enchantment;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.EntityHumanType;
import cn.nukkit.event.entity.EntityDamageByEntityEvent;
@@ -63,6 +64,7 @@ public boolean canEnchant(@Nonnull Item item) {
return !(item instanceof ItemElytra) && super.canEnchant(item);
}
+ @PowerNukkitOnly
@Override
public boolean isItemAcceptable(Item item) {
if (item instanceof ItemArmor) {
diff --git a/src/main/java/cn/nukkit/item/enchantment/damage/EnchantmentDamage.java b/src/main/java/cn/nukkit/item/enchantment/damage/EnchantmentDamage.java
index de41500194c..84bc2cee517 100644
--- a/src/main/java/cn/nukkit/item/enchantment/damage/EnchantmentDamage.java
+++ b/src/main/java/cn/nukkit/item/enchantment/damage/EnchantmentDamage.java
@@ -59,6 +59,7 @@ public boolean isMajor() {
return true;
}
+ @PowerNukkitOnly
@Override
public boolean isItemAcceptable(Item item) {
if (item.isAxe()) {
diff --git a/src/main/java/cn/nukkit/item/enchantment/damage/EnchantmentDamageAll.java b/src/main/java/cn/nukkit/item/enchantment/damage/EnchantmentDamageAll.java
index 653ec457dbb..528916c4dbd 100644
--- a/src/main/java/cn/nukkit/item/enchantment/damage/EnchantmentDamageAll.java
+++ b/src/main/java/cn/nukkit/item/enchantment/damage/EnchantmentDamageAll.java
@@ -28,10 +28,11 @@ public int getMaxEnchantableLevel() {
@Override
public double getDamageBonus(Entity entity) {
- if (this.getLevel() <= 0) {
+ int level = getLevel();
+ if (level <= 0) {
return 0;
}
- return 0.5 + getLevel() * 0.5;
+ return level * 1.25;
}
}
diff --git a/src/main/java/cn/nukkit/item/enchantment/sideeffect/SideEffect.java b/src/main/java/cn/nukkit/item/enchantment/sideeffect/SideEffect.java
new file mode 100644
index 00000000000..3174733ff60
--- /dev/null
+++ b/src/main/java/cn/nukkit/item/enchantment/sideeffect/SideEffect.java
@@ -0,0 +1,33 @@
+package cn.nukkit.item.enchantment.sideeffect;
+
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+import cn.nukkit.entity.Entity;
+import cn.nukkit.event.entity.EntityDamageEvent;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+@PowerNukkitOnly
+@Since("1.5.1.0-PN")
+public interface SideEffect extends Cloneable {
+ @PowerNukkitOnly
+ SideEffect[] EMPTY_ARRAY = new SideEffect[0];
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ default void doPreHealthChange(@Nonnull Entity entity, @Nonnull EntityDamageEvent source, @Nullable Entity attacker) {
+ // Does nothing
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ default void doPostAttack(@Nonnull Entity entity, @Nonnull EntityDamageEvent source, @Nullable Entity attacker) {
+ // Does nothing
+ }
+
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ @Nonnull
+ SideEffect cloneSideEffect();
+}
diff --git a/src/main/java/cn/nukkit/item/enchantment/sideeffect/SideEffectCombust.java b/src/main/java/cn/nukkit/item/enchantment/sideeffect/SideEffectCombust.java
new file mode 100644
index 00000000000..5a32ecc6304
--- /dev/null
+++ b/src/main/java/cn/nukkit/item/enchantment/sideeffect/SideEffectCombust.java
@@ -0,0 +1,69 @@
+package cn.nukkit.item.enchantment.sideeffect;
+
+import cn.nukkit.Server;
+import cn.nukkit.api.DeprecationDetails;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+import cn.nukkit.entity.Entity;
+import cn.nukkit.event.entity.EntityCombustByEntityEvent;
+import cn.nukkit.event.entity.EntityDamageEvent;
+import lombok.SneakyThrows;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+@PowerNukkitOnly
+@Since("1.5.1.0-PN")
+public class SideEffectCombust implements SideEffect {
+ private int duration;
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public SideEffectCombust(int duration) {
+ this.duration = duration;
+ }
+
+ @Since("1.5.1.0-PN")
+ @PowerNukkitOnly
+ @Override
+ public void doPreHealthChange(@Nonnull Entity entity, @Nonnull EntityDamageEvent event, @Nullable Entity attacker) {
+ EntityCombustByEntityEvent ev = new EntityCombustByEntityEvent(attacker, entity, duration);
+ Server.getInstance().getPluginManager().callEvent(ev);
+
+ if (!ev.isCancelled()) {
+ entity.setOnFire(ev.getDuration());
+ }
+ }
+
+ @Since("1.5.1.0-PN")
+ @PowerNukkitOnly
+ public int getDuration() {
+ return duration;
+ }
+
+ @Since("1.5.1.0-PN")
+ @PowerNukkitOnly
+ public void setDuration(int duration) {
+ this.duration = duration;
+ }
+
+ @Deprecated
+ @DeprecationDetails(since = "1.6.0.0-PN", reason = "clone have problems when defined in an interface", by = "PowerNukkit",
+ replaceWith = "cloneSideEffect")
+ @Since("1.5.1.0-PN")
+ @SneakyThrows
+ @Override
+ @Nonnull
+ public SideEffect clone() {
+ return (SideEffect) super.clone();
+ }
+
+ @Since("1.6.0.0-PN")
+ @PowerNukkitOnly
+ @SneakyThrows
+ @Override
+ @Nonnull
+ public SideEffect cloneSideEffect() {
+ return (SideEffect) super.clone();
+ }
+}
diff --git a/src/main/java/cn/nukkit/item/food/Food.java b/src/main/java/cn/nukkit/item/food/Food.java
index 0c8cf27ba5a..fe6ed66b05c 100644
--- a/src/main/java/cn/nukkit/item/food/Food.java
+++ b/src/main/java/cn/nukkit/item/food/Food.java
@@ -70,7 +70,7 @@ public abstract class Food {
.addChanceEffect(0.8F, Effect.getEffect(Effect.HUNGER).setDuration(30 * 20))
.addRelative(Item.ROTTEN_FLESH));
public static final Food spider_eye = registerDefaultFood(new FoodEffective(2, 3.2F)
- .addEffect(Effect.getEffect(Effect.POISON).setDuration(4 * 20))
+ .addEffect(Effect.getEffect(Effect.POISON).setDuration(5 * 20))
.addRelative(Item.SPIDER_EYE));
public static final Food steak = registerDefaultFood(new FoodNormal(8, 12.8F).addRelative(Item.COOKED_BEEF));
//different kinds of fishes
@@ -82,9 +82,9 @@ public abstract class Food {
public static final Food pufferfish = registerDefaultFood(new FoodEffective(1, 0.2F)
.addEffect(Effect.getEffect(Effect.HUNGER).setAmplifier(2).setDuration(15 * 20))
.addEffect(Effect.getEffect(Effect.NAUSEA).setAmplifier(1).setDuration(15 * 20))
- .addEffect(Effect.getEffect(Effect.POISON).setAmplifier(4).setDuration(60 * 20))
+ .addEffect(Effect.getEffect(Effect.POISON).setAmplifier(3).setDuration(60 * 20))
.addRelative(Item.PUFFERFISH));
- public static final Food dried_kelp = registerDefaultFood(new FoodNormal(1, 0.6F).addRelative(Item.DRIED_KELP));
+ public static final Food dried_kelp = registerDefaultFood(new FoodNormal(1, 0.6F).addRelative(Item.DRIED_KELP).setEatingTick(16));
public static final Food sweet_berries = registerDefaultFood(new FoodNormal(2, 0.4F).addRelative(Item.SWEET_BERRIES));
@PowerNukkitOnly
@@ -214,7 +214,24 @@ public Food setRestoreSaturation(float restoreSaturation) {
this.restoreSaturation = restoreSaturation;
return this;
}
-
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ protected int eatingTick = 31;
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public int getEatingTick() {
+ return eatingTick;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public Food setEatingTick(int eatingTick) {
+ this.eatingTick = eatingTick;
+ return this;
+ }
+
static class NodeIDMeta {
final int id;
final int meta;
@@ -233,5 +250,4 @@ static class NodeIDMetaPlugin extends NodeIDMeta {
this.plugin = plugin;
}
}
-
}
diff --git a/src/main/java/cn/nukkit/item/food/FoodEffectiveInBow.java b/src/main/java/cn/nukkit/item/food/FoodEffectiveInBow.java
index 801ffed2711..4ec8ec670be 100644
--- a/src/main/java/cn/nukkit/item/food/FoodEffectiveInBow.java
+++ b/src/main/java/cn/nukkit/item/food/FoodEffectiveInBow.java
@@ -1,9 +1,12 @@
package cn.nukkit.item.food;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.item.ItemBowl;
+@PowerNukkitOnly
public class FoodEffectiveInBow extends FoodEffective {
+ @PowerNukkitOnly
public FoodEffectiveInBow(int restoreFood, float restoreSaturation) {
super(restoreFood, restoreSaturation);
}
diff --git a/src/main/java/cn/nukkit/item/food/FoodHoney.java b/src/main/java/cn/nukkit/item/food/FoodHoney.java
index 3bb622aca9c..0a61feb938e 100644
--- a/src/main/java/cn/nukkit/item/food/FoodHoney.java
+++ b/src/main/java/cn/nukkit/item/food/FoodHoney.java
@@ -7,6 +7,7 @@
@PowerNukkitOnly
public class FoodHoney extends Food {
+ @PowerNukkitOnly
public FoodHoney(int restoreFood, float restoreSaturation) {
this.setRestoreFood(restoreFood);
this.setRestoreSaturation(restoreSaturation);
diff --git a/src/main/java/cn/nukkit/item/randomitem/ConstantItemSelector.java b/src/main/java/cn/nukkit/item/randomitem/ConstantItemSelector.java
index 608c07b8a30..cf33851bea5 100644
--- a/src/main/java/cn/nukkit/item/randomitem/ConstantItemSelector.java
+++ b/src/main/java/cn/nukkit/item/randomitem/ConstantItemSelector.java
@@ -31,6 +31,7 @@ public Item getItem() {
return item;
}
+ @Override
public Object select() {
return getItem();
}
diff --git a/src/main/java/cn/nukkit/item/randomitem/Fishing.java b/src/main/java/cn/nukkit/item/randomitem/Fishing.java
index 2d7ede58b01..10f7b4e3d72 100644
--- a/src/main/java/cn/nukkit/item/randomitem/Fishing.java
+++ b/src/main/java/cn/nukkit/item/randomitem/Fishing.java
@@ -1,6 +1,9 @@
package cn.nukkit.item.randomitem;
+import cn.nukkit.api.Since;
+import cn.nukkit.block.BlockID;
import cn.nukkit.item.Item;
+import cn.nukkit.item.ItemID;
import cn.nukkit.item.enchantment.Enchantment;
import cn.nukkit.math.NukkitMath;
import cn.nukkit.potion.Potion;
@@ -18,35 +21,33 @@ public final class Fishing {
public static final Selector FISHES = putSelector(new Selector(ROOT_FISHING), 0.85F);
public static final Selector TREASURES = putSelector(new Selector(ROOT_FISHING), 0.05F);
public static final Selector JUNKS = putSelector(new Selector(ROOT_FISHING), 0.1F);
- public static final Selector FISH = putSelector(new ConstantItemSelector(Item.RAW_FISH, FISHES), 0.6F);
- public static final Selector SALMON = putSelector(new ConstantItemSelector(Item.RAW_SALMON, FISHES), 0.25F);
- public static final Selector CLOWNFISH = putSelector(new ConstantItemSelector(Item.CLOWNFISH, FISHES), 0.02F);
- public static final Selector PUFFERFISH = putSelector(new ConstantItemSelector(Item.PUFFERFISH, FISHES), 0.13F);
- public static final Selector TREASURE_BOW = putSelector(new ConstantItemSelector(Item.BOW, TREASURES), 0.1667F);
- public static final Selector TREASURE_ENCHANTED_BOOK = putSelector(new ConstantItemSelector(Item.ENCHANTED_BOOK, TREASURES), 0.1667F);
- public static final Selector TREASURE_FISHING_ROD = putSelector(new ConstantItemSelector(Item.FISHING_ROD, TREASURES), 0.1667F);
- public static final Selector TREASURE_NAME_TAG = putSelector(new ConstantItemSelector(Item.NAME_TAG, TREASURES), 0.1667F);
- public static final Selector TREASURE_SADDLE = putSelector(new ConstantItemSelector(Item.SADDLE, TREASURES), 0.1667F);
- public static final Selector JUNK_BOWL = putSelector(new ConstantItemSelector(Item.BOWL, JUNKS), 0.12F);
- public static final Selector JUNK_FISHING_ROD = putSelector(new ConstantItemSelector(Item.FISHING_ROD, JUNKS), 0.024F);
- public static final Selector JUNK_LEATHER = putSelector(new ConstantItemSelector(Item.LEATHER, JUNKS), 0.12F);
- public static final Selector JUNK_LEATHER_BOOTS = putSelector(new ConstantItemSelector(Item.LEATHER_BOOTS, JUNKS), 0.12F);
- public static final Selector JUNK_ROTTEN_FLESH = putSelector(new ConstantItemSelector(Item.ROTTEN_FLESH, JUNKS), 0.12F);
- public static final Selector JUNK_STICK = putSelector(new ConstantItemSelector(Item.STICK, JUNKS), 0.06F);
- public static final Selector JUNK_STRING_ITEM = putSelector(new ConstantItemSelector(Item.STRING, JUNKS), 0.06F);
- public static final Selector JUNK_WATTER_BOTTLE = putSelector(new ConstantItemSelector(Item.POTION, Potion.NO_EFFECTS, JUNKS), 0.12F);
- public static final Selector JUNK_BONE = putSelector(new ConstantItemSelector(Item.BONE, JUNKS), 0.12F);
- public static final Selector JUNK_TRIPWIRE_HOOK = putSelector(new ConstantItemSelector(Item.TRIPWIRE_HOOK, JUNKS), 0.12F);
+ public static final Selector FISH = putSelector(new ConstantItemSelector(ItemID.RAW_FISH, FISHES), 0.6F);
+ public static final Selector SALMON = putSelector(new ConstantItemSelector(ItemID.RAW_SALMON, FISHES), 0.25F);
+ public static final Selector CLOWNFISH = putSelector(new ConstantItemSelector(ItemID.CLOWNFISH, FISHES), 0.02F);
+ public static final Selector PUFFERFISH = putSelector(new ConstantItemSelector(ItemID.PUFFERFISH, FISHES), 0.13F);
+ public static final Selector TREASURE_BOW = putSelector(new ConstantItemSelector(ItemID.BOW, TREASURES), 0.1667F);
+ public static final Selector TREASURE_ENCHANTED_BOOK = putSelector(new ConstantItemSelector(ItemID.ENCHANTED_BOOK, TREASURES), 0.1667F);
+ @Since("1.6.0.0-PN") public static final Selector TREASURE_FISHING_ROD = putSelector(new ConstantItemSelector(ItemID.FISHING_ROD, TREASURES), 0.1667F);
+ @Since("1.6.0.0-PN") public static final Selector TREASURE_NAME_TAG = putSelector(new ConstantItemSelector(ItemID.NAME_TAG, TREASURES), 0.1667F);
+ @Since("1.6.0.0-PN") public static final Selector TREASURE_SADDLE = putSelector(new ConstantItemSelector(ItemID.SADDLE, TREASURES), 0.1667F);
+ @Since("1.6.0.0-PN") public static final Selector TREASURE_NAUTILUS_SHELL = putSelector(new ConstantItemSelector(ItemID.NAUTILUS_SHELL, TREASURES), 0.1667F);
+ public static final Selector JUNK_BOWL = putSelector(new ConstantItemSelector(ItemID.BOWL, JUNKS), 0.12F);
+ public static final Selector JUNK_FISHING_ROD = putSelector(new ConstantItemSelector(ItemID.FISHING_ROD, JUNKS), 0.024F);
+ public static final Selector JUNK_LEATHER = putSelector(new ConstantItemSelector(ItemID.LEATHER, JUNKS), 0.12F);
+ public static final Selector JUNK_LEATHER_BOOTS = putSelector(new ConstantItemSelector(ItemID.LEATHER_BOOTS, JUNKS), 0.12F);
+ public static final Selector JUNK_ROTTEN_FLESH = putSelector(new ConstantItemSelector(ItemID.ROTTEN_FLESH, JUNKS), 0.12F);
+ public static final Selector JUNK_STICK = putSelector(new ConstantItemSelector(ItemID.STICK, JUNKS), 0.06F);
+ public static final Selector JUNK_STRING_ITEM = putSelector(new ConstantItemSelector(ItemID.STRING, JUNKS), 0.06F);
+ public static final Selector JUNK_WATTER_BOTTLE = putSelector(new ConstantItemSelector(ItemID.POTION, Potion.NO_EFFECTS, JUNKS), 0.12F);
+ public static final Selector JUNK_BONE = putSelector(new ConstantItemSelector(ItemID.BONE, JUNKS), 0.12F);
+ public static final Selector JUNK_TRIPWIRE_HOOK = putSelector(new ConstantItemSelector(Item.getBlock(BlockID.TRIPWIRE_HOOK), JUNKS), 0.12F);
public static Item getFishingResult(Item rod) {
int fortuneLevel = 0;
int lureLevel = 0;
if (rod != null) {
- if (rod.getEnchantment(Enchantment.ID_FORTUNE_FISHING) != null) {
- fortuneLevel = rod.getEnchantment(Enchantment.ID_FORTUNE_FISHING).getLevel();
- } else if (rod.getEnchantment(Enchantment.ID_LURE) != null) {
- lureLevel = rod.getEnchantment(Enchantment.ID_LURE).getLevel();
- }
+ fortuneLevel = rod.getEnchantmentLevel(Enchantment.ID_FORTUNE_FISHING);
+ lureLevel = rod.getEnchantmentLevel(Enchantment.ID_LURE);
}
return getFishingResult(fortuneLevel, lureLevel);
}
@@ -59,7 +60,6 @@ public static Item getFishingResult(int fortuneLevel, int lureLevel) {
putSelector(TREASURES, treasureChance);
putSelector(JUNKS, junkChance);
Object result = selectFrom(ROOT_FISHING);
- if (result instanceof Item) return (Item) result;
- return null;
+ return (Item) result;
}
}
diff --git a/src/main/java/cn/nukkit/level/DimensionData.java b/src/main/java/cn/nukkit/level/DimensionData.java
new file mode 100644
index 00000000000..e000acf37d9
--- /dev/null
+++ b/src/main/java/cn/nukkit/level/DimensionData.java
@@ -0,0 +1,31 @@
+package cn.nukkit.level;
+
+import cn.nukkit.api.Since;
+import lombok.Data;
+import lombok.Getter;
+
+@Since("1.6.0.0-PN")
+@Data
+public class DimensionData {
+ @Getter(onMethod = @__(@Since("1.6.0.0-PN")))
+ private final int dimensionId;
+ @Getter(onMethod = @__(@Since("1.6.0.0-PN")))
+ private final int minHeight;
+ @Getter(onMethod = @__(@Since("1.6.0.0-PN")))
+ private final int maxHeight;
+ @Getter(onMethod = @__(@Since("1.6.0.0-PN")))
+ private final int height;
+
+ @Since("1.6.0.0-PN")
+ public DimensionData(int dimensionId, int minHeight, int maxHeight) {
+ this.dimensionId = dimensionId;
+ this.minHeight = minHeight;
+ this.maxHeight = maxHeight;
+
+ int height = maxHeight - minHeight;
+ if (minHeight <= 0 && maxHeight > 0) {
+ height += 1; // 0 y coordinate counts too
+ }
+ this.height = height;
+ }
+}
diff --git a/src/main/java/cn/nukkit/level/DimensionEnum.java b/src/main/java/cn/nukkit/level/DimensionEnum.java
new file mode 100644
index 00000000000..f5f2ef8afb4
--- /dev/null
+++ b/src/main/java/cn/nukkit/level/DimensionEnum.java
@@ -0,0 +1,36 @@
+package cn.nukkit.level;
+
+import cn.nukkit.api.Since;
+
+@Since("1.6.0.0-PN")
+public enum DimensionEnum {
+ @Since("1.6.0.0-PN")
+ OVERWORLD(new DimensionData(Level.DIMENSION_OVERWORLD, -64, 319)),
+
+ @Since("1.6.0.0-PN")
+ NETHER(new DimensionData(Level.DIMENSION_NETHER, 0, 127)),
+
+ @Since("1.6.0.0-PN")
+ END(new DimensionData(Level.DIMENSION_THE_END, 0, 255));
+
+ private final DimensionData dimensionData;
+
+ DimensionEnum(DimensionData dimensionData) {
+ this.dimensionData = dimensionData;
+ }
+
+ @Since("1.6.0.0-PN")
+ public DimensionData getDimensionData() {
+ return this.dimensionData;
+ }
+
+ @Since("1.6.0.0-PN")
+ public static DimensionData getDataFromId(int dimension) {
+ for (DimensionEnum value : values()) {
+ if (value.getDimensionData().getDimensionId() == dimension) {
+ return value.getDimensionData();
+ }
+ }
+ return null;
+ }
+}
diff --git a/src/main/java/cn/nukkit/level/GameRule.java b/src/main/java/cn/nukkit/level/GameRule.java
index c4a4c23d67e..7ec23c26951 100644
--- a/src/main/java/cn/nukkit/level/GameRule.java
+++ b/src/main/java/cn/nukkit/level/GameRule.java
@@ -1,15 +1,19 @@
package cn.nukkit.level;
+import cn.nukkit.api.DeprecationDetails;
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import java.util.Optional;
public enum GameRule {
+
+ COMMAND_BLOCKS_ENABLED("commandBlocksEnabled"),
COMMAND_BLOCK_OUTPUT("commandBlockOutput"),
DO_DAYLIGHT_CYCLE("doDaylightCycle"),
DO_ENTITY_DROPS("doEntityDrops"),
DO_FIRE_TICK("doFireTick"),
+ DO_INSOMNIA("doInsomnia"),
DO_IMMEDIATE_RESPAWN("doImmediateRespawn"),
DO_MOB_LOOT("doMobLoot"),
DO_MOB_SPAWNING("doMobSpawning"),
@@ -18,24 +22,33 @@ public enum GameRule {
DROWNING_DAMAGE("drowningDamage"),
FALL_DAMAGE("fallDamage"),
FIRE_DAMAGE("fireDamage"),
+ @Since("1.5.1.0-PN") FREEZE_DAMAGE("freezeDamage"),
+ FUNCTION_COMMAND_LIMIT("functionCommandLimit"),
KEEP_INVENTORY("keepInventory"),
+ MAX_COMMAND_CHAIN_LENGTH("maxCommandChainLength"),
MOB_GRIEFING("mobGriefing"),
NATURAL_REGENERATION("naturalRegeneration"),
PVP("pvp"),
RANDOM_TICK_SPEED("randomTickSpeed"),
SEND_COMMAND_FEEDBACK("sendCommandFeedback"),
SHOW_COORDINATES("showCoordinates"),
- TNT_EXPLODES("tntExplodes"),
- SHOW_DEATH_MESSAGE("showDeathMessages"),
- EXPERIMENTAL_GAMEPLAY("experimentalGameplay"),
- MAX_COMMAND_CHAIN_LENGTH("maxCommandChainLength"),
- DO_INSOMNIA("doInsomnia"),
- COMMAND_BLOCKS_ENABLED("commandBlocksEnabled"),
- FUNCTION_COMMAND_LIMIT("functionCommandLimit"),
+ @Since("1.5.1.0-PN") SHOW_DEATH_MESSAGES("showDeathMessages"),
+
+ @Deprecated
+ @PowerNukkitOnly("Renamed to SHOW_DEATH_MESSAGE by NukkitX")
+ @DeprecationDetails(since = "1.5.1.0-PN",
+ reason = "Added by upstream with a different name",
+ replaceWith = "SHOW_DEATH_MESSAGES")
+ @SuppressWarnings("DeprecatedIsStillUsed")
+ SHOW_DEATH_MESSAGE(SHOW_DEATH_MESSAGES.name, true),
+
SPAWN_RADIUS("spawnRadius"),
+ TNT_EXPLODES("tntExplodes"),
+ @PowerNukkitOnly EXPERIMENTAL_GAMEPLAY("experimentalGameplay"),
SHOW_TAGS("showTags");
private final String name;
+ private final boolean deprecated;
@PowerNukkitOnly
@Since("1.4.0.0-PN")
@@ -43,6 +56,12 @@ public enum GameRule {
GameRule(String name) {
this.name = name;
+ this.deprecated = false;
+ }
+
+ GameRule(String name, boolean deprecated) {
+ this.name = name;
+ this.deprecated = deprecated;
}
public static Optional parseString(String gameRuleString) {
@@ -71,4 +90,10 @@ public static String[] getNames() {
public String getName() {
return name;
}
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public boolean isDeprecated() {
+ return deprecated;
+ }
}
diff --git a/src/main/java/cn/nukkit/level/GameRules.java b/src/main/java/cn/nukkit/level/GameRules.java
index e4566e35729..ae120706331 100644
--- a/src/main/java/cn/nukkit/level/GameRules.java
+++ b/src/main/java/cn/nukkit/level/GameRules.java
@@ -25,10 +25,12 @@ private GameRules() {
public static GameRules getDefault() {
GameRules gameRules = new GameRules();
+ gameRules.gameRules.put(COMMAND_BLOCKS_ENABLED, new Value<>(Type.BOOLEAN, true));
gameRules.gameRules.put(COMMAND_BLOCK_OUTPUT, new Value<>(Type.BOOLEAN, true));
gameRules.gameRules.put(DO_DAYLIGHT_CYCLE, new Value<>(Type.BOOLEAN, true));
gameRules.gameRules.put(DO_ENTITY_DROPS, new Value<>(Type.BOOLEAN, true));
gameRules.gameRules.put(DO_FIRE_TICK, new Value<>(Type.BOOLEAN, true));
+ gameRules.gameRules.put(DO_INSOMNIA, new Value<>(Type.BOOLEAN, true));
gameRules.gameRules.put(DO_IMMEDIATE_RESPAWN, new Value<>(Type.BOOLEAN, false));
gameRules.gameRules.put(DO_MOB_LOOT, new Value<>(Type.BOOLEAN, true));
gameRules.gameRules.put(DO_MOB_SPAWNING, new Value<>(Type.BOOLEAN, true));
@@ -37,22 +39,25 @@ public static GameRules getDefault() {
gameRules.gameRules.put(DROWNING_DAMAGE, new Value<>(Type.BOOLEAN, true));
gameRules.gameRules.put(FALL_DAMAGE, new Value<>(Type.BOOLEAN, true));
gameRules.gameRules.put(FIRE_DAMAGE, new Value<>(Type.BOOLEAN, true));
+ gameRules.gameRules.put(FREEZE_DAMAGE, new Value<>(Type.BOOLEAN, true));
+ gameRules.gameRules.put(FUNCTION_COMMAND_LIMIT, new Value<>(Type.INTEGER, 10000));
gameRules.gameRules.put(KEEP_INVENTORY, new Value<>(Type.BOOLEAN, false));
+ gameRules.gameRules.put(MAX_COMMAND_CHAIN_LENGTH, new Value<>(Type.INTEGER, 65536));
gameRules.gameRules.put(MOB_GRIEFING, new Value<>(Type.BOOLEAN, true));
gameRules.gameRules.put(NATURAL_REGENERATION, new Value<>(Type.BOOLEAN, true));
gameRules.gameRules.put(PVP, new Value<>(Type.BOOLEAN, true));
gameRules.gameRules.put(RANDOM_TICK_SPEED, new Value<>(Type.INTEGER, 3));
gameRules.gameRules.put(SEND_COMMAND_FEEDBACK, new Value<>(Type.BOOLEAN, true));
gameRules.gameRules.put(SHOW_COORDINATES, new Value<>(Type.BOOLEAN, false));
- gameRules.gameRules.put(TNT_EXPLODES, new Value<>(Type.BOOLEAN, true));
- gameRules.gameRules.put(SHOW_DEATH_MESSAGE, new Value<>(Type.BOOLEAN, true));
- gameRules.gameRules.put(EXPERIMENTAL_GAMEPLAY, new Value<>(Type.BOOLEAN, false));
- gameRules.gameRules.put(MAX_COMMAND_CHAIN_LENGTH, new Value<>(Type.INTEGER, 131070));
- gameRules.gameRules.put(DO_INSOMNIA, new Value<>(Type.BOOLEAN, true));
- gameRules.gameRules.put(COMMAND_BLOCKS_ENABLED, new Value<>(Type.BOOLEAN, true));
- gameRules.gameRules.put(FUNCTION_COMMAND_LIMIT, new Value<>(Type.INTEGER, 20000));
+ gameRules.gameRules.put(SHOW_DEATH_MESSAGES, new Value<>(Type.BOOLEAN, true));
+
+ @SuppressWarnings("deprecation") GameRule deprecated = SHOW_DEATH_MESSAGE;
+ gameRules.gameRules.put(deprecated, gameRules.gameRules.get(SHOW_DEATH_MESSAGES));
+
gameRules.gameRules.put(SPAWN_RADIUS, new Value<>(Type.INTEGER, 5));
+ gameRules.gameRules.put(TNT_EXPLODES, new Value<>(Type.BOOLEAN, true));
gameRules.gameRules.put(SHOW_TAGS, new Value<>(Type.BOOLEAN, true));
+ gameRules.gameRules.put(EXPERIMENTAL_GAMEPLAY, new Value<>(Type.BOOLEAN, false));
return gameRules;
}
diff --git a/src/main/java/cn/nukkit/level/GlobalBlockPalette.java b/src/main/java/cn/nukkit/level/GlobalBlockPalette.java
index 773c6a5d95e..4e675f89a2c 100644
--- a/src/main/java/cn/nukkit/level/GlobalBlockPalette.java
+++ b/src/main/java/cn/nukkit/level/GlobalBlockPalette.java
@@ -1,6 +1,8 @@
package cn.nukkit.level;
import cn.nukkit.api.DeprecationDetails;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
import cn.nukkit.blockstate.BlockStateRegistry;
import lombok.extern.log4j.Log4j2;
@@ -11,6 +13,7 @@
public class GlobalBlockPalette {
@Deprecated
@DeprecationDetails(reason = "Public mutable array", replaceWith = "BlockStateRegistry.getBlockPaletteBytes() or BlockStateRegistry.copyBlockPaletteBytes()", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
public static final byte[] BLOCK_PALETTE = BlockStateRegistry.getBlockPaletteBytes();
@Deprecated
@@ -27,7 +30,14 @@ public static int getOrCreateRuntimeId(int legacyId) {
@Deprecated
@DeprecationDetails(reason = "Moved to BlockStateRegistry", replaceWith = "BlockStateRegistry.getPersistenceName(int)", since = "1.3.0.0-PN")
+ @PowerNukkitOnly
public static String getName(int blockId) {
return BlockStateRegistry.getPersistenceName(blockId);
}
+
+ @Since("1.6.0.0-PN")
+ public static int getLegacyFullId(int runtimeId) {
+ //TODO Implement
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/src/main/java/cn/nukkit/level/Level.java b/src/main/java/cn/nukkit/level/Level.java
index 9a8d7b1fa4a..754e4ee624e 100644
--- a/src/main/java/cn/nukkit/level/Level.java
+++ b/src/main/java/cn/nukkit/level/Level.java
@@ -88,6 +88,10 @@ public class Level implements ChunkManager, Metadatable {
@Since("1.4.0.0-PN")
public static final Level[] EMPTY_ARRAY = new Level[0];
+ static {
+ Timings.init();
+ }
+
private static int levelIdCounter = 1;
private static int chunkLoaderCounter = 1;
@SuppressWarnings({"java:S1444", "java:S3008"})
@@ -100,7 +104,7 @@ public class Level implements ChunkManager, Metadatable {
public static final int BLOCK_UPDATE_TOUCH = 5;
public static final int BLOCK_UPDATE_REDSTONE = 6;
public static final int BLOCK_UPDATE_TICK = 7;
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public static final int BLOCK_UPDATE_MOVED = dynamic(1_000_000);
@@ -161,7 +165,7 @@ public class Level implements ChunkManager, Metadatable {
randomTickBlocks[BlockID.WARPED_NYLIUM] = true;
randomTickBlocks[BlockID.TWISTING_VINES] = true;
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public static boolean canRandomTick(int blockId) {
@@ -206,6 +210,7 @@ public static void setCanRandomTick(int blockId, boolean newValue) {
private float time;
public boolean stopTime;
+ private int nextTimeSendTick;
public float skyLightSubtracted;
@@ -294,7 +299,7 @@ public Generator init() {
private long levelCurrentTick = 0;
- private int dimension;
+ private DimensionData dimensionData;
public GameRules gameRules;
@@ -317,14 +322,18 @@ public Level(Server server, String name, String path, Class usesChunkSection, (lvl, p)-> provider);
}
- @PowerNukkitOnly("Makes easier to create tests")
- @Since("1.4.0.0-PN")
+ /**
+ * Easier constructor to create PowerNukkit tests.
+ */
+ @Since("1.4.0.0-PN")
Level(Server server, String name, String path, BooleanSupplier usesChunkSection, BiFunction provider) {
this.levelId = levelIdCounter++;
this.blockMetadata = new BlockMetadataStore(this);
@@ -443,7 +452,7 @@ public void setTickRate(int tickRate) {
public void initLevel() {
Generator generator = generators.get();
- this.dimension = generator.getDimension();
+ this.dimensionData = generator.getDimensionData();
this.gameRules = this.requireProvider().getGamerules();
log.info("Preparing start region for level \"{}\"", this.getFolderName());
@@ -500,7 +509,7 @@ public void close() {
}
levelProvider.close();
}
-
+
this.provider = null;
this.blockMetadata = null;
this.temporalPosition = null;
@@ -538,11 +547,13 @@ public void addSound(Vector3 pos, Sound sound, float volume, float pitch, Player
Server.broadcastPacket(players, packet);
}
}
-
+
+ @PowerNukkitOnly
public void addLevelEvent(int type, int data) {
addLevelEvent(type, data, null);
}
-
+
+ @PowerNukkitOnly
public void addLevelEvent(int type, int data, Vector3 pos) {
if (pos == null) {
addLevelEvent(type, data, 0, 0, 0);
@@ -550,7 +561,8 @@ public void addLevelEvent(int type, int data, Vector3 pos) {
addLevelEvent(type, data, (float) pos.x, (float) pos.y, (float) pos.z);
}
}
-
+
+ @PowerNukkitOnly
public void addLevelEvent(int type, int data, float x, float y, float z) {
LevelEventPacket packet = new LevelEventPacket();
packet.evid = type;
@@ -558,7 +570,7 @@ public void addLevelEvent(int type, int data, float x, float y, float z) {
packet.y = y;
packet.z = z;
packet.data = data;
-
+
this.addChunkPacket(NukkitMath.floorFloat(x) >> 4, NukkitMath.floorFloat(z) >> 4, packet);
}
@@ -664,11 +676,11 @@ public void addParticle(Particle particle, Collection players) {
}
public void addParticleEffect(Vector3 pos, ParticleEffect particleEffect) {
- this.addParticleEffect(pos, particleEffect, -1, this.dimension, (Player[]) null);
+ this.addParticleEffect(pos, particleEffect, -1, this.getDimension(), (Player[]) null);
}
public void addParticleEffect(Vector3 pos, ParticleEffect particleEffect, long uniqueEntityId) {
- this.addParticleEffect(pos, particleEffect, uniqueEntityId, this.dimension, (Player[]) null);
+ this.addParticleEffect(pos, particleEffect, uniqueEntityId, this.getDimension(), (Player[]) null);
}
public void addParticleEffect(Vector3 pos, ParticleEffect particleEffect, long uniqueEntityId, int dimensionId) {
@@ -726,7 +738,7 @@ public boolean unload(boolean force) {
TextFormat.GREEN + this.getName() + TextFormat.WHITE));
Level defaultLevel = this.server.getDefaultLevel();
- for (Player player : new ArrayList<>(this.getPlayers().values())) {
+ for (Player player : this.getPlayers().values().toArray(Player.EMPTY_ARRAY)) {
if (this == defaultLevel || defaultLevel == null) {
player.close(player.getLeaveMessage(), "Forced default level unload");
} else {
@@ -843,7 +855,7 @@ public void sendTime(Player... players) {
}
public void sendTime() {
- sendTime(this.players.values().toArray(Player.EMPTY_ARRAY));
+ this.sendTime(this.players.values().toArray(Player.EMPTY_ARRAY));
}
public GameRules getGameRules() {
@@ -852,18 +864,18 @@ public GameRules getGameRules() {
public void doTick(int currentTick) {
this.timings.doTick.startTiming();
-
+
requireProvider();
updateBlockLight(lightQueue);
this.checkTime();
-
- if (currentTick % 1200 == 0) { // Send time to client every 60 seconds to make sure it stay in sync
+ if (currentTick >= nextTimeSendTick) { // Send time to client every 30 seconds to make sure it
this.sendTime();
+ nextTimeSendTick = currentTick + 30 * 20;
}
// Tick Weather
- if (this.dimension != DIMENSION_NETHER && this.dimension != DIMENSION_THE_END && gameRules.getBoolean(GameRule.DO_WEATHER_CYCLE)) {
+ if (this.getDimension() != DIMENSION_NETHER && this.getDimension() != DIMENSION_THE_END && gameRules.getBoolean(GameRule.DO_WEATHER_CYCLE)) {
this.rainTime--;
if (this.rainTime <= 0) {
if (!this.setRaining(!this.raining)) {
@@ -1347,7 +1359,7 @@ public void updateComparatorOutputLevelSelective(Vector3 v, boolean observer) {
if (this.isChunkLoaded((int) temporalVector.x >> 4, (int) temporalVector.z >> 4)) {
Block block1 = this.getBlock(temporalVector);
-
+
if (block1.getId() == BlockID.OBSERVER) {
if (observer) {
block1.onNeighborChange(face.getOpposite());
@@ -1363,11 +1375,11 @@ public void updateComparatorOutputLevelSelective(Vector3 v, boolean observer) {
}
}
}
-
+
if (!observer) {
return;
}
-
+
for (BlockFace face : Plane.VERTICAL) {
Block block1 = this.getBlock(temporalVector.setComponentsAdding(v, face));
@@ -1438,7 +1450,7 @@ public Set getPendingBlockUpdates(FullChunk chunk) {
public Set getPendingBlockUpdates(AxisAlignedBB boundingBox) {
return updateQueue.getPendingBlockUpdates(boundingBox);
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public List scanBlocks(@Nonnull AxisAlignedBB bb, @Nonnull BiPredicate condition) {
@@ -1457,15 +1469,17 @@ public List scanBlocks(@Nonnull AxisAlignedBB bb, @Nonnull BiPredicate block.getId() != 0);
}
-
+
+ @PowerNukkitOnly
public Block[] getCollisionBlocks(AxisAlignedBB bb, boolean targetFirst, boolean ignoreCollidesCheck, Predicate condition) {
int minX = NukkitMath.floorDouble(bb.getMinX());
int minY = NukkitMath.floorDouble(bb.getMinY());
@@ -1610,14 +1624,17 @@ public int calculateSkylightSubtracted(float tickDiff) {
return (int)(light * 11.0F);
}
+ @PowerNukkitOnly
public float getRainStrength(float tickDiff) {
return isRaining() ? 1 : 0; // TODO: real implementation
}
+ @PowerNukkitOnly
public float getThunderStrength(float tickDiff) {
return isThundering() ? 1 : 0; // TODO: real implementation
}
+ @PowerNukkitOnly
public float getCelestialAngle(float tickDiff) {
return calculateCelestialAngle(getTime(), tickDiff);
}
@@ -1651,6 +1668,7 @@ public int getFullBlock(int x, int y, int z) {
@Deprecated
@DeprecationDetails(reason ="The meta is limited to 32 bits", since = "1.3.0.0-PN")
+ @PowerNukkitOnly
public int getFullBlock(int x, int y, int z, int layer) {
return this.getChunk(x >> 4, z >> 4, false).getFullBlock(x & 0x0f, y & 0xff, z & 0x0f, layer);
}
@@ -1660,7 +1678,7 @@ public int getFullBlock(int x, int y, int z, int layer) {
public int getBlockRuntimeId(int x, int y, int z) {
return getBlockRuntimeId(x, y, z, 0);
}
-
+
@PowerNukkitOnly
@Since("1.3.0.0-PN")
public int getBlockRuntimeId(int x, int y, int z, int layer) {
@@ -1671,6 +1689,7 @@ public synchronized Block getBlock(Vector3 pos) {
return getBlock(pos, 0);
}
+ @PowerNukkitOnly
public synchronized Block getBlock(Vector3 pos, int layer) {
return this.getBlock(pos.getFloorX(), pos.getFloorY(), pos.getFloorZ(), layer);
}
@@ -1679,6 +1698,7 @@ public synchronized Block getBlock(Vector3 pos, boolean load) {
return getBlock(pos, 0, load);
}
+ @PowerNukkitOnly
public synchronized Block getBlock(Vector3 pos, int layer, boolean load) {
return this.getBlock(pos.getFloorX(), pos.getFloorY(), pos.getFloorZ(), layer, load);
}
@@ -1687,6 +1707,7 @@ public synchronized Block getBlock(int x, int y, int z) {
return getBlock(x, y, z, 0);
}
+ @PowerNukkitOnly
public synchronized Block getBlock(int x, int y, int z, int layer) {
return getBlock(x, y, z, layer, true);
}
@@ -1695,7 +1716,7 @@ public synchronized Block getBlock(int x, int y, int z, boolean load) {
return getBlock(x, y, z, 0, load);
}
- @PowerNukkitDifference(since = "1.4.0.0-PN", info = "Will automatically repair broken block states")
+ @PowerNukkitOnly
public synchronized Block getBlock(int x, int y, int z, int layer, boolean load) {
BlockState fullState;
if (y >= 0 && y < 256) {
@@ -1726,10 +1747,10 @@ public synchronized Block getBlock(int x, int y, int z, int layer, boolean load)
}
}
Block block = fullState.getBlockRepairing(this, x, y, z, layer);
- setBlock(x, y, z, layer, block, false, false); // Update set to false to fix PowerNukkit#650
+ setBlock(x, y, z, layer, block, false, false); // Update set to false to fix PowerNukkit#650
return block;
}
-
+
public void updateAllLight(Vector3 pos) {
this.updateBlockSkyLight((int) pos.x, (int) pos.y, (int) pos.z);
this.addLightUpdate((int) pos.x, (int) pos.y, (int) pos.z);
@@ -1749,7 +1770,7 @@ public void updateBlockSkyLight(int x, int y, int z) {
if (yPlusOne == oldHeightMap) { // Block changed directly beneath the heightmap. Check if a block was removed or changed to a different light-filter
newHeightMap = chunk.recalculateHeightMapColumn(x & 0x0f, z & 0x0f);
} else if (yPlusOne > oldHeightMap) { // Block changed above the heightmap
- if (Block.lightFilter[sourceId] > 1 || Block.diffusesSkyLight[sourceId]) {
+ if (Block.getLightFilter(sourceId) > 1 || Block.diffusesSkyLight(sourceId)) {
chunk.setHeightMap(x & 0xf, y & 0xf, yPlusOne);
newHeightMap = yPlusOne;
} else { // Block changed which has no effect on direct sky light, for example placing or removing glass.
@@ -1768,13 +1789,14 @@ public void updateBlockSkyLight(int x, int y, int z) {
setBlockSkyLightAt(x, i, z, 15);
}
} else { // No heightmap change, block changed "underground"
- setBlockSkyLightAt(x, y, z, Math.max(0, getHighestAdjacentBlockSkyLight(x, y, z) - Block.lightFilter[sourceId]));
+ setBlockSkyLightAt(x, y, z, Math.max(0, getHighestAdjacentBlockSkyLight(x, y, z) - Block.getLightFilter(sourceId)));
}
}
/**
* Returns the highest block skylight level available in the positions adjacent to the specified block coordinates.
*/
+ @PowerNukkitOnly
public int getHighestAdjacentBlockSkyLight(int x, int y, int z) {
int[] lightLevels = new int[] {
getBlockSkyLightAt(x + 1, y, z),
@@ -1872,7 +1894,7 @@ public void updateBlockLight(Map> map) {
int z = Hash.hashBlockZ(node);
int lightLevel = this.getBlockLightAt(x, y, z)
- - Block.lightFilter[this.getBlockIdAt(x, y, z)];
+ - Block.getLightFilter(this.getBlockIdAt(x, y, z));
if (lightLevel >= 1) {
this.computeSpreadBlockLight(x - 1, y, z, lightLevel, lightPropagationQueue, visited);
@@ -1943,6 +1965,7 @@ public synchronized void setBlockFullIdAt(int x, int y, int z, int fullId) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public synchronized void setBlockFullIdAt(int x, int y, int z, int layer, int fullId) {
setBlock(x, y, z, layer, Block.fullList[fullId], false, false);
@@ -1952,6 +1975,7 @@ public synchronized boolean setBlock(Vector3 pos, Block block) {
return setBlock(pos, 0, block);
}
+ @PowerNukkitOnly
public synchronized boolean setBlock(Vector3 pos, int layer, Block block) {
return this.setBlock(pos, layer, block, false);
}
@@ -1960,6 +1984,7 @@ public synchronized boolean setBlock(Vector3 pos, Block block, boolean direct) {
return this.setBlock(pos, 0, block, direct);
}
+ @PowerNukkitOnly
public synchronized boolean setBlock(Vector3 pos, int layer, Block block, boolean direct) {
return this.setBlock(pos, layer, block, direct, true);
}
@@ -1968,6 +1993,7 @@ public synchronized boolean setBlock(Vector3 pos, Block block, boolean direct, b
return setBlock(pos, 0, block, direct, update);
}
+ @PowerNukkitOnly
public synchronized boolean setBlock(Vector3 pos, int layer, Block block, boolean direct, boolean update) {
return setBlock(pos.getFloorX(), pos.getFloorY(), pos.getFloorZ(), layer, block, direct, update);
}
@@ -1976,6 +2002,7 @@ public synchronized boolean setBlock(int x, int y, int z, Block block, boolean d
return setBlock(x, y, z, 0, block, direct, update);
}
+ @PowerNukkitOnly
public synchronized boolean setBlock(int x, int y, int z, int layer, Block block, boolean direct, boolean update) {
if (y < 0 || y >= 256 || layer < 0 || layer > this.requireProvider().getMaximumLayer()) {
return false;
@@ -1991,9 +2018,9 @@ public synchronized boolean setBlock(int x, int y, int z, int layer, Block block
block.z = z;
block.level = this;
block.layer = layer;
-
+
Block blockPrevious = statePrevious.getBlockRepairing(this, x, y, z, layer);
-
+
int cx = x >> 4;
int cz = z >> 4;
long index = Level.chunkHash(cx, cz);
@@ -2172,7 +2199,8 @@ public Item useBreakOn(Vector3 vector, Item item, Player player, boolean createP
public Item useBreakOn(Vector3 vector, BlockFace face, Item item, Player player, boolean createParticles) {
return useBreakOn(vector, face, item, player, createParticles, false);
}
-
+
+ @PowerNukkitOnly
public Item useBreakOn(Vector3 vector, BlockFace face, Item item, Player player, boolean createParticles, boolean setBlockDestroy) {
if (vector instanceof Block) {
return useBreakOn(vector, ((Block) vector).layer, face, item, player, createParticles, setBlockDestroy);
@@ -2181,28 +2209,29 @@ public Item useBreakOn(Vector3 vector, BlockFace face, Item item, Player player,
}
}
+ @PowerNukkitOnly
public Item useBreakOn(Vector3 vector, int layer, BlockFace face, Item item, Player player, boolean createParticles, boolean setBlockDestroy) {
if (player != null && player.getGamemode() > 2) {
return null;
}
-
+
Block target = this.getBlock(vector, layer);
if (player != null && !target.isBlockChangeAllowed(player)) {
return null;
}
-
+
Item[] drops;
int dropExp = target.getDropExp();
if (item == null) {
item = new ItemBlock(Block.get(BlockID.AIR), 0, 0);
}
-
+
if (!target.isBreakable(vector, layer, face, item, player, setBlockDestroy)) {
return null;
}
-
+
boolean mustDrop = target.mustDrop(vector, layer, face, item, player);
boolean mustSilkTouch = target.mustSilkTouch(vector, layer, face, item, player);
boolean isSilkTouch = mustSilkTouch || item.getEnchantment(Enchantment.ID_SILK_TOUCH) != null;
@@ -2307,7 +2336,7 @@ public Item useBreakOn(Vector3 vector, int layer, BlockFace face, Item item, Pla
if (blockEntity != null) {
blockEntity.onBreak(isSilkTouch);
blockEntity.close();
-
+
this.updateComparatorOutputLevel(target);
}
}
@@ -2323,7 +2352,7 @@ public Item useBreakOn(Vector3 vector, int layer, BlockFace face, Item item, Pla
}
if (this.gameRules.getBoolean(GameRule.DO_TILE_DROPS)) {
-
+
if (!isSilkTouch && (mustDrop || player != null && (player.isSurvival() || setBlockDestroy)) && dropExp > 0 && drops.length != 0) {
this.dropExpOrb(vector.add(0.5, 0.5, 0.5), dropExp);
}
@@ -2363,7 +2392,7 @@ public List dropExpOrbAndGetEntities(Vector3 source, int exp) {
public List dropExpOrbAndGetEntities(Vector3 source, int exp, Vector3 motion) {
return dropExpOrbAndGetEntities(source, exp, motion, 10);
}
-
+
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public List dropExpOrbAndGetEntities(Vector3 source, int exp, Vector3 motion, int delay) {
@@ -2488,7 +2517,7 @@ public Item useItemOn(Vector3 vector, Item item, BlockFace face, float fx, float
Entity[] entities = this.getCollidingEntities(hand.getBoundingBox());
int realCount = 0;
for (Entity e : entities) {
- if (e instanceof EntityArrow
+ if (e instanceof EntityArrow
|| e instanceof EntityItem
|| (e instanceof Player && ((Player) e).isSpectator())
|| player == e
@@ -2517,7 +2546,7 @@ public Item useItemOn(Vector3 vector, Item item, BlockFace face, float fx, float
if (!block.isBlockChangeAllowed(player)) {
return null;
}
-
+
BlockPlaceEvent event = new BlockPlaceEvent(player, hand, block, target, item);
if (player.getGamemode() == 2) {
Tag tag = item.getNamedTagEntry("CanPlaceOn");
@@ -2712,6 +2741,7 @@ public BlockEntity getBlockEntity(Vector3 pos) {
return getBlockEntity(pos.asBlockVector3());
}
+ @PowerNukkitOnly
public BlockEntity getBlockEntity(BlockVector3 pos) {
FullChunk chunk = this.getChunk(pos.x >> 4, pos.z >> 4, false);
@@ -2746,6 +2776,7 @@ public Map getChunkBlockEntities(int X, int Z) {
return (chunk = this.getChunk(X, Z)) != null ? chunk.getBlockEntities() : Collections.emptyMap();
}
+ @PowerNukkitOnly
@Override
public BlockState getBlockStateAt(int x, int y, int z, int layer) {
return getChunk(x >> 4, z >> 4, true).getBlockStateAt(x & 0x0f, y & 0xff, z & 0x0f, layer);
@@ -2756,6 +2787,7 @@ public int getBlockIdAt(int x, int y, int z) {
return getBlockIdAt(x, y, z, 0);
}
+ @PowerNukkitOnly
@Override
public synchronized int getBlockIdAt(int x, int y, int z, int layer) {
return this.getChunk(x >> 4, z >> 4, true).getBlockId(x & 0x0f, y & 0xff, z & 0x0f, layer);
@@ -2766,6 +2798,7 @@ public void setBlockIdAt(int x, int y, int z, int id) {
setBlockIdAt(x, y, z, 0, id);
}
+ @PowerNukkitOnly
@Override
public synchronized void setBlockIdAt(int x, int y, int z, int layer, int id) {
this.getChunk(x >> 4, z >> 4, true).setBlockId(x & 0x0f, y & 0xff, z & 0x0f, layer, id & 0xfff);
@@ -2785,11 +2818,13 @@ public synchronized void setBlockAt(int x, int y, int z, int id, int data) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public synchronized boolean setBlockAtLayer(int x, int y, int z, int layer, int id, int data) {
return setBlockStateAt(x, y, z, layer, BlockState.of(id, data));
}
-
+
+ @Override
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public synchronized boolean setBlockStateAt(int x, int y, int z, int layer, BlockState state) {
@@ -2822,6 +2857,7 @@ public synchronized void setBlockExtraDataAt(int x, int y, int z, int id, int da
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public synchronized int getBlockDataAt(int x, int y, int z, int layer) {
return this.getChunk(x >> 4, z >> 4, true).getBlockData(x & 0x0f, y & 0xff, z & 0x0f, layer);
@@ -2836,6 +2872,7 @@ public void setBlockDataAt(int x, int y, int z, int data) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public synchronized void setBlockDataAt(int x, int y, int z, int layer, int data) {
this.getChunk(x >> 4, z >> 4, true).setBlockData(x & 0x0f, y & 0xff, z & 0x0f, layer, data);
@@ -3055,6 +3092,7 @@ public Position getSpawnLocation() {
return Position.fromObject(this.requireProvider().getSpawn(), this);
}
+ @PowerNukkitOnly
public Position getFuzzySpawnLocation() {
Position spawn = getSpawnLocation();
int radius = gameRules.getInteger(GameRule.SPAWN_RADIUS);
@@ -3249,7 +3287,7 @@ private synchronized BaseFullChunk forceLoadChunk(long index, int x, int z, bool
this.timings.syncChunkLoadTimer.stopTiming();
return chunk;
}
-
+
chunk.backwardCompatibilityUpdate(this);
chunk.initChunk();
@@ -3718,6 +3756,10 @@ public void addPlayerMovement(Entity entity, double x, double y, double z, doubl
pk.yaw = (float) yaw;
pk.headYaw = (float) headYaw;
pk.pitch = (float) pitch;
+ if (entity.riding != null) {
+ pk.ridingEid = entity.riding.getId();
+ pk.mode = MovePlayerPacket.MODE_PITCH;
+ }
Server.broadcastPacket(entity.getViewers().values(), pk);
}
@@ -3858,8 +3900,13 @@ public void sendWeather(Collection players) {
this.sendWeather(players.toArray(Player.EMPTY_ARRAY));
}
+ @Since("1.6.0.0-PN")
+ public DimensionData getDimensionData() {
+ return this.dimensionData;
+ }
+
public int getDimension() {
- return dimension;
+ return this.dimensionData.getDimensionId();
}
public boolean canBlockSeeSky(Vector3 pos) {
@@ -3989,6 +4036,7 @@ public int getUpdateLCG() {
@PowerNukkitDifference(info = "Using new method to play sounds", since = "1.4.0.0-PN")
public boolean createPortal(Block target) {
+ if (this.getDimension() == DIMENSION_THE_END) return false;
int maxPortalSize = 23;
final int targX = target.getFloorX();
final int targY = target.getFloorY();
@@ -4209,7 +4257,7 @@ public boolean createPortal(Block target) {
public String toString() {
return "Level{" +
"folderName='" + folderName + '\'' +
- ", dimension=" + dimension +
+ ", dimension=" + getDimension() +
'}';
}
@@ -4220,7 +4268,7 @@ private static class QueuedUpdate {
private Block block;
private BlockFace neighbor;
}
-
+
// private static void orderGetRidings(Entity entity, LongSet set) {
// if (entity.riding != null) {
// if(!set.add(entity.riding.getId())) {
diff --git a/src/main/java/cn/nukkit/level/ListChunkManager.java b/src/main/java/cn/nukkit/level/ListChunkManager.java
index db947f3c785..92bba16f253 100644
--- a/src/main/java/cn/nukkit/level/ListChunkManager.java
+++ b/src/main/java/cn/nukkit/level/ListChunkManager.java
@@ -35,7 +35,8 @@ private Optional findBlockAt(int x, int y, int z, int layer) {
&& block.layer == layer
).findAny();
}
-
+
+ @PowerNukkitOnly
@Override
public int getBlockIdAt(int x, int y, int z, int layer) {
return findBlockAt(x, y, z, layer).map(Block::getId).orElseGet(() -> this.parent.getBlockIdAt(x, y, z, layer));
@@ -46,6 +47,7 @@ public void setBlockFullIdAt(int x, int y, int z, int fullId) {
setBlockFullIdAt(x, y, z, 0, fullId);
}
+ @PowerNukkitOnly
@Override
public void setBlockFullIdAt(int x, int y, int z, int layer, int fullId) {
this.blocks.removeIf(block -> block.getFloorX() == x && block.getFloorY() == y && block.getFloorZ() == z && block.layer == layer);
@@ -57,6 +59,7 @@ public void setBlockIdAt(int x, int y, int z, int id) {
setBlockIdAt(x, y, z, 0, id);
}
+ @PowerNukkitOnly
@Override
public void setBlockIdAt(int x, int y, int z, int layer, int id) {
Optional optionalBlock = this.blocks.stream().filter(block -> block.getFloorX() == x && block.getFloorY() == y && block.getFloorZ() == z && block.layer == layer).findAny();
@@ -71,6 +74,7 @@ public void setBlockAt(int x, int y, int z, int id, int data) {
this.blocks.add(Block.get(id, data, new Position(x, y, z), 0));
}
+ @PowerNukkitOnly
@Override
public boolean setBlockAtLayer(int x, int y, int z, int layer, int id, int data) {
boolean removed = this.blocks.removeIf(block -> block.getFloorX() == x && block.getFloorY() == y && block.getFloorZ() == z && block.layer == layer);
@@ -99,6 +103,7 @@ public int getBlockDataAt(int x, int y, int z) {
return getBlockIdAt(x, y, z, 0);
}
+ @PowerNukkitOnly
@Override
public int getBlockDataAt(int x, int y, int z, int layer) {
Optional optionalBlock = this.blocks.stream().filter(block -> block.getFloorX() == x && block.getFloorY() == y && block.getFloorZ() == z && block.layer == layer).findAny();
@@ -109,7 +114,8 @@ public int getBlockDataAt(int x, int y, int z, int layer) {
public void setBlockDataAt(int x, int y, int z, int data) {
setBlockIdAt(x, y, z, 0, data);
}
-
+
+ @PowerNukkitOnly
@Override
public void setBlockDataAt(int x, int y, int z, int layer, int data) {
Optional optionalBlock = this.blocks.stream().filter(block -> block.getFloorX() == x && block.getFloorY() == y && block.getFloorZ() == z && block.layer == layer).findAny();
diff --git a/src/main/java/cn/nukkit/level/Location.java b/src/main/java/cn/nukkit/level/Location.java
index 76b599e62cd..6b7ef3a87cd 100644
--- a/src/main/java/cn/nukkit/level/Location.java
+++ b/src/main/java/cn/nukkit/level/Location.java
@@ -1,5 +1,7 @@
package cn.nukkit.level;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.math.Vector3;
import cn.nukkit.utils.LevelException;
@@ -12,6 +14,7 @@ public class Location extends Position {
public double yaw;
public double pitch;
+ @Since("1.6.0.0-PN") public double headYaw;
public Location() {
this(0);
@@ -25,14 +28,14 @@ public Location(double x, double y) {
this(x, y, 0);
}
- public Location(double x, double y, double z, Level level) {
- this(x, y, z, 0, 0, level);
- }
-
public Location(double x, double y, double z) {
this(x, y, z, 0);
}
+ public Location(double x, double y, double z, Level level) {
+ this(x, y, z, 0, 0, level);
+ }
+
public Location(double x, double y, double z, double yaw) {
this(x, y, z, yaw, 0);
}
@@ -42,11 +45,22 @@ public Location(double x, double y, double z, double yaw, double pitch) {
}
public Location(double x, double y, double z, double yaw, double pitch, Level level) {
+ this(x, y, z, yaw, pitch, 0, level);
+ }
+
+ @Since("1.6.0.0-PN")
+ public Location(double x, double y, double z, double yaw, double pitch, double headYaw) {
+ this(x, y, z, yaw, pitch, headYaw, null);
+ }
+
+ @Since("1.6.0.0-PN")
+ public Location(double x, double y, double z, double yaw, double pitch, double headYaw, Level level) {
this.x = x;
this.y = y;
this.z = z;
this.yaw = yaw;
this.pitch = pitch;
+ this.headYaw = headYaw;
this.level = level;
}
@@ -66,6 +80,14 @@ public static Location fromObject(Vector3 pos, Level level, double yaw, double p
return new Location(pos.x, pos.y, pos.z, yaw, pitch, (level == null) ? ((pos instanceof Position) ? ((Position) pos).level : null) : level);
}
+ @Since("1.6.0.0-PN")
+ public static Location fromObject(Vector3 pos, Level level, double yaw, double pitch, double headYaw) {
+ if (level == null && pos instanceof Position) {
+ level = ((Position) pos).level;
+ }
+ return new Location(pos.x, pos.y, pos.z, yaw, pitch, headYaw, level);
+ }
+
public double getYaw() {
return this.yaw;
}
@@ -74,11 +96,18 @@ public double getPitch() {
return this.pitch;
}
+ @Since("1.6.0.0-PN")
+ public double getHeadYaw() {
+ return this.headYaw;
+ }
+
+ @PowerNukkitOnly
public Location setYaw(double yaw) {
this.yaw = yaw;
return this;
}
+ @PowerNukkitOnly
public Location setPitch(double pitch) {
this.pitch = pitch;
return this;
@@ -86,13 +115,13 @@ public Location setPitch(double pitch) {
@Override
public String toString() {
- return "Location (level=" + (this.isValid() ? this.getLevel().getName() : "null") + ", x=" + this.x + ", y=" + this.y + ", z=" + this.z + ", yaw=" + this.yaw + ", pitch=" + this.pitch + ")";
+ return "Location (level=" + (this.isValid() ? this.getLevel().getName() : "null") + ", x=" + this.x + ", y=" + this.y + ", z=" + this.z + ", yaw=" + this.yaw + ", pitch=" + this.pitch + ", headYaw=" + this.headYaw + ")";
}
@Nonnull
@Override
public Location getLocation() {
- if (this.isValid()) return new Location(this.x, this.y, this.z, this.yaw, this.pitch, this.level);
+ if (this.isValid()) return new Location(this.x, this.y, this.z, this.yaw, this.pitch, this.headYaw, this.level);
else throw new LevelException("Undefined Level reference");
}
@@ -108,12 +137,12 @@ public Location add(double x, double y) {
@Override
public Location add(double x, double y, double z) {
- return new Location(this.x + x, this.y + y, this.z + z, this.yaw, this.pitch, this.level);
+ return new Location(this.x + x, this.y + y, this.z + z, this.yaw, this.pitch, this.headYaw, this.level);
}
@Override
public Location add(Vector3 x) {
- return new Location(this.x + x.getX(), this.y + x.getY(), this.z + x.getZ(), this.yaw, this.pitch, this.level);
+ return new Location(this.x + x.getX(), this.y + x.getY(), this.z + x.getZ(), this.yaw, this.pitch, this.headYaw, this.level);
}
@Override
@@ -143,32 +172,32 @@ public Location subtract(Vector3 x) {
@Override
public Location multiply(double number) {
- return new Location(this.x * number, this.y * number, this.z * number, this.yaw, this.pitch, this.level);
+ return new Location(this.x * number, this.y * number, this.z * number, this.yaw, this.pitch, this.headYaw, this.level);
}
@Override
public Location divide(double number) {
- return new Location(this.x / number, this.y / number, this.z / number, this.yaw, this.pitch, this.level);
+ return new Location(this.x / number, this.y / number, this.z / number, this.yaw, this.pitch, this.headYaw, this.level);
}
@Override
public Location ceil() {
- return new Location((int) Math.ceil(this.x), (int) Math.ceil(this.y), (int) Math.ceil(this.z), this.yaw, this.pitch, this.level);
+ return new Location((int) Math.ceil(this.x), (int) Math.ceil(this.y), (int) Math.ceil(this.z), this.yaw, this.pitch, this.headYaw, this.level);
}
@Override
public Location floor() {
- return new Location(this.getFloorX(), this.getFloorY(), this.getFloorZ(), this.yaw, this.pitch, this.level);
+ return new Location(this.getFloorX(), this.getFloorY(), this.getFloorZ(), this.yaw, this.pitch, this.headYaw, this.level);
}
@Override
public Location round() {
- return new Location(Math.round(this.x), Math.round(this.y), Math.round(this.z), this.yaw, this.pitch, this.level);
+ return new Location(Math.round(this.x), Math.round(this.y), Math.round(this.z), this.yaw, this.pitch, this.headYaw, this.level);
}
@Override
public Location abs() {
- return new Location((int) Math.abs(this.x), (int) Math.abs(this.y), (int) Math.abs(this.z), this.yaw, this.pitch, this.level);
+ return new Location((int) Math.abs(this.x), (int) Math.abs(this.y), (int) Math.abs(this.z), this.yaw, this.pitch, this.headYaw, this.level);
}
public Vector3 getDirectionVector() {
diff --git a/src/main/java/cn/nukkit/level/ParticleEffect.java b/src/main/java/cn/nukkit/level/ParticleEffect.java
index b9a9c539dfe..dfdabca9cf7 100644
--- a/src/main/java/cn/nukkit/level/ParticleEffect.java
+++ b/src/main/java/cn/nukkit/level/ParticleEffect.java
@@ -23,6 +23,7 @@ public enum ParticleEffect {
CAMERA_SHOOT_EXPLOSION("minecraft:camera_shoot_explosion"),
CAMPFIRE_SMOKE("minecraft:campfire_smoke_particle"),
CAMPFIRE_SMOKE_TALL("minecraft:campfire_tall_smoke_particle"),
+ @Since("1.6.0.0-PN") CANDLE_FLAME("minecraft:candle_flame_particle"),
CAULDRONSPELL("minecraft:cauldron_spell_emitter"),
CAULDRON_BUBBLE("minecraft:cauldron_bubble_particle"),
CAULDRON_SPLASH("minecraft:cauldron_splash_particle"),
@@ -32,6 +33,7 @@ public enum ParticleEffect {
CONDUIT_ATTACK("minecraft:conduit_attack_emitter"),
CRITICAL_HIT("minecraft:critical_hit_emitter"),
@Since("1.3.0.0-PN") CROP_GROWTH("minecraft:crop_growth_emitter"),
+ @Since("1.6.0.0-PN") CROP_GROWTH_AREA("minecraft:crop_growth_area_emitter"),
DOLPHIN_MOVE("minecraft:dolphin_move_particle"),
DRAGON_BREATH_FIRE("minecraft:dragon_breath_fire"),
DRAGON_BREATH_LINGERING("minecraft:dragon_breath_lingering"),
@@ -39,6 +41,9 @@ public enum ParticleEffect {
DRAGON_DEATH_EXPLOSION("minecraft:dragon_death_explosion_emitter"),
DRAGON_DESTROY_BLOCK("minecraft:dragon_destroy_block"),
DRAGON_DYING_EXPLOSION("minecraft:dragon_dying_explosion"),
+ @Since("1.6.0.0-PN") DRIPSTONE_LAVA_DRIP("minecraft:stalactite_lava_drip_particle"),
+ @Since("1.6.0.0-PN") DRIPSTONE_WATER_DRIP("minecraft:stalactite_water_drip_particle"),
+ @Since("1.6.0.0-PN") ELECTRIC_SPARK("minecraft:electric_spark_particle"),
ENCHANTING_TABLE_PARTICLE("minecraft:enchanting_table_particle"),
ENDROD("minecraft:endrod"),
END_CHEST("minecraft:end_chest"),
@@ -64,6 +69,7 @@ public enum ParticleEffect {
FALLING_DUST_TOP_SNOW("minecraft:falling_dust_top_snow_particle"),
FISH_HOOK("minecraft:fish_hook_particle"),
FISH_POS("minecraft:fish_pos_particle"),
+ @Since("1.6.0.0-PN") GLOW("minecraft:glow_particle"),
GUARDIAN_ATTACK("minecraft:guardian_attack_particle"),
GUARDIAN_WATER_MOVE("minecraft:guardian_water_move_particle"),
HEART("minecraft:heart_particle"),
@@ -103,10 +109,13 @@ public enum ParticleEffect {
RISING_BORDER_DUST("minecraft:rising_border_dust_particle"),
SHULKER_BULLET("minecraft:shulker_bullet"),
SILVERFISH_GRIEF("minecraft:silverfish_grief_emitter"),
+ @Since("1.6.0.0-PN") SNOWFLAKE("minecraft:snowflake_particle"),
@Since("1.3.0.0-PN") SOUL("minecraft:soul_particle"),
SPARKLER("minecraft:sparkler_emitter"),
SPLASHPOTIONSPELL("minecraft:splash_spell_emitter"),
SPONGE_ABSORB_BUBBLE("minecraft:sponge_absorb_water_particle"),
+ @Since("1.6.0.0-PN") SPORE_BLOSSOM_AMBIENT_BLOCK_ACTOR("minecraft:spore_blossom_ambient_particle"),
+ @Since("1.6.0.0-PN") SPORE_BLOSSOM_SHOWER("minecraft:spore_blossom_shower_particle"),
SQUID_FLEE("minecraft:squid_flee_particle"),
SQUID_INK_BUBBLE("minecraft:squid_ink_bubble"),
SQUID_MOVE("minecraft:squid_move_particle"),
@@ -123,6 +132,7 @@ public enum ParticleEffect {
WATER_SPASH_MANUAL("minecraft:water_splash_particle_manual"),
WATER_SPLASH("minecraft:water_splash_particle"),
WATER_WAKE("minecraft:water_wake_particle"),
+ @Since("1.6.0.0-PN") WAX("minecraft:wax_particle"),
WITHER_BOSS_INVULNERABLE("minecraft:wither_boss_invulnerable");
private final String identifier;
diff --git a/src/main/java/cn/nukkit/level/Position.java b/src/main/java/cn/nukkit/level/Position.java
index a51d9a0218b..e87b8730b3b 100644
--- a/src/main/java/cn/nukkit/level/Position.java
+++ b/src/main/java/cn/nukkit/level/Position.java
@@ -74,10 +74,12 @@ public boolean setWeak() {
return false;
}
+ @Override
public Position getSide(BlockFace face) {
return this.getSide(face, 1);
}
+ @Override
public Position getSide(BlockFace face, int step) {
return Position.fromObject(super.getSide(face, step), getValidLevel());
}
@@ -136,6 +138,7 @@ public Block getLevelBlock() {
return getValidLevel().getBlock(this);
}
+ @PowerNukkitOnly
public Block getLevelBlockAtLayer(int layer) {
return getValidLevel().getBlock(this, layer);
}
diff --git a/src/main/java/cn/nukkit/level/Sound.java b/src/main/java/cn/nukkit/level/Sound.java
index 228ede388aa..a5ba990e452 100644
--- a/src/main/java/cn/nukkit/level/Sound.java
+++ b/src/main/java/cn/nukkit/level/Sound.java
@@ -1,7 +1,5 @@
package cn.nukkit.level;
-import cn.nukkit.api.DeprecationDetails;
-import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
/**
@@ -11,6 +9,7 @@ public enum Sound {
@Since("1.4.0.0-PN") AMBIENT_BASALT_DELTAS_ADDITIONS("ambient.basalt_deltas.additions"),
@Since("1.4.0.0-PN") AMBIENT_BASALT_DELTAS_LOOP("ambient.basalt_deltas.loop"),
AMBIENT_BASALT_DELTAS_MOOD("ambient.basalt_deltas.mood"),
+ @Since("1.6.0.0-PN") AMBIENT_CANDLE("ambient.candle"),
AMBIENT_CAVE("ambient.cave"),
@Since("1.4.0.0-PN") AMBIENT_CRIMSON_FOREST_ADDITIONS("ambient.crimson_forest.additions"),
@Since("1.4.0.0-PN") AMBIENT_CRIMSON_FOREST_LOOP("ambient.crimson_forest.loop"),
@@ -54,10 +53,12 @@ public enum Sound {
BLOCK_BEEHIVE_WORK("block.beehive.work"),
BLOCK_BELL_HIT("block.bell.hit"),
BLOCK_BLASTFURNACE_FIRE_CRACKLE("block.blastfurnace.fire_crackle"),
+ @Since("1.6.0.0-PN") BLOCK_BOWHIT("block.bowhit"),
BLOCK_CAMPFIRE_CRACKLE("block.campfire.crackle"),
BLOCK_CARTOGRAPHY_TABLE_USE("block.cartography_table.use"),
BLOCK_CHORUSFLOWER_DEATH("block.chorusflower.death"),
BLOCK_CHORUSFLOWER_GROW("block.chorusflower.grow"),
+ @Since("1.6.0.0-PN") BLOCK_CLICK("block.click"),
BLOCK_COMPOSTER_EMPTY("block.composter.empty"),
BLOCK_COMPOSTER_FILL("block.composter.fill"),
BLOCK_COMPOSTER_FILL_SUCCESS("block.composter.fill_success"),
@@ -94,6 +95,20 @@ public enum Sound {
BLOCK_TURTLE_EGG_CRACK("block.turtle_egg.crack"),
BLOCK_TURTLE_EGG_DROP("block.turtle_egg.drop"),
BOTTLE_DRAGONBREATH("bottle.dragonbreath"),
+ @Since("1.6.0.0-PN") BREAK_AMETHYST_BLOCK("break.amethyst_block"),
+ @Since("1.6.0.0-PN") BREAK_AMETHYST_CLUSTER("break.amethyst_cluster"),
+ @Since("1.6.0.0-PN") BREAK_AZALEA("break.azalea"),
+ @Since("1.6.0.0-PN") BREAK_BIG_DRIPLEAF("break.big_dripleaf"),
+ @Since("1.6.0.0-PN") BREAK_CALCITE("break.calcite"),
+ @Since("1.6.0.0-PN") BREAK_DIRT_WITH_ROOTS("break.dirt_with_roots"),
+ @Since("1.6.0.0-PN") BREAK_DRIPSTONE_BLOCK("break.dripstone_block"),
+ @Since("1.6.0.0-PN") BREAK_HANGING_ROOTS("break.hanging_roots"),
+ @Since("1.6.0.0-PN") BREAK_LARGE_AMETHYST_BUD("break.large_amethyst_bud"),
+ @Since("1.6.0.0-PN") BREAK_MEDIUM_AMETHYST_BUD("break.medium_amethyst_bud"),
+ @Since("1.6.0.0-PN") BREAK_POINTED_DRIPSTONE("break.pointed_dripstone"),
+ @Since("1.6.0.0-PN") BREAK_SMALL_AMETHYST_BUD("break.small_amethyst_bud"),
+ @Since("1.6.0.0-PN") BREAK_SPORE_BLOSSOM("break.spore_blossom"),
+ @Since("1.6.0.0-PN") BREAK_TUFF("break.tuff"),
BUBBLE_DOWN("bubble.down"),
BUBBLE_DOWNINSIDE("bubble.downinside"),
BUBBLE_POP("bubble.pop"),
@@ -101,10 +116,13 @@ public enum Sound {
BUBBLE_UPINSIDE("bubble.upinside"),
BUCKET_EMPTY_FISH("bucket.empty_fish"),
BUCKET_EMPTY_LAVA("bucket.empty_lava"),
+ @Since("1.6.0.0-PN") BUCKET_EMPTY_POWDER_SNOW("bucket.empty_powder_snow"),
BUCKET_EMPTY_WATER("bucket.empty_water"),
BUCKET_FILL_FISH("bucket.fill_fish"),
BUCKET_FILL_LAVA("bucket.fill_lava"),
+ @Since("1.6.0.0-PN") BUCKET_FILL_POWDER_SNOW("bucket.fill_powder_snow"),
BUCKET_FILL_WATER("bucket.fill_water"),
+ @Since("1.6.0.0-PN") CAKE_ADD_CANDLE("cake.add_candle"),
CAMERA_TAKE_PICTURE("camera.take_picture"),
CAULDRON_ADDDYE("cauldron.adddye"),
CAULDRON_CLEANARMOR("cauldron.cleanarmor"),
@@ -115,11 +133,17 @@ public enum Sound {
CAULDRON_FILLWATER("cauldron.fillwater"),
CAULDRON_TAKEPOTION("cauldron.takepotion"),
CAULDRON_TAKEWATER("cauldron.takewater"),
+ @Since("1.6.0.0-PN") CAULDRON_DRIP_LAVA_POINTED_DRIPSTONE("cauldron_drip.lava.pointed_dripstone"),
+ @Since("1.6.0.0-PN") CAULDRON_DRIP_WATER_POINTED_DRIPSTONE("cauldron_drip.water.pointed_dripstone"),
+ @Since("1.6.0.0-PN") CHIME_AMETHYST_BLOCK("chime.amethyst_block"),
+ @Since("1.6.0.0-PN") COMPONENT_JUMP_TO_BLOCK("component.jump_to_block"),
CONDUIT_ACTIVATE("conduit.activate"),
CONDUIT_AMBIENT("conduit.ambient"),
CONDUIT_ATTACK("conduit.attack"),
CONDUIT_DEACTIVATE("conduit.deactivate"),
CONDUIT_SHORT("conduit.short"),
+ @Since("1.6.0.0-PN") COPPER_WAX_OFF("copper.wax.off"),
+ @Since("1.6.0.0-PN") COPPER_WAX_ON("copper.wax.on"),
CROSSBOW_LOADING_END("crossbow.loading.end"),
CROSSBOW_LOADING_MIDDLE("crossbow.loading.middle"),
CROSSBOW_LOADING_START("crossbow.loading.start"),
@@ -130,16 +154,23 @@ public enum Sound {
DAMAGE_FALLBIG("damage.fallbig"),
DAMAGE_FALLSMALL("damage.fallsmall"),
DIG_ANCIENT_DEBRIS("dig.ancient_debris"),
+ @Since("1.6.0.0-PN") DIG_AZALEA_LEAVES("dig.azalea_leaves"),
DIG_BASALT("dig.basalt"),
DIG_BONE_BLOCK("dig.bone_block"),
+ @Since("1.6.0.0-PN") DIG_CANDLE("dig.candle"),
+ @Since("1.6.0.0-PN") DIG_CAVE_VINES("dig.cave_vines"),
DIG_CHAIN("dig.chain"),
DIG_CLOTH("dig.cloth"),
+ @Since("1.6.0.0-PN") DIG_COPPER("dig.copper"),
DIG_CORAL("dig.coral"),
+ @Since("1.6.0.0-PN") DIG_DEEPSLATE("dig.deepslate"),
+ @Since("1.6.0.0-PN") DIG_DEEPSLATE_BRICKS("dig.deepslate_bricks"),
DIG_FUNGUS("dig.fungus"),
DIG_GRASS("dig.grass"),
DIG_GRAVEL("dig.gravel"),
DIG_HONEY_BLOCK("dig.honey_block"),
DIG_LODESTONE("dig.lodestone"),
+ @Since("1.6.0.0-PN") DIG_MOSS("dig.moss"),
DIG_NETHER_BRICK("dig.nether_brick"),
DIG_NETHER_GOLD_ORE("dig.nether_gold_ore"),
DIG_NETHER_SPROUTS("dig.nether_sprouts"),
@@ -147,6 +178,7 @@ public enum Sound {
DIG_NETHERITE("dig.netherite"),
DIG_NETHERRACK("dig.netherrack"),
DIG_NYLIUM("dig.nylium"),
+ @Since("1.6.0.0-PN") DIG_POWDER_SNOW("dig.powder_snow"),
DIG_ROOTS("dig.roots"),
DIG_SAND("dig.sand"),
DIG_SHROOMLIGHT("dig.shroomlight"),
@@ -157,19 +189,36 @@ public enum Sound {
DIG_STONE("dig.stone"),
DIG_VINES("dig.vines"),
DIG_WOOD("dig.wood"),
+ @Since("1.6.0.0-PN") DRIP_LAVA_POINTED_DRIPSTONE("drip.lava.pointed_dripstone"),
+ @Since("1.6.0.0-PN") DRIP_WATER_POINTED_DRIPSTONE("drip.water.pointed_dripstone"),
ELYTRA_LOOP("elytra.loop"),
ENTITY_ZOMBIE_CONVERTED_TO_DROWNED("entity.zombie.converted_to_drowned"),
+ @Since("1.6.0.0-PN") EXTINGUISH_CANDLE("extinguish.candle"),
+ @Since("1.6.0.0-PN") FALL_AMETHYST_BLOCK("fall.amethyst_block"),
+ @Since("1.6.0.0-PN") FALL_AMETHYST_CLUSTER("fall.amethyst_cluster"),
FALL_ANCIENT_DEBRIS("fall.ancient_debris"),
+ @Since("1.6.0.0-PN") FALL_AZALEA("fall.azalea"),
+ @Since("1.6.0.0-PN") FALL_AZALEA_LEAVES("fall.azalea_leaves"),
FALL_BASALT("fall.basalt"),
+ @Since("1.6.0.0-PN") FALL_BIG_DRIPLEAF("fall.big_dripleaf"),
FALL_BONE_BLOCK("fall.bone_block"),
+ @Since("1.6.0.0-PN") FALL_CALCITE("fall.calcite"),
+ @Since("1.6.0.0-PN") FALL_CAVE_VINES("fall.cave_vines"),
FALL_CHAIN("fall.chain"),
FALL_CLOTH("fall.cloth"),
+ @Since("1.6.0.0-PN") FALL_COPPER("fall.copper"),
FALL_CORAL("fall.coral"),
+ @Since("1.6.0.0-PN") FALL_DEEPSLATE("fall.deepslate"),
+ @Since("1.6.0.0-PN") FALL_DEEPSLATE_BRICKS("fall.deepslate_bricks"),
+ @Since("1.6.0.0-PN") FALL_DIRT_WITH_ROOTS("fall.dirt_with_roots"),
+ @Since("1.6.0.0-PN") FALL_DRIPSTONE_BLOCK("fall.dripstone_block"),
FALL_EGG("fall.egg"),
FALL_GRASS("fall.grass"),
FALL_GRAVEL("fall.gravel"),
+ @Since("1.6.0.0-PN") FALL_HANGING_ROOTS("fall.hanging_roots"),
FALL_HONEY_BLOCK("fall.honey_block"),
FALL_LADDER("fall.ladder"),
+ @Since("1.6.0.0-PN") FALL_MOSS("fall.moss"),
FALL_NETHER_BRICK("fall.nether_brick"),
FALL_NETHER_GOLD_ORE("fall.nether_gold_ore"),
FALL_NETHER_SPROUTS("fall.nether_sprouts"),
@@ -177,6 +226,8 @@ public enum Sound {
FALL_NETHERITE("fall.netherite"),
FALL_NETHERRACK("fall.netherrack"),
FALL_NYLIUM("fall.nylium"),
+ @Since("1.6.0.0-PN") FALL_POINTED_DRIPSTONE("fall.pointed_dripstone"),
+ @Since("1.6.0.0-PN") FALL_POWDER_SNOW("fall.powder_snow"),
FALL_ROOTS("fall.roots"),
FALL_SAND("fall.sand"),
FALL_SHROOMLIGHT("fall.shroomlight"),
@@ -184,8 +235,10 @@ public enum Sound {
FALL_SNOW("fall.snow"),
FALL_SOUL_SAND("fall.soul_sand"),
FALL_SOUL_SOIL("fall.soul_soil"),
+ @Since("1.6.0.0-PN") FALL_SPORE_BLOSSOM("fall.spore_blossom"),
FALL_STEM("fall.stem"),
FALL_STONE("fall.stone"),
+ @Since("1.6.0.0-PN") FALL_TUFF("fall.tuff"),
FALL_VINES("fall.vines"),
FALL_WOOD("fall.wood"),
FIRE_FIRE("fire.fire"),
@@ -199,17 +252,32 @@ public enum Sound {
GAME_PLAYER_ATTACK_STRONG("game.player.attack.strong"),
GAME_PLAYER_DIE("game.player.die"),
GAME_PLAYER_HURT("game.player.hurt"),
+ @Since("1.6.0.0-PN") HIT_AMETHYST_BLOCK("hit.amethyst_block"),
+ @Since("1.6.0.0-PN") HIT_AMETHYST_CLUSTER("hit.amethyst_cluster"),
HIT_ANCIENT_DEBRIS("hit.ancient_debris"),
HIT_ANVIL("hit.anvil"),
+ @Since("1.6.0.0-PN") HIT_AZALEA("hit.azalea"),
+ @Since("1.6.0.0-PN") HIT_AZALEA_LEAVES("hit.azalea_leaves"),
HIT_BASALT("hit.basalt"),
+ @Since("1.6.0.0-PN") HIT_BIG_DRIPLEAF("hit.big_dripleaf"),
HIT_BONE_BLOCK("hit.bone_block"),
+ @Since("1.6.0.0-PN") HIT_CALCITE("hit.calcite"),
+ @Since("1.6.0.0-PN") HIT_CANDLE("hit.candle"),
+ @Since("1.6.0.0-PN") HIT_CAVE_VINES("hit.cave_vines"),
HIT_CHAIN("hit.chain"),
HIT_CLOTH("hit.cloth"),
+ @Since("1.6.0.0-PN") HIT_COPPER("hit.copper"),
HIT_CORAL("hit.coral"),
+ @Since("1.6.0.0-PN") HIT_DEEPSLATE("hit.deepslate"),
+ @Since("1.6.0.0-PN") HIT_DEEPSLATE_BRICKS("hit.deepslate_bricks"),
+ @Since("1.6.0.0-PN") HIT_DIRT_WITH_ROOTS("hit.dirt_with_roots"),
+ @Since("1.6.0.0-PN") HIT_DRIPSTONE_BLOCK("hit.dripstone_block"),
HIT_GRASS("hit.grass"),
HIT_GRAVEL("hit.gravel"),
+ @Since("1.6.0.0-PN") HIT_HANGING_ROOTS("hit.hanging_roots"),
HIT_HONEY_BLOCK("hit.honey_block"),
HIT_LADDER("hit.ladder"),
+ @Since("1.6.0.0-PN") HIT_MOSS("hit.moss"),
HIT_NETHER_BRICK("hit.nether_brick"),
HIT_NETHER_GOLD_ORE("hit.nether_gold_ore"),
HIT_NETHER_SPROUTS("hit.nether_sprouts"),
@@ -217,6 +285,8 @@ public enum Sound {
HIT_NETHERITE("hit.netherite"),
HIT_NETHERRACK("hit.netherrack"),
HIT_NYLIUM("hit.nylium"),
+ @Since("1.6.0.0-PN") HIT_POINTED_DRIPSTONE("hit.pointed_dripstone"),
+ @Since("1.6.0.0-PN") HIT_POWDER_SNOW("hit.powder_snow"),
HIT_ROOTS("hit.roots"),
HIT_SAND("hit.sand"),
HIT_SHROOMLIGHT("hit.shroomlight"),
@@ -224,13 +294,18 @@ public enum Sound {
HIT_SNOW("hit.snow"),
HIT_SOUL_SAND("hit.soul_sand"),
HIT_SOUL_SOIL("hit.soul_soil"),
+ @Since("1.6.0.0-PN") HIT_SPORE_BLOSSOM("hit.spore_blossom"),
HIT_STEM("hit.stem"),
HIT_STONE("hit.stone"),
+ @Since("1.6.0.0-PN") HIT_TUFF("hit.tuff"),
HIT_VINES("hit.vines"),
HIT_WOOD("hit.wood"),
+ @Since("1.6.0.0-PN") ITEM_BONE_MEAL_USE("item.bone_meal.use"),
ITEM_BOOK_PAGE_TURN("item.book.page_turn"),
ITEM_BOOK_PUT("item.book.put"),
ITEM_SHIELD_BLOCK("item.shield.block"),
+ @Since("1.6.0.0-PN") ITEM_SPYGLASS_STOP_USING("item.spyglass.stop_using"),
+ @Since("1.6.0.0-PN") ITEM_SPYGLASS_USE("item.spyglass.use"),
ITEM_TRIDENT_HIT("item.trident.hit"),
ITEM_TRIDENT_HIT_GROUND("item.trident.hit_ground"),
ITEM_TRIDENT_RETURN("item.trident.return"),
@@ -240,14 +315,23 @@ public enum Sound {
ITEM_TRIDENT_THROW("item.trident.throw"),
ITEM_TRIDENT_THUNDER("item.trident.thunder"),
JUMP_ANCIENT_DEBRIS("jump.ancient_debris"),
+ @Since("1.6.0.0-PN") JUMP_AZALEA("jump.azalea"),
JUMP_BASALT("jump.basalt"),
+ @Since("1.6.0.0-PN") JUMP_BIG_DRIPLEAF("jump.big_dripleaf"),
JUMP_BONE_BLOCK("jump.bone_block"),
+ @Since("1.6.0.0-PN") JUMP_CAVE_VINES("jump.cave_vines"),
JUMP_CHAIN("jump.chain"),
JUMP_CLOTH("jump.cloth"),
JUMP_CORAL("jump.coral"),
+ @Since("1.6.0.0-PN") JUMP_DEEPSLATE("jump.deepslate"),
+ @Since("1.6.0.0-PN") JUMP_DEEPSLATE_BRICKS("jump.deepslate_bricks"),
+ @Since("1.6.0.0-PN") JUMP_DIRT_WITH_ROOTS("jump.dirt_with_roots"),
+ @Since("1.6.0.0-PN") JUMP_DRIPSTONE_BLOCK("jump.dripstone_block"),
JUMP_GRASS("jump.grass"),
JUMP_GRAVEL("jump.gravel"),
+ @Since("1.6.0.0-PN") JUMP_HANGING_ROOTS("jump.hanging_roots"),
JUMP_HONEY_BLOCK("jump.honey_block"),
+ @Since("1.6.0.0-PN") JUMP_MOSS("jump.moss"),
JUMP_NETHER_BRICK("jump.nether_brick"),
JUMP_NETHER_GOLD_ORE("jump.nether_gold_ore"),
JUMP_NETHER_SPROUTS("jump.nether_sprouts"),
@@ -255,6 +339,7 @@ public enum Sound {
JUMP_NETHERITE("jump.netherite"),
JUMP_NETHERRACK("jump.netherrack"),
JUMP_NYLIUM("jump.nylium"),
+ @Since("1.6.0.0-PN") JUMP_POINTED_DRIPSTONE("jump.pointed_dripstone"),
JUMP_ROOTS("jump.roots"),
JUMP_SAND("jump.sand"),
JUMP_SHROOMLIGHT("jump.shroomlight"),
@@ -262,19 +347,29 @@ public enum Sound {
JUMP_SNOW("jump.snow"),
JUMP_SOUL_SAND("jump.soul_sand"),
JUMP_SOUL_SOIL("jump.soul_soil"),
+ @Since("1.6.0.0-PN") JUMP_SPORE_BLOSSOM("jump.spore_blossom"),
JUMP_STEM("jump.stem"),
JUMP_STONE("jump.stone"),
JUMP_VINES("jump.vines"),
JUMP_WOOD("jump.wood"),
LAND_ANCIENT_DEBRIS("land.ancient_debris"),
+ @Since("1.6.0.0-PN") LAND_AZALEA("land.azalea"),
LAND_BASALT("land.basalt"),
+ @Since("1.6.0.0-PN") LAND_BIG_DRIPLEAF("land.big_dripleaf"),
LAND_BONE_BLOCK("land.bone_block"),
+ @Since("1.6.0.0-PN") LAND_CAVE_VINES("land.cave_vines"),
LAND_CHAIN("land.chain"),
LAND_CLOTH("land.cloth"),
LAND_CORAL("land.coral"),
+ @Since("1.6.0.0-PN") LAND_DEEPSLATE("land.deepslate"),
+ @Since("1.6.0.0-PN") LAND_DEEPSLATE_BRICKS("land.deepslate_bricks"),
+ @Since("1.6.0.0-PN") LAND_DIRT_WITH_ROOTS("land.dirt_with_roots"),
+ @Since("1.6.0.0-PN") LAND_DRIPSTONE_BLOCK("land.dripstone_block"),
LAND_GRASS("land.grass"),
LAND_GRAVEL("land.gravel"),
+ @Since("1.6.0.0-PN") LAND_HANGING_ROOTS("land.hanging_roots"),
LAND_HONEY_BLOCK("land.honey_block"),
+ @Since("1.6.0.0-PN") LAND_MOSS("land.moss"),
LAND_NETHER_BRICK("land.nether_brick"),
LAND_NETHER_GOLD_ORE("land.nether_gold_ore"),
LAND_NETHER_SPROUTS("land.nether_sprouts"),
@@ -282,6 +377,7 @@ public enum Sound {
LAND_NETHERITE("land.netherite"),
LAND_NETHERRACK("land.netherrack"),
LAND_NYLIUM("land.nylium"),
+ @Since("1.6.0.0-PN") LAND_POINTED_DRIPSTONE("land.pointed_dripstone"),
LAND_ROOTS("land.roots"),
LAND_SAND("land.sand"),
LAND_SHROOMLIGHT("land.shroomlight"),
@@ -289,6 +385,7 @@ public enum Sound {
LAND_SNOW("land.snow"),
LAND_SOUL_SAND("land.soul_sand"),
LAND_SOUL_SOIL("land.soul_soil"),
+ @Since("1.6.0.0-PN") LAND_SPORE_BLOSSOM("land.spore_blossom"),
LAND_STEM("land.stem"),
LAND_STONE("land.stone"),
LAND_VINES("land.vines"),
@@ -306,6 +403,13 @@ public enum Sound {
MOB_ARMOR_STAND_HIT("mob.armor_stand.hit"),
MOB_ARMOR_STAND_LAND("mob.armor_stand.land"),
MOB_ARMOR_STAND_PLACE("mob.armor_stand.place"),
+ @Since("1.6.0.0-PN") MOB_AXOLOTL_ATTACK("mob.axolotl.attack"),
+ @Since("1.6.0.0-PN") MOB_AXOLOTL_DEATH("mob.axolotl.death"),
+ @Since("1.6.0.0-PN") MOB_AXOLOTL_HURT("mob.axolotl.hurt"),
+ @Since("1.6.0.0-PN") MOB_AXOLOTL_IDLE("mob.axolotl.idle"),
+ @Since("1.6.0.0-PN") MOB_AXOLOTL_IDLE_WATER("mob.axolotl.idle_water"),
+ @Since("1.6.0.0-PN") MOB_AXOLOTL_SPLASH("mob.axolotl.splash"),
+ @Since("1.6.0.0-PN") MOB_AXOLOTL_SWIM("mob.axolotl.swim"),
MOB_BAT_DEATH("mob.bat.death"),
MOB_BAT_HURT("mob.bat.hurt"),
MOB_BAT_IDLE("mob.bat.idle"),
@@ -404,6 +508,23 @@ public enum Sound {
MOB_GHAST_FIREBALL("mob.ghast.fireball"),
MOB_GHAST_MOAN("mob.ghast.moan"),
MOB_GHAST_SCREAM("mob.ghast.scream"),
+ @Since("1.6.0.0-PN") MOB_GLOW_SQUID_AMBIENT("mob.glow_squid.ambient"),
+ @Since("1.6.0.0-PN") MOB_GLOW_SQUID_DEATH("mob.glow_squid.death"),
+ @Since("1.6.0.0-PN") MOB_GLOW_SQUID_HURT("mob.glow_squid.hurt"),
+ @Since("1.6.0.0-PN") MOB_GLOW_SQUID_INK_SQUIRT("mob.glow_squid.ink_squirt"),
+ @Since("1.6.0.0-PN") MOB_GOAT_AMBIENT("mob.goat.ambient"),
+ @Since("1.6.0.0-PN") MOB_GOAT_AMBIENT_SCREAMER("mob.goat.ambient.screamer"),
+ @Since("1.6.0.0-PN") MOB_GOAT_DEATH("mob.goat.death"),
+ @Since("1.6.0.0-PN") MOB_GOAT_DEATH_SCREAMER("mob.goat.death.screamer"),
+ @Since("1.6.0.0-PN") MOB_GOAT_EAT("mob.goat.eat"),
+ @Since("1.6.0.0-PN") MOB_GOAT_HURT("mob.goat.hurt"),
+ @Since("1.6.0.0-PN") MOB_GOAT_HURT_SCREAMER("mob.goat.hurt.screamer"),
+ @Since("1.6.0.0-PN") MOB_GOAT_MILK_SCREAMER("mob.goat.milk.screamer"),
+ @Since("1.6.0.0-PN") MOB_GOAT_PREPARE_RAM("mob.goat.prepare_ram"),
+ @Since("1.6.0.0-PN") MOB_GOAT_PREPARE_RAM_SCREAMER("mob.goat.prepare_ram.screamer"),
+ @Since("1.6.0.0-PN") MOB_GOAT_RAM_IMPACT("mob.goat.ram_impact"),
+ @Since("1.6.0.0-PN") MOB_GOAT_RAM_IMPACT_SCREAMER("mob.goat.ram_impact.screamer"),
+ @Since("1.6.0.0-PN") MOB_GOAT_STEP("mob.goat.step"),
MOB_GUARDIAN_AMBIENT("mob.guardian.ambient"),
MOB_GUARDIAN_ATTACK_LOOP("mob.guardian.attack_loop"),
MOB_GUARDIAN_DEATH("mob.guardian.death"),
@@ -515,6 +636,9 @@ public enum Sound {
MOB_PILLAGER_DEATH("mob.pillager.death"),
MOB_PILLAGER_HURT("mob.pillager.hurt"),
MOB_PILLAGER_IDLE("mob.pillager.idle"),
+ @Since("1.6.0.0-PN") MOB_PLAYER_HURT_DROWN("mob.player.hurt_drown"),
+ @Since("1.6.0.0-PN") MOB_PLAYER_HURT_FREEZE("mob.player.hurt_freeze"),
+ @Since("1.6.0.0-PN") MOB_PLAYER_HURT_ON_FIRE("mob.player.hurt_on_fire"),
MOB_POLARBEAR_DEATH("mob.polarbear.death"),
MOB_POLARBEAR_HURT("mob.polarbear.hurt"),
MOB_POLARBEAR_IDLE("mob.polarbear.idle"),
@@ -549,6 +673,7 @@ public enum Sound {
MOB_SILVERFISH_KILL("mob.silverfish.kill"),
MOB_SILVERFISH_SAY("mob.silverfish.say"),
MOB_SILVERFISH_STEP("mob.silverfish.step"),
+ @Since("1.6.0.0-PN") MOB_SKELETON_CONVERT_TO_STRAY("mob.skeleton.convert_to_stray"),
MOB_SKELETON_DEATH("mob.skeleton.death"),
MOB_SKELETON_HURT("mob.skeleton.hurt"),
MOB_SKELETON_SAY("mob.skeleton.say"),
@@ -569,6 +694,7 @@ public enum Sound {
MOB_SQUID_AMBIENT("mob.squid.ambient"),
MOB_SQUID_DEATH("mob.squid.death"),
MOB_SQUID_HURT("mob.squid.hurt"),
+ @Since("1.6.0.0-PN") MOB_SQUID_INK_SQUIRT("mob.squid.ink_squirt"),
MOB_STRAY_AMBIENT("mob.stray.ambient"),
MOB_STRAY_DEATH("mob.stray.death"),
MOB_STRAY_HURT("mob.stray.hurt"),
@@ -636,19 +762,9 @@ public enum Sound {
MOB_WOLF_WHINE("mob.wolf.whine"),
@Since("1.4.0.0-PN") MOB_ZOGLIN_ANGRY("mob.zoglin.angry"),
@Since("1.4.0.0-PN") MOB_ZOGLIN_ATTACK("mob.zoglin.attack"),
-
- @Deprecated @DeprecationDetails(since = "1.4.0.0-PN", reason = "Removed from Nukkit")
- @PowerNukkitOnly("Re-added for backward compatibility. Actual removal reason is unknown.")
- MOB_ZOGLIN_BOOST("mob.zoglin.boost"),
-
MOB_ZOGLIN_DEATH("mob.zoglin.death"),
@Since("1.4.0.0-PN") MOB_ZOGLIN_HURT("mob.zoglin.hurt"),
@Since("1.4.0.0-PN") MOB_ZOGLIN_IDLE("mob.zoglin.idle"),
-
- @Deprecated @DeprecationDetails(since = "1.4.0.0-PN", reason = "Removed from Nukkit")
- @PowerNukkitOnly("Re-added for backward compatibility. Actual removal reason is unknown.")
- MOB_ZOGLIN_SAY("mob.zoglin.say"),
-
MOB_ZOGLIN_STEP("mob.zoglin.step"),
MOB_ZOMBIE_DEATH("mob.zombie.death"),
MOB_ZOMBIE_HURT("mob.zombie.hurt"),
@@ -666,14 +782,25 @@ public enum Sound {
MOB_ZOMBIEPIG_ZPIGDEATH("mob.zombiepig.zpigdeath"),
MOB_ZOMBIEPIG_ZPIGHURT("mob.zombiepig.zpighurt"),
MUSIC_GAME("music.game"),
+ @Since("1.6.0.0-PN") MUSIC_GAME_BASALT_DELTAS("music.game.basalt_deltas"),
MUSIC_GAME_CREATIVE("music.game.creative"),
MUSIC_GAME_CREDITS("music.game.credits"),
MUSIC_GAME_CRIMSON_FOREST("music.game.crimson_forest"),
+ @Since("1.6.0.0-PN") MUSIC_GAME_DRIPSTONE_CAVES("music.game.dripstone_caves"),
MUSIC_GAME_END("music.game.end"),
MUSIC_GAME_ENDBOSS("music.game.endboss"),
+ @Since("1.6.0.0-PN") MUSIC_GAME_FROZEN_PEAKS("music.game.frozen_peaks"),
+ @Since("1.6.0.0-PN") MUSIC_GAME_GROVE("music.game.grove"),
+ @Since("1.6.0.0-PN") MUSIC_GAME_JAGGED_PEAKS("music.game.jagged_peaks"),
+ @Since("1.6.0.0-PN") MUSIC_GAME_LUSH_CAVES("music.game.lush_caves"),
+ @Since("1.6.0.0-PN") MUSIC_GAME_MEADOW("music.game.meadow"),
MUSIC_GAME_NETHER("music.game.nether"),
MUSIC_GAME_NETHER_WASTES("music.game.nether_wastes"),
+ @Since("1.6.0.0-PN") MUSIC_GAME_SNOWY_SLOPES("music.game.snowy_slopes"),
+ @Since("1.6.0.0-PN") MUSIC_GAME_SOUL_SAND_VALLEY("music.game.soul_sand_valley"),
MUSIC_GAME_SOULSAND_VALLEY("music.game.soulsand_valley"),
+ @Since("1.6.0.0-PN") MUSIC_GAME_STONY_PEAKS("music.game.stony_peaks"),
+ @Since("1.6.0.0-PN") MUSIC_GAME_WARPED_FOREST("music.game.warped_forest"),
MUSIC_GAME_WATER("music.game.water"),
MUSIC_MENU("music.menu"),
NOTE_BANJO("note.banjo"),
@@ -694,6 +821,27 @@ public enum Sound {
NOTE_SNARE("note.snare"),
NOTE_XYLOPHONE("note.xylophone"),
PARTICLE_SOUL_ESCAPE("particle.soul_escape"),
+ @Since("1.6.0.0-PN") PICK_BERRIES_CAVE_VINES("pick_berries.cave_vines"),
+ @Since("1.6.0.0-PN") PLACE_AMETHYST_BLOCK("place.amethyst_block"),
+ @Since("1.6.0.0-PN") PLACE_AMETHYST_CLUSTER("place.amethyst_cluster"),
+ @Since("1.6.0.0-PN") PLACE_AZALEA("place.azalea"),
+ @Since("1.6.0.0-PN") PLACE_AZALEA_LEAVES("place.azalea_leaves"),
+ @Since("1.6.0.0-PN") PLACE_BIG_DRIPLEAF("place.big_dripleaf"),
+ @Since("1.6.0.0-PN") PLACE_CALCITE("place.calcite"),
+ @Since("1.6.0.0-PN") PLACE_COPPER("place.copper"),
+ @Since("1.6.0.0-PN") PLACE_DEEPSLATE("place.deepslate"),
+ @Since("1.6.0.0-PN") PLACE_DEEPSLATE_BRICKS("place.deepslate_bricks"),
+ @Since("1.6.0.0-PN") PLACE_DIRT_WITH_ROOTS("place.dirt_with_roots"),
+ @Since("1.6.0.0-PN") PLACE_DRIPSTONE_BLOCK("place.dripstone_block"),
+ @Since("1.6.0.0-PN") PLACE_HANGING_ROOTS("place.hanging_roots"),
+ @Since("1.6.0.0-PN") PLACE_LARGE_AMETHYST_BUD("place.large_amethyst_bud"),
+ @Since("1.6.0.0-PN") PLACE_MEDIUM_AMETHYST_BUD("place.medium_amethyst_bud"),
+ @Since("1.6.0.0-PN") PLACE_MOSS("place.moss"),
+ @Since("1.6.0.0-PN") PLACE_POINTED_DRIPSTONE("place.pointed_dripstone"),
+ @Since("1.6.0.0-PN") PLACE_POWDER_SNOW("place.powder_snow"),
+ @Since("1.6.0.0-PN") PLACE_SMALL_AMETHYST_BUD("place.small_amethyst_bud"),
+ @Since("1.6.0.0-PN") PLACE_SPORE_BLOSSOM("place.spore_blossom"),
+ @Since("1.6.0.0-PN") PLACE_TUFF("place.tuff"),
PORTAL_PORTAL("portal.portal"),
PORTAL_TRAVEL("portal.travel"),
PORTAL_TRIGGER("portal.trigger"),
@@ -740,49 +888,45 @@ public enum Sound {
RECORD_FAR("record.far"),
RECORD_MALL("record.mall"),
RECORD_MELLOHI("record.mellohi"),
+ @Since("1.6.0.0-PN") RECORD_OTHERSIDE("record.otherside"),
RECORD_PIGSTEP("record.pigstep"),
RECORD_STAL("record.stal"),
RECORD_STRAD("record.strad"),
RECORD_WAIT("record.wait"),
-
- @Deprecated @DeprecationDetails(since = "1.4.0.0-PN", reason = "Removed from Nukkit")
- @PowerNukkitOnly("Re-added for backward compatibility. Actual removal reason is unknown.")
- BLOCK_LECTERN_PLACE("block.lectern.place"),
-
- @Deprecated @DeprecationDetails(since = "1.4.0.0-PN", reason = "Removed from Nukkit")
- @PowerNukkitOnly("Re-added for backward compatibility. Actual removal reason is unknown.")
- BLOCK_LECTERN_BREAK("block.lectern.break"),
-
- @Deprecated @DeprecationDetails(since = "1.4.0.0-PN", reason = "Removed from Nukkit")
- @PowerNukkitOnly("Re-added for backward compatibility. Actual removal reason is unknown.")
- BLOCK_LECTERN_HIT("block.lectern.hit"),
-
- @Deprecated @DeprecationDetails(since = "1.4.0.0-PN", reason = "Removed from Nukkit")
- @PowerNukkitOnly("Re-added for backward compatibility. Actual removal reason is unknown.")
- BLOCK_LECTERN_STEP("block.lectern.step"),
-
- @Deprecated @DeprecationDetails(since = "1.4.0.0-PN", reason = "Removed from Nukkit")
- @PowerNukkitOnly("Re-added for backward compatibility. Actual removal reason is unknown.")
- BLOCK_LECTERN_FALL("block.lectern.fall"),
-
RECORD_WARD("record.ward"),
RESPAWN_ANCHOR_AMBIENT("respawn_anchor.ambient"),
RESPAWN_ANCHOR_CHARGE("respawn_anchor.charge"),
RESPAWN_ANCHOR_DEPLETE("respawn_anchor.deplete"),
RESPAWN_ANCHOR_SET_SPAWN("respawn_anchor.set_spawn"),
+ @Since("1.6.0.0-PN") SCRAPE("scrape"),
@Since("1.4.0.0-PN") SIGN_DYE_USE("sign.dye.use"),
@Since("1.4.0.0-PN") SIGN_INK_SAC_USE("sign.ink_sac.use"),
SMITHING_TABLE_USE("smithing_table.use"),
+ @Since("1.6.0.0-PN") STEP_AMETHYST_BLOCK("step.amethyst_block"),
+ @Since("1.6.0.0-PN") STEP_AMETHYST_CLUSTER("step.amethyst_cluster"),
STEP_ANCIENT_DEBRIS("step.ancient_debris"),
+ @Since("1.6.0.0-PN") STEP_AZALEA("step.azalea"),
+ @Since("1.6.0.0-PN") STEP_AZALEA_LEAVES("step.azalea_leaves"),
STEP_BASALT("step.basalt"),
+ @Since("1.6.0.0-PN") STEP_BIG_DRIPLEAF("step.big_dripleaf"),
STEP_BONE_BLOCK("step.bone_block"),
+ @Since("1.6.0.0-PN") STEP_CALCITE("step.calcite"),
+ @Since("1.6.0.0-PN") STEP_CANDLE("step.candle"),
+ @Since("1.6.0.0-PN") STEP_CAVE_VINES("step.cave_vines"),
STEP_CHAIN("step.chain"),
STEP_CLOTH("step.cloth"),
+ @Since("1.6.0.0-PN") STEP_COPPER("step.copper"),
STEP_CORAL("step.coral"),
+ @Since("1.6.0.0-PN") STEP_DEEPSLATE("step.deepslate"),
+ @Since("1.6.0.0-PN") STEP_DEEPSLATE_BRICKS("step.deepslate_bricks"),
+ @Since("1.6.0.0-PN") STEP_DIRT_WITH_ROOTS("step.dirt_with_roots"),
+ @Since("1.6.0.0-PN") STEP_DRIPSTONE_BLOCK("step.dripstone_block"),
STEP_GRASS("step.grass"),
STEP_GRAVEL("step.gravel"),
+ @Since("1.6.0.0-PN") STEP_HANGING_ROOTS("step.hanging_roots"),
STEP_HONEY_BLOCK("step.honey_block"),
STEP_LADDER("step.ladder"),
+ @Since("1.6.0.0-PN") STEP_MOSS("step.moss"),
STEP_NETHER_BRICK("step.nether_brick"),
STEP_NETHER_GOLD_ORE("step.nether_gold_ore"),
STEP_NETHER_SPROUTS("step.nether_sprouts"),
@@ -790,6 +934,8 @@ public enum Sound {
STEP_NETHERITE("step.netherite"),
STEP_NETHERRACK("step.netherrack"),
STEP_NYLIUM("step.nylium"),
+ @Since("1.6.0.0-PN") STEP_POINTED_DRIPSTONE("step.pointed_dripstone"),
+ @Since("1.6.0.0-PN") STEP_POWDER_SNOW("step.powder_snow"),
STEP_ROOTS("step.roots"),
STEP_SAND("step.sand"),
STEP_SHROOMLIGHT("step.shroomlight"),
@@ -797,12 +943,16 @@ public enum Sound {
STEP_SNOW("step.snow"),
STEP_SOUL_SAND("step.soul_sand"),
STEP_SOUL_SOIL("step.soul_soil"),
+ @Since("1.6.0.0-PN") STEP_SPORE_BLOSSOM("step.spore_blossom"),
STEP_STEM("step.stem"),
STEP_STONE("step.stone"),
+ @Since("1.6.0.0-PN") STEP_TUFF("step.tuff"),
STEP_VINES("step.vines"),
STEP_WOOD("step.wood"),
TILE_PISTON_IN("tile.piston.in"),
TILE_PISTON_OUT("tile.piston.out"),
+ @Since("1.6.0.0-PN") TILT_DOWN_BIG_DRIPLEAF("tilt_down.big_dripleaf"),
+ @Since("1.6.0.0-PN") TILT_UP_BIG_DRIPLEAF("tilt_up.big_dripleaf"),
UI_CARTOGRAPHY_TABLE_TAKE_RESULT("ui.cartography_table.take_result"),
UI_LOOM_SELECT_PATTERN("ui.loom.select_pattern"),
UI_LOOM_TAKE_RESULT("ui.loom.take_result"),
@@ -810,13 +960,22 @@ public enum Sound {
USE_ANCIENT_DEBRIS("use.ancient_debris"),
USE_BASALT("use.basalt"),
USE_BONE_BLOCK("use.bone_block"),
+ @Since("1.6.0.0-PN") USE_CANDLE("use.candle"),
+ @Since("1.6.0.0-PN") USE_CAVE_VINES("use.cave_vines"),
USE_CHAIN("use.chain"),
USE_CLOTH("use.cloth"),
+ @Since("1.6.0.0-PN") USE_COPPER("use.copper"),
USE_CORAL("use.coral"),
+ @Since("1.6.0.0-PN") USE_DEEPSLATE("use.deepslate"),
+ @Since("1.6.0.0-PN") USE_DEEPSLATE_BRICKS("use.deepslate_bricks"),
+ @Since("1.6.0.0-PN") USE_DIRT_WITH_ROOTS("use.dirt_with_roots"),
+ @Since("1.6.0.0-PN") USE_DRIPSTONE_BLOCK("use.dripstone_block"),
USE_GRASS("use.grass"),
USE_GRAVEL("use.gravel"),
+ @Since("1.6.0.0-PN") USE_HANGING_ROOTS("use.hanging_roots"),
USE_HONEY_BLOCK("use.honey_block"),
USE_LADDER("use.ladder"),
+ @Since("1.6.0.0-PN") USE_MOSS("use.moss"),
USE_NETHER_BRICK("use.nether_brick"),
USE_NETHER_GOLD_ORE("use.nether_gold_ore"),
USE_NETHER_SPROUTS("use.nether_sprouts"),
@@ -824,6 +983,7 @@ public enum Sound {
USE_NETHERITE("use.netherite"),
USE_NETHERRACK("use.netherrack"),
USE_NYLIUM("use.nylium"),
+ @Since("1.6.0.0-PN") USE_POINTED_DRIPSTONE("use.pointed_dripstone"),
USE_ROOTS("use.roots"),
USE_SAND("use.sand"),
USE_SHROOMLIGHT("use.shroomlight"),
@@ -831,6 +991,7 @@ public enum Sound {
USE_SNOW("use.snow"),
USE_SOUL_SAND("use.soul_sand"),
USE_SOUL_SOIL("use.soul_soil"),
+ @Since("1.6.0.0-PN") USE_SPORE_BLOSSOM("use.spore_blossom"),
USE_STEM("use.stem"),
USE_STONE("use.stone"),
USE_VINES("use.vines"),
diff --git a/src/main/java/cn/nukkit/level/biome/Biome.java b/src/main/java/cn/nukkit/level/biome/Biome.java
index 57b7bfa4c54..bab9a2ce88d 100644
--- a/src/main/java/cn/nukkit/level/biome/Biome.java
+++ b/src/main/java/cn/nukkit/level/biome/Biome.java
@@ -7,7 +7,15 @@
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.level.generator.populator.type.Populator;
import cn.nukkit.math.NukkitRandom;
-
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
@@ -15,15 +23,40 @@
* @author MagicDroidX (Nukkit Project)
*/
public abstract class Biome implements BlockID {
+
public static final int MAX_BIOMES = 256;
public static final Biome[] biomes = new Biome[MAX_BIOMES];
- public static final List unorderedBiomes = new ArrayList<>();
+ public static final List unorderedBiomes = new ObjectArrayList<>();
+ private static final Int2ObjectMap runtimeId2Identifier = new Int2ObjectOpenHashMap<>();
private final ArrayList populators = new ArrayList<>();
private int id;
private float baseHeight = 0.1f;
private float heightVariation = 0.3f;
+ static {
+ try (InputStream stream = Biome.class.getClassLoader().getResourceAsStream("biome_id_map.json")) {
+ JsonObject json = JsonParser.parseReader(new InputStreamReader(stream)).getAsJsonObject();
+ for (String identifier : json.keySet()) {
+ int biomeId = json.get(identifier).getAsInt();
+ runtimeId2Identifier.put(biomeId, identifier);
+ }
+ } catch (NullPointerException | IOException e) {
+ throw new AssertionError("Unable to load biome mapping from biome_id_map.json", e);
+ }
+ }
+
+ public static String getBiomeNameFromId(int biomeId) {
+ return runtimeId2Identifier.get(biomeId);
+ }
+
+ public static int getBiomeIdOrCorrect(int biomeId) {
+ if (runtimeId2Identifier.get(biomeId) == null) {
+ return EnumBiome.OCEAN.id;
+ }
+ return biomeId;
+ }
+
protected static void register(int id, Biome biome) {
biome.setId(id);
biomes[id] = biome;
diff --git a/src/main/java/cn/nukkit/level/biome/impl/beach/ColdBeachBiome.java b/src/main/java/cn/nukkit/level/biome/impl/beach/ColdBeachBiome.java
index b3202b7c771..ebe993d6755 100644
--- a/src/main/java/cn/nukkit/level/biome/impl/beach/ColdBeachBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/impl/beach/ColdBeachBiome.java
@@ -1,6 +1,6 @@
package cn.nukkit.level.biome.impl.beach;
-import cn.nukkit.api.RemovedFromNewRakNet;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.level.biome.type.SandyBiome;
import cn.nukkit.level.generator.populator.impl.WaterIcePopulator;
@@ -15,8 +15,8 @@ public ColdBeachBiome() {
}
@Since("1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
- @RemovedFromNewRakNet
public int getCoverBlock() {
if (useNewRakNetCover()) {
return getCoverId(0,0) >> 4;
diff --git a/src/main/java/cn/nukkit/level/biome/impl/extremehills/ExtremeHillsMBiome.java b/src/main/java/cn/nukkit/level/biome/impl/extremehills/ExtremeHillsMBiome.java
index ea0a863c759..5a12def909d 100644
--- a/src/main/java/cn/nukkit/level/biome/impl/extremehills/ExtremeHillsMBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/impl/extremehills/ExtremeHillsMBiome.java
@@ -1,6 +1,5 @@
package cn.nukkit.level.biome.impl.extremehills;
-import cn.nukkit.api.NewRakNetOnly;
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.blockstate.BlockState;
@@ -42,13 +41,11 @@ public BlockState getSurfaceState(int x, int y, int z) {
return gravelNoise.noise2D(x, z, true) < -0.75f ? STATE_GRAVEL : STATE_GRASS;
}
- @NewRakNetOnly
@Override
public int getSurfaceDepth(int x, int y, int z) {
return gravelNoise.noise2D(x, z, true) < -0.75f ? 4 : 1;
}
- @NewRakNetOnly
@Override
public int getGroundDepth(int x, int y, int z) {
return gravelNoise.noise2D(x, z, true) < -0.75f ? 0 : 4;
diff --git a/src/main/java/cn/nukkit/level/biome/impl/extremehills/StoneBeachBiome.java b/src/main/java/cn/nukkit/level/biome/impl/extremehills/StoneBeachBiome.java
index 92ac0db5b66..796d75cf0bd 100644
--- a/src/main/java/cn/nukkit/level/biome/impl/extremehills/StoneBeachBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/impl/extremehills/StoneBeachBiome.java
@@ -1,6 +1,6 @@
package cn.nukkit.level.biome.impl.extremehills;
-import cn.nukkit.api.RemovedFromNewRakNet;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.level.biome.type.CoveredBiome;
@@ -17,7 +17,7 @@ public StoneBeachBiome() {
this.setHeightVariation(0.8f);
}
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getSurfaceDepth(int y) {
@@ -27,7 +27,7 @@ public int getSurfaceDepth(int y) {
return 0;
}
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getSurfaceBlock(int y) {
@@ -37,7 +37,7 @@ public int getSurfaceBlock(int y) {
return 0;
}
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getGroundDepth(int y) {
@@ -47,7 +47,7 @@ public int getGroundDepth(int y) {
return 0;
}
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getGroundBlock(int y) {
diff --git a/src/main/java/cn/nukkit/level/biome/impl/forest/FlowerForestBiome.java b/src/main/java/cn/nukkit/level/biome/impl/forest/FlowerForestBiome.java
index 2a8a58f923d..93d05906858 100644
--- a/src/main/java/cn/nukkit/level/biome/impl/forest/FlowerForestBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/impl/forest/FlowerForestBiome.java
@@ -27,6 +27,8 @@ public FlowerForestBiome(int type) {
flower.addType(RED_FLOWER, BlockFlower.TYPE_WHITE_TULIP);
flower.addType(RED_FLOWER, BlockFlower.TYPE_PINK_TULIP);
flower.addType(RED_FLOWER, BlockFlower.TYPE_OXEYE_DAISY);
+ flower.addType(RED_FLOWER, BlockFlower.TYPE_CORNFLOWER);
+ flower.addType(RED_FLOWER, BlockFlower.TYPE_LILY_OF_THE_VALLEY);
flower.addType(DOUBLE_PLANT, BlockDoublePlant.LILAC);
flower.addType(DOUBLE_PLANT, BlockDoublePlant.ROSE_BUSH);
flower.addType(DOUBLE_PLANT, BlockDoublePlant.PEONY);
diff --git a/src/main/java/cn/nukkit/level/biome/impl/iceplains/IcePlainsBiome.java b/src/main/java/cn/nukkit/level/biome/impl/iceplains/IcePlainsBiome.java
index 8235b7341e8..f1f76b28ae2 100644
--- a/src/main/java/cn/nukkit/level/biome/impl/iceplains/IcePlainsBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/impl/iceplains/IcePlainsBiome.java
@@ -23,6 +23,7 @@ public IcePlainsBiome() {
this.setHeightVariation(0.05f);
}
+ @Override
public String getName() {
return "Ice Plains";
}
diff --git a/src/main/java/cn/nukkit/level/biome/impl/iceplains/IcePlainsSpikesBiome.java b/src/main/java/cn/nukkit/level/biome/impl/iceplains/IcePlainsSpikesBiome.java
index 929213b8b51..d52518517ab 100644
--- a/src/main/java/cn/nukkit/level/biome/impl/iceplains/IcePlainsSpikesBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/impl/iceplains/IcePlainsSpikesBiome.java
@@ -1,6 +1,6 @@
package cn.nukkit.level.biome.impl.iceplains;
-import cn.nukkit.api.RemovedFromNewRakNet;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.level.ChunkManager;
import cn.nukkit.level.format.FullChunk;
@@ -19,7 +19,7 @@ public IcePlainsSpikesBiome() {
this.addPopulator(iceSpikes);
}
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getSurfaceBlock(int y) {
@@ -29,6 +29,7 @@ public int getSurfaceBlock(int y) {
return SNOW_BLOCK;
}
+ @Override
public String getName() {
return "Ice Plains Spikes";
}
diff --git a/src/main/java/cn/nukkit/level/biome/impl/mesa/MesaBiome.java b/src/main/java/cn/nukkit/level/biome/impl/mesa/MesaBiome.java
index b1f68b79863..29e03c9b4a2 100644
--- a/src/main/java/cn/nukkit/level/biome/impl/mesa/MesaBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/impl/mesa/MesaBiome.java
@@ -1,6 +1,5 @@
package cn.nukkit.level.biome.impl.mesa;
-import cn.nukkit.api.NewRakNetOnly;
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.block.BlockSand;
@@ -86,7 +85,6 @@ public void setMoundHeight(int height) {
this.moundHeight = height;
}
- @NewRakNetOnly
@Override
public int getSurfaceDepth(int x, int y, int z) {
return y < (71 + Math.round((redSandNoise.noise2D(x, z, true) + 1) * 1.5f)) ? 3 : y - 66;
@@ -104,7 +102,6 @@ public BlockState getSurfaceState(int x, int y, int z) {
}
}
- @NewRakNetOnly
@Override
public int getGroundDepth(int x, int y, int z) {
return y < (71 + Math.round((redSandNoise.noise2D(x, z, true) + 1) * 1.5f)) ? 2 : 0;
diff --git a/src/main/java/cn/nukkit/level/biome/impl/mesa/MesaPlateauFBiome.java b/src/main/java/cn/nukkit/level/biome/impl/mesa/MesaPlateauFBiome.java
index d1bd18906d1..ddaa0926918 100644
--- a/src/main/java/cn/nukkit/level/biome/impl/mesa/MesaPlateauFBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/impl/mesa/MesaPlateauFBiome.java
@@ -1,6 +1,6 @@
package cn.nukkit.level.biome.impl.mesa;
-import cn.nukkit.api.RemovedFromNewRakNet;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.block.BlockSapling;
import cn.nukkit.level.generator.populator.impl.PopulatorTree;
@@ -19,8 +19,8 @@ public MesaPlateauFBiome() {
}
@Since("1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
- @RemovedFromNewRakNet
public int getCoverBlock() {
if (useNewRakNetCover()) {
return getCoverId(0,0) >> 4;
diff --git a/src/main/java/cn/nukkit/level/biome/impl/mushroom/MushroomIslandBiome.java b/src/main/java/cn/nukkit/level/biome/impl/mushroom/MushroomIslandBiome.java
index 165b71767ad..62bb35f141b 100644
--- a/src/main/java/cn/nukkit/level/biome/impl/mushroom/MushroomIslandBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/impl/mushroom/MushroomIslandBiome.java
@@ -1,6 +1,6 @@
package cn.nukkit.level.biome.impl.mushroom;
-import cn.nukkit.api.RemovedFromNewRakNet;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
import cn.nukkit.level.biome.type.GrassyBiome;
@@ -21,7 +21,7 @@ public String getName() {
return "Mushroom Island";
}
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getSurfaceBlock(int y) {
diff --git a/src/main/java/cn/nukkit/level/biome/impl/ocean/OceanBiome.java b/src/main/java/cn/nukkit/level/biome/impl/ocean/OceanBiome.java
index 5cddc60c691..a8cea54b36a 100644
--- a/src/main/java/cn/nukkit/level/biome/impl/ocean/OceanBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/impl/ocean/OceanBiome.java
@@ -1,6 +1,6 @@
package cn.nukkit.level.biome.impl.ocean;
-import cn.nukkit.api.RemovedFromNewRakNet;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.level.biome.type.WateryBiome;
@@ -19,7 +19,7 @@ public String getName() {
return "Ocean";
}
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getGroundBlock(int y) {
diff --git a/src/main/java/cn/nukkit/level/biome/impl/taiga/ColdTaigaBiome.java b/src/main/java/cn/nukkit/level/biome/impl/taiga/ColdTaigaBiome.java
index 41c79c8eb6e..259f96639ff 100644
--- a/src/main/java/cn/nukkit/level/biome/impl/taiga/ColdTaigaBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/impl/taiga/ColdTaigaBiome.java
@@ -1,6 +1,6 @@
package cn.nukkit.level.biome.impl.taiga;
-import cn.nukkit.api.RemovedFromNewRakNet;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.level.generator.populator.impl.WaterIcePopulator;
@@ -24,8 +24,8 @@ public String getName() {
}
@Since("1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
- @RemovedFromNewRakNet
public int getCoverBlock() {
if (useNewRakNetCover()) {
return getCoverId(0,0) >> 4;
diff --git a/src/main/java/cn/nukkit/level/biome/type/CoveredBiome.java b/src/main/java/cn/nukkit/level/biome/type/CoveredBiome.java
index 5dc7815e02c..0b1960bcc65 100644
--- a/src/main/java/cn/nukkit/level/biome/type/CoveredBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/type/CoveredBiome.java
@@ -42,7 +42,7 @@ public abstract class CoveredBiome extends Biome {
@Deprecated
@DeprecationDetails(since = "1.4.0.0-PN", reason = "Exposed lock object and removed from new-raknet and not used by PowerNukkit")
@Since("1.4.0.0-PN")
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
public final Object synchronizeCover = new Object();
/**
@@ -50,7 +50,7 @@ public abstract class CoveredBiome extends Biome {
*
* @return cover block
*/
- @NewRakNetOnly
+ @SuppressWarnings("unused")
public int getCoverId(int x, int z) {
useNewRakNetCover = false;
return getCoverBlock() << 4;
@@ -63,7 +63,7 @@ public int getCoverId(int x, int z) {
*
* @implNote Removed from new-raknet branch
*/
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getCoverBlock() {
if (useNewRakNetCover()) {
@@ -92,7 +92,6 @@ public BlockState getCoverState(int x, int z) {
}
}
- @NewRakNetOnly
public int getSurfaceDepth(int x, int y, int z) {
useNewRakNetSurfaceDepth = false;
return getSurfaceDepth(y);
@@ -109,7 +108,7 @@ public int getSurfaceDepth(int x, int y, int z) {
*
* @implNote Removed from new-raknet branch
*/
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getSurfaceDepth(int y) {
if (useNewRakNetSurfaceDepth()) {
@@ -119,7 +118,7 @@ public int getSurfaceDepth(int y) {
}
}
- @NewRakNetOnly
+ @SuppressWarnings("unused")
public int getSurfaceId(int x, int y, int z) {
useNewRakNetSurface = false;
return getSurfaceBlock(y) << 4 | (getSurfaceMeta(y) & 0xF);
@@ -133,7 +132,7 @@ public int getSurfaceId(int x, int y, int z) {
*
* @implNote Removed from new-raknet branch
*/
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getSurfaceBlock(int y) {
if (useNewRakNetSurface()) {
@@ -152,7 +151,7 @@ public int getSurfaceBlock(int y) {
*
* @implNote Removed from new-raknet branch
*/
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getSurfaceMeta(int y) {
if (useNewRakNetSurface()) {
@@ -175,7 +174,6 @@ public BlockState getSurfaceState(int x, int y, int z) {
}
}
- @NewRakNetOnly
public int getGroundDepth(int x, int y, int z) {
useNewRakNetGroundDepth = false;
return getGroundDepth(y);
@@ -191,7 +189,7 @@ public int getGroundDepth(int x, int y, int z) {
*
* @implNote Removed from new-raknet branch
*/
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getGroundDepth(int y) {
if (useNewRakNetGroundDepth()) {
@@ -201,7 +199,7 @@ public int getGroundDepth(int y) {
}
}
- @NewRakNetOnly
+ @SuppressWarnings("unused")
public int getGroundId(int x, int y, int z) {
useNewRakNetGroundBlock = false;
return getGroundBlock(y) << 4 | (getGroundMeta(y) & 0xF);
@@ -215,7 +213,7 @@ public int getGroundId(int x, int y, int z) {
*
* @implNote Removed from new-raknet branch
*/
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getGroundBlock(int y) {
if (useNewRakNetGround()) {
@@ -232,7 +230,7 @@ public int getGroundBlock(int y) {
*
* @implNote Removed from new-raknet branch
*/
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getGroundMeta(int y) {
if (useNewRakNetGround()) {
@@ -262,7 +260,7 @@ public BlockState getGroundState(int x, int y, int z) {
*
* @implNote Removed from new-raknet branch
*/
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public int getStoneBlock() {
return STONE;
@@ -279,13 +277,13 @@ public int getStoneBlock() {
*
* @implNote Removed from new-raknet branch
*/
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
+ @SuppressWarnings("unused")
public void preCover(int x, int z) {
-
+ // Does nothing
}
- @NewRakNetOnly
public void doCover(int x, int z, @Nonnull FullChunk chunk) {
final int fullX = (chunk.getX() << 4) | x;
final int fullZ = (chunk.getZ() << 4) | z;
diff --git a/src/main/java/cn/nukkit/level/biome/type/GrassyBiome.java b/src/main/java/cn/nukkit/level/biome/type/GrassyBiome.java
index 0bf0222a392..c884a16b27c 100644
--- a/src/main/java/cn/nukkit/level/biome/type/GrassyBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/type/GrassyBiome.java
@@ -1,6 +1,6 @@
package cn.nukkit.level.biome.type;
-import cn.nukkit.api.RemovedFromNewRakNet;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.block.BlockDoublePlant;
import cn.nukkit.level.generator.populator.impl.PopulatorDoublePlant;
@@ -20,7 +20,7 @@ public GrassyBiome() {
this.addPopulator(tallGrass);
}
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getSurfaceBlock(int y) {
@@ -30,7 +30,7 @@ public int getSurfaceBlock(int y) {
return GRASS;
}
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getGroundBlock(int y) {
diff --git a/src/main/java/cn/nukkit/level/biome/type/SandyBiome.java b/src/main/java/cn/nukkit/level/biome/type/SandyBiome.java
index af1c20bc6cb..46e029d9c69 100644
--- a/src/main/java/cn/nukkit/level/biome/type/SandyBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/type/SandyBiome.java
@@ -1,13 +1,13 @@
package cn.nukkit.level.biome.type;
-import cn.nukkit.api.RemovedFromNewRakNet;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
/**
* @author MagicDroidX (Nukkit Project)
*/
public abstract class SandyBiome extends CoveredBiome {
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getSurfaceDepth(int y) {
@@ -17,7 +17,7 @@ public int getSurfaceDepth(int y) {
return 3;
}
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getSurfaceBlock(int y) {
@@ -27,7 +27,7 @@ public int getSurfaceBlock(int y) {
return SAND;
}
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getGroundDepth(int y) {
@@ -37,7 +37,7 @@ public int getGroundDepth(int y) {
return 2;
}
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getGroundBlock(int y) {
diff --git a/src/main/java/cn/nukkit/level/biome/type/SnowyBiome.java b/src/main/java/cn/nukkit/level/biome/type/SnowyBiome.java
index 039e4a2e9d1..e431e6f12c9 100644
--- a/src/main/java/cn/nukkit/level/biome/type/SnowyBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/type/SnowyBiome.java
@@ -1,6 +1,6 @@
package cn.nukkit.level.biome.type;
-import cn.nukkit.api.RemovedFromNewRakNet;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.level.generator.populator.impl.WaterIcePopulator;
@@ -16,8 +16,8 @@ public SnowyBiome() {
}
@Since("1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
- @RemovedFromNewRakNet
public int getCoverBlock() {
if (useNewRakNetCover()) {
return getCoverId(0,0);
diff --git a/src/main/java/cn/nukkit/level/biome/type/WateryBiome.java b/src/main/java/cn/nukkit/level/biome/type/WateryBiome.java
index 91006ca8983..41d34c9319f 100644
--- a/src/main/java/cn/nukkit/level/biome/type/WateryBiome.java
+++ b/src/main/java/cn/nukkit/level/biome/type/WateryBiome.java
@@ -1,13 +1,13 @@
package cn.nukkit.level.biome.type;
-import cn.nukkit.api.RemovedFromNewRakNet;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
/**
* @author DaPorkchop_ (Nukkit Project)
*/
public abstract class WateryBiome extends CoveredBiome {
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getSurfaceDepth(int y) {
@@ -17,7 +17,7 @@ public int getSurfaceDepth(int y) {
return 0;
}
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getSurfaceBlock(int y) {
@@ -28,7 +28,7 @@ public int getSurfaceBlock(int y) {
return 0;
}
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getGroundDepth(int y) {
@@ -38,7 +38,7 @@ public int getGroundDepth(int y) {
return 5;
}
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
@Override
public int getGroundBlock(int y) {
diff --git a/src/main/java/cn/nukkit/level/format/ChunkSection.java b/src/main/java/cn/nukkit/level/format/ChunkSection.java
index fbfa6764a37..d3557770193 100644
--- a/src/main/java/cn/nukkit/level/format/ChunkSection.java
+++ b/src/main/java/cn/nukkit/level/format/ChunkSection.java
@@ -100,6 +100,7 @@ default BlockState getAndSetBlockState(int x, int y, int z, BlockState state) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.3.0.0-PN", replaceWith = "setBlockStateAtLayer(int x, int y, int z, int layer, BlockState state)")
+ @PowerNukkitOnly
boolean setFullBlockId(int x, int y, int z, int layer, int fullId);
@PowerNukkitOnly
diff --git a/src/main/java/cn/nukkit/level/format/FullChunk.java b/src/main/java/cn/nukkit/level/format/FullChunk.java
index a6a29a7fc3b..f832c17ca8e 100644
--- a/src/main/java/cn/nukkit/level/format/FullChunk.java
+++ b/src/main/java/cn/nukkit/level/format/FullChunk.java
@@ -172,6 +172,7 @@ default boolean setBlockState(int x, int y, int z, BlockState state) {
void recalculateHeightMap();
+ @PowerNukkitOnly
int recalculateHeightMapColumn(int chunkX, int chunkZ);
void populateSkyLight();
diff --git a/src/main/java/cn/nukkit/level/format/LevelProvider.java b/src/main/java/cn/nukkit/level/format/LevelProvider.java
index e56693aee39..208d058218b 100644
--- a/src/main/java/cn/nukkit/level/format/LevelProvider.java
+++ b/src/main/java/cn/nukkit/level/format/LevelProvider.java
@@ -1,5 +1,6 @@
package cn.nukkit.level.format;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.level.GameRules;
import cn.nukkit.level.Level;
import cn.nukkit.level.format.generic.BaseFullChunk;
@@ -112,7 +113,8 @@ default void doGarbageCollection(long time) {
GameRules getGamerules();
void setGameRules(GameRules rules);
-
+
+ @PowerNukkitOnly
default int getMaximumLayer() {
return 0;
}
diff --git a/src/main/java/cn/nukkit/level/format/anvil/Anvil.java b/src/main/java/cn/nukkit/level/format/anvil/Anvil.java
index e158aa8598b..c3ae6e016f7 100644
--- a/src/main/java/cn/nukkit/level/format/anvil/Anvil.java
+++ b/src/main/java/cn/nukkit/level/format/anvil/Anvil.java
@@ -1,31 +1,29 @@
package cn.nukkit.level.format.anvil;
import cn.nukkit.api.PowerNukkitDifference;
-import cn.nukkit.blockentity.BlockEntity;
-import cn.nukkit.blockentity.BlockEntitySpawnable;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.level.Level;
import cn.nukkit.level.format.FullChunk;
import cn.nukkit.level.format.generic.BaseFullChunk;
import cn.nukkit.level.format.generic.BaseLevelProvider;
import cn.nukkit.level.format.generic.BaseRegionLoader;
+import cn.nukkit.level.format.generic.serializer.NetworkChunkSerializer;
import cn.nukkit.level.generator.Generator;
import cn.nukkit.nbt.NBTIO;
import cn.nukkit.nbt.tag.CompoundTag;
import cn.nukkit.scheduler.AsyncTask;
import cn.nukkit.utils.BinaryStream;
import cn.nukkit.utils.ChunkException;
-import cn.nukkit.utils.ThreadCache;
import cn.nukkit.utils.Utils;
-import io.netty.util.internal.EmptyArrays;
import it.unimi.dsi.fastutil.objects.ObjectIterator;
import lombok.extern.log4j.Log4j2;
import java.io.*;
import java.nio.ByteOrder;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
+import java.util.function.BiConsumer;
import java.util.regex.Pattern;
/**
@@ -34,7 +32,9 @@
@Log4j2
public class Anvil extends BaseLevelProvider {
public static final int VERSION = 19133;
- static private final byte[] PAD_256 = new byte[256];
+ private static final byte[] PAD_256 = new byte[256];
+ @Since("1.6.0.0-PN")
+ public static final int EXTENDED_NEGATIVE_SUB_CHUNKS = 4;
public Anvil(Level level, String path) throws IOException {
super(level, path);
@@ -122,45 +122,9 @@ public AsyncTask requestChunkTask(int x, int z) throws ChunkException {
}
long timestamp = chunk.getChanges();
-
- byte[] blockEntities = EmptyArrays.EMPTY_BYTES;
-
- if (!chunk.getBlockEntities().isEmpty()) {
- List tagList = new ArrayList<>();
-
- for (BlockEntity blockEntity : chunk.getBlockEntities().values()) {
- if (blockEntity instanceof BlockEntitySpawnable) {
- tagList.add(((BlockEntitySpawnable) blockEntity).getSpawnCompound());
- }
- }
-
- try {
- blockEntities = NBTIO.write(tagList, ByteOrder.LITTLE_ENDIAN, true);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- BinaryStream stream = ThreadCache.binaryStream.get().reset();
- int count = 0;
- cn.nukkit.level.format.ChunkSection[] sections = chunk.getSections();
- for (int i = sections.length - 1; i >= 0; i--) {
- if (!sections[i].isEmpty()) {
- count = i + 1;
- break;
- }
- }
-
- for (int i = 0; i < count; i++) {
- sections[i].writeTo(stream);
- }
-
- stream.put(chunk.getBiomeIdArray());
- stream.putByte((byte) 0); // Border blocks
- stream.put(blockEntities);
-
- this.getLevel().chunkRequestCallback(timestamp, x, z, count, stream.getBuffer());
-
+ BiConsumer callback = (stream, subchunks) ->
+ this.getLevel().chunkRequestCallback(timestamp, x, z, subchunks, stream.getBuffer());
+ NetworkChunkSerializer.serialize(chunk, callback, this.level.getDimensionData());
return null;
}
@@ -272,7 +236,8 @@ protected synchronized BaseRegionLoader loadRegion(int x, int z) {
return region;
}
}
-
+
+ @PowerNukkitOnly
@Override
public int getMaximumLayer() {
return 1;
diff --git a/src/main/java/cn/nukkit/level/format/anvil/Chunk.java b/src/main/java/cn/nukkit/level/format/anvil/Chunk.java
index f18486b3de8..cec07cff45d 100644
--- a/src/main/java/cn/nukkit/level/format/anvil/Chunk.java
+++ b/src/main/java/cn/nukkit/level/format/anvil/Chunk.java
@@ -453,7 +453,7 @@ public int getBlockSkyLight(int x, int y, int z) {
if (height < y) {
return 15;
} else if (height == y) {
- return Block.transparent[getBlockId(x, y, z)] ? 15 : 0;
+ return Block.isTransparent(getBlockId(x, y, z)) ? 15 : 0;
} else {
return section.getBlockSkyLight(x, y & 0x0f, z);
}
diff --git a/src/main/java/cn/nukkit/level/format/anvil/ChunkSection.java b/src/main/java/cn/nukkit/level/format/anvil/ChunkSection.java
index 87a9c89b1da..9265615c368 100644
--- a/src/main/java/cn/nukkit/level/format/anvil/ChunkSection.java
+++ b/src/main/java/cn/nukkit/level/format/anvil/ChunkSection.java
@@ -40,7 +40,10 @@
@ParametersAreNonnullByDefault
public class ChunkSection implements cn.nukkit.level.format.ChunkSection {
+ @PowerNukkitOnly
public static final int STREAM_STORAGE_VERSION = 8;
+
+ @PowerNukkitOnly
public static final int SAVE_STORAGE_VERSION = 7;
private static final String STORAGE_TAG_NAME = "Storage";
@@ -119,12 +122,13 @@ private void loadStorage(int layer, CompoundTag storageTag) {
}
byte[] dataBytes = storageTag.getByteArray("Data");
+ NibbleArray data;
if (dataBytes.length == 0) {
- dataBytes = EmptyChunkSection.EMPTY_DATA_ARRAY;
+ data = NibbleArray.EMPTY_DATA_ARRAY;
} else {
hasBlockIds = true;
+ data = new NibbleArray(dataBytes);
}
- NibbleArray data = new NibbleArray(dataBytes);
byte[] dataExtraBytes = storageTag.getByteArray("DataExtra");
if (dataExtraBytes.length == 0) {
@@ -237,6 +241,7 @@ public int getBlockId(int x, int y, int z) {
return getBlockId(x, y, z, 0);
}
+ @PowerNukkitOnly
@Override
public int getBlockId(int x, int y, int z, int layer) {
return layerStorage.getStorageOrEmpty(layer).getBlockId(x, y, z);
@@ -247,6 +252,7 @@ public void setBlockId(int x, int y, int z, int id) {
setBlockId(x, y, z, 0, id);
}
+ @PowerNukkitOnly
@Override
public synchronized void setBlockId(int x, int y, int z, int layer, int id) {
if (id != 0) {
@@ -273,6 +279,7 @@ public boolean setFullBlockId(int x, int y, int z, int fullId) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public synchronized boolean setFullBlockId(int x, int y, int z, int layer, int fullId) {
if (fullId != 0) {
@@ -295,6 +302,7 @@ public int getBlockData(int x, int y, int z) {
@Deprecated
@DeprecationDetails(reason = "The data is limited to 32 bits", replaceWith = "getBlockState", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public int getBlockData(int x, int y, int z, int layer) {
return layerStorage.getStorageOrEmpty(layer).getBlockData(x, y, z);
@@ -309,6 +317,7 @@ public void setBlockData(int x, int y, int z, int data) {
@Deprecated
@DeprecationDetails(reason = "The data is limited to 32 bits", replaceWith = "getBlockState", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public synchronized void setBlockData(int x, int y, int z, int layer, int data) {
if (data != 0) {
@@ -328,12 +337,14 @@ public int getFullBlock(int x, int y, int z) {
return getFullBlock(x, y, z, 0);
}
+ @PowerNukkitOnly
@Nonnull
@Override
public BlockState getBlockState(int x, int y, int z, int layer) {
return layerStorage.getStorageOrEmpty(layer).getBlockState(x, y, z);
}
+ @PowerNukkitOnly
@Deprecated
@DeprecationDetails(reason = "The data is limited to 32 bits", replaceWith = "getBlockState", since = "1.4.0.0-PN")
@Override
@@ -346,6 +357,7 @@ public boolean setBlock(int x, int y, int z, int blockId) {
return setBlockStateAtLayer(x, y, z, 0, BlockState.of(blockId));
}
+ @PowerNukkitOnly
@Override
public boolean setBlockAtLayer(int x, int y, int z, int layer, int blockId) {
return setBlockStateAtLayer(x, y, z, layer, BlockState.of(blockId));
@@ -357,6 +369,7 @@ public Block getAndSetBlock(int x, int y, int z, Block block) {
return getAndSetBlock(x, y, z, 0, block);
}
+ @PowerNukkitOnly
@Nonnull
@Override
public synchronized Block getAndSetBlock(int x, int y, int z, int layer, Block block) {
@@ -402,17 +415,20 @@ public boolean setBlock(int x, int y, int z, int blockId, int meta) {
@Deprecated
@DeprecationDetails(reason = "The data is limited to 32 bits", replaceWith = "getBlockState", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public boolean setBlockAtLayer(int x, int y, int z, int layer, int blockId, int meta) {
return setBlockStateAtLayer(x, y, z, layer, BlockState.of(blockId, meta));
}
+ @PowerNukkitOnly
@Override
public synchronized boolean setBlockStateAtLayer(int x, int y, int z, int layer, BlockState state) {
BlockState previous = getAndSetBlockState(x, y, z, layer, state);
return !state.equals(previous);
}
+ @PowerNukkitOnly
@Override
public int getBlockChangeStateAbove(int x, int y, int z) {
BlockStorage storage = layerStorage.getStorageOrNull(0);
@@ -437,8 +453,8 @@ public int getBlockSkyLight(int x, int y, int z) {
} else if (compressedLight == null) {
return 15;
}
+ this.skyLight = getSkyLightArray();
}
- this.skyLight = getSkyLightArray();
int sl = this.skyLight[(y << 7) | (z << 3) | (x >> 1)] & 0xff;
if ((x & 1) == 0) {
return sl & 0x0f;
@@ -502,19 +518,22 @@ public void setBlockLight(int x, int y, int z, int level) {
@Override
public byte[] getSkyLightArray() {
- if (this.skyLight != null) return skyLight;
- if (hasSkyLight) {
- if (compressedLight != null) {
- inflate();
- return this.skyLight;
- }
- return EmptyChunkSection.EMPTY_SKY_LIGHT_ARR;
- } else {
- return EmptyChunkSection.EMPTY_LIGHT_ARR;
+ if (skyLight != null) {
+ return skyLight.clone();
}
+
+ if (!hasSkyLight) {
+ return new byte[EmptyChunkSection.EMPTY_LIGHT_ARR.length];
+ }
+
+ if (compressedLight != null && inflate() && skyLight != null) {
+ return skyLight.clone();
+ }
+
+ return EmptyChunkSection.EMPTY_SKY_LIGHT_ARR.clone();
}
- private void inflate() {
+ private boolean inflate() {
try {
if (compressedLight != null && compressedLight.length != 0) {
byte[] inflated = Zlib.inflate(compressedLight);
@@ -535,20 +554,24 @@ private void inflate() {
Arrays.fill(skyLight, (byte) 0xFF);
}
}
+ return true;
} catch (IOException e) {
log.error("Failed to decompress a chunk section", e);
+ return false;
}
}
@Override
public byte[] getLightArray() {
- if (this.blockLight != null) return blockLight;
- if (hasBlockLight) {
- inflate();
- return this.blockLight;
- } else {
- return EmptyChunkSection.EMPTY_LIGHT_ARR;
+ if (blockLight != null) {
+ return blockLight.clone();
}
+
+ if (hasBlockLight && compressedLight != null && inflate() && blockLight != null) {
+ return blockLight.clone();
+ }
+
+ return new byte[EmptyChunkSection.EMPTY_LIGHT_ARR.length];
}
@Override
@@ -652,6 +675,7 @@ private byte[] allocateBlob(List hugeList, int pos) {
return blob;
}
+ @PowerNukkitOnly
@Nonnull
@Override
public synchronized CompoundTag toNBT() {
@@ -719,8 +743,8 @@ public synchronized CompoundTag toNBT() {
if (version >= SAVE_STORAGE_VERSION) {
s.putList(storageList);
}
- s.putByteArray("BlockLight", getLightArray());
- s.putByteArray("SkyLight", getSkyLightArray());
+ s.putByteArray("BlockLight", blockLight == null? getLightArray() : blockLight);
+ s.putByteArray("SkyLight", skyLight == null? getSkyLightArray(): skyLight);
return s;
}
@@ -799,6 +823,7 @@ public synchronized List scanBlocks(LevelProvider provider, int offsetX,
return results;
}
+ @Override
@SneakyThrows(CloneNotSupportedException.class)
@Nonnull
public ChunkSection copy() {
@@ -812,7 +837,8 @@ public ChunkSection copy() {
this.hasSkyLight
);
}
-
+
+ @PowerNukkitOnly
@Override
public int getMaximumLayer() {
return 1;
@@ -832,6 +858,7 @@ public void setContentVersion(int contentVersion) {
this.contentVersion = contentVersion;
}
+ @PowerNukkitOnly
@Override
public boolean hasBlocks() {
return layerStorage.hasBlocks();
diff --git a/src/main/java/cn/nukkit/level/format/anvil/MultiLayerStorage.java b/src/main/java/cn/nukkit/level/format/anvil/MultiLayerStorage.java
index 899f13a9024..d80d8d86217 100644
--- a/src/main/java/cn/nukkit/level/format/anvil/MultiLayerStorage.java
+++ b/src/main/java/cn/nukkit/level/format/anvil/MultiLayerStorage.java
@@ -168,7 +168,6 @@ public boolean hasBlocks() {
}
@Since("1.4.0.0-PN")
- @PowerNukkitOnly
@SneakyThrows(CloneNotSupportedException.class)
@Override
public MultiLayerStorage clone() {
diff --git a/src/main/java/cn/nukkit/level/format/anvil/palette/BiomePalette.java b/src/main/java/cn/nukkit/level/format/anvil/palette/BiomePalette.java
index 0aa025eb075..38adcc35cf5 100644
--- a/src/main/java/cn/nukkit/level/format/anvil/palette/BiomePalette.java
+++ b/src/main/java/cn/nukkit/level/format/anvil/palette/BiomePalette.java
@@ -118,6 +118,7 @@ public int getIndex(int x, int z) {
return (z << 4) | x;
}
+ @Override
public synchronized BiomePalette clone() {
return new BiomePalette(this);
}
diff --git a/src/main/java/cn/nukkit/level/format/anvil/palette/BitArray256.java b/src/main/java/cn/nukkit/level/format/anvil/palette/BitArray256.java
index 4a60bbfadb1..0129c10d036 100644
--- a/src/main/java/cn/nukkit/level/format/anvil/palette/BitArray256.java
+++ b/src/main/java/cn/nukkit/level/format/anvil/palette/BitArray256.java
@@ -85,6 +85,7 @@ public final int[] toRaw() {
return toRaw(new int[256]);
}
+ @Override
public BitArray256 clone() {
return new BitArray256(this);
}
diff --git a/src/main/java/cn/nukkit/level/format/anvil/palette/BlockDataPalette.java b/src/main/java/cn/nukkit/level/format/anvil/palette/BlockDataPalette.java
index 3f8784b36ed..f9737fb6062 100644
--- a/src/main/java/cn/nukkit/level/format/anvil/palette/BlockDataPalette.java
+++ b/src/main/java/cn/nukkit/level/format/anvil/palette/BlockDataPalette.java
@@ -214,6 +214,7 @@ public synchronized boolean compress() {
return false;
}
+ @Override
public synchronized BlockDataPalette clone() {
char[] raw = getRaw();
return new BlockDataPalette(raw.clone());
diff --git a/src/main/java/cn/nukkit/level/format/anvil/palette/IntPalette.java b/src/main/java/cn/nukkit/level/format/anvil/palette/IntPalette.java
index 0c22d0c362e..2bf46a86711 100644
--- a/src/main/java/cn/nukkit/level/format/anvil/palette/IntPalette.java
+++ b/src/main/java/cn/nukkit/level/format/anvil/palette/IntPalette.java
@@ -96,6 +96,7 @@ public int length() {
return keys.length;
}
+ @Override
public IntPalette clone() {
IntPalette p = new IntPalette();
p.keys = this.keys != EmptyArrays.EMPTY_INTS ? this.keys.clone() : EmptyArrays.EMPTY_INTS;
diff --git a/src/main/java/cn/nukkit/level/format/anvil/util/BlockStorage.java b/src/main/java/cn/nukkit/level/format/anvil/util/BlockStorage.java
index 853988b3b94..6b5eaf7fecc 100644
--- a/src/main/java/cn/nukkit/level/format/anvil/util/BlockStorage.java
+++ b/src/main/java/cn/nukkit/level/format/anvil/util/BlockStorage.java
@@ -49,8 +49,8 @@ public class BlockStorage {
private static final int BLOCK_ID_MASK = 0x00FF;
private static final int BLOCK_ID_EXTRA_MASK = 0xFF00;
private static final int BLOCK_ID_FULL = BLOCK_ID_MASK | BLOCK_ID_EXTRA_MASK;
-
- public static final int SECTION_SIZE = 4096;
+
+ @PowerNukkitOnly public static final int SECTION_SIZE = 4096;
private static final BlockState[] EMPTY = new BlockState[SECTION_SIZE];
static {
@@ -65,10 +65,9 @@ public class BlockStorage {
public BlockStorage() {
states = EMPTY.clone();
- palette = new PalettedBlockStorage();
+ palette = PalettedBlockStorage.createFromBlockPalette();
}
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
@API(definition = INTERNAL, usage = BLEEDING)
BlockStorage(BlockState[] states, byte flags, PalettedBlockStorage palette, @Nullable BitSet denyStates) {
@@ -79,11 +78,22 @@ public BlockStorage() {
}
private static int getIndex(int x, int y, int z) {
+ checkArg(x, "x");
+ checkArg(x, "y");
+ checkArg(x, "z");
int index = (x << 8) + (z << 4) + y; // XZY = Bedrock format
Preconditions.checkArgument(index >= 0 && index < SECTION_SIZE, "Invalid index");
return index;
}
+ private static void checkArg(int pos, String arg) {
+ try {
+ Preconditions.checkElementIndex(pos, 16, arg);
+ } catch (IndexOutOfBoundsException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
@Nonnegative
@@ -431,7 +441,6 @@ private byte computeFlags(byte newFlags, BlockState... states) {
}
@Since("1.4.0.0-PN")
- @PowerNukkitOnly
public BlockStorage copy() {
BitSet deny = denyStates;
return new BlockStorage(states.clone(), flags, palette.copy(), (BitSet) (deny != null? deny.clone() : null));
@@ -456,14 +465,17 @@ private void setFlag(byte flag, boolean value) {
}
}
+ @PowerNukkitOnly
public boolean hasBlockIds() {
return getFlag(FLAG_HAS_ID);
}
+ @PowerNukkitOnly
public boolean hasBlockIdExtras() {
return getFlag(FLAG_HAS_ID_EXTRA);
}
+ @PowerNukkitOnly
public boolean hasBlockDataExtras() {
return getFlag(FLAG_HAS_DATA_EXTRA);
}
diff --git a/src/main/java/cn/nukkit/level/format/anvil/util/ImmutableBlockStorage.java b/src/main/java/cn/nukkit/level/format/anvil/util/ImmutableBlockStorage.java
index b0d5a341664..c37cab3b82c 100644
--- a/src/main/java/cn/nukkit/level/format/anvil/util/ImmutableBlockStorage.java
+++ b/src/main/java/cn/nukkit/level/format/anvil/util/ImmutableBlockStorage.java
@@ -49,6 +49,7 @@ public final class ImmutableBlockStorage extends BlockStorage {
super(states.clone(), flags, palette.copy(), denyStates != null? (BitSet)denyStates.clone() : null);
}
+ @PowerNukkitOnly
@Override
protected BlockState setBlockState(int index, @Nonnull BlockState state) {
throw new UnsupportedOperationException("This BlockStorage is immutable");
diff --git a/src/main/java/cn/nukkit/level/format/anvil/util/NibbleArray.java b/src/main/java/cn/nukkit/level/format/anvil/util/NibbleArray.java
index 45ebe670cc8..3fe97a43acb 100644
--- a/src/main/java/cn/nukkit/level/format/anvil/util/NibbleArray.java
+++ b/src/main/java/cn/nukkit/level/format/anvil/util/NibbleArray.java
@@ -1,9 +1,16 @@
package cn.nukkit.level.format.anvil.util;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+import cn.nukkit.level.format.generic.EmptyChunkSection;
import com.google.common.base.Preconditions;
public class NibbleArray implements Cloneable {
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public static final NibbleArray EMPTY_DATA_ARRAY = new NibbleArray(EmptyChunkSection.EMPTY_DATA_ARRAY);
+
private final byte[] data;
public NibbleArray(int length) {
diff --git a/src/main/java/cn/nukkit/level/format/generic/BaseChunk.java b/src/main/java/cn/nukkit/level/format/generic/BaseChunk.java
index a9814bccf86..41b6a29bfcd 100644
--- a/src/main/java/cn/nukkit/level/format/generic/BaseChunk.java
+++ b/src/main/java/cn/nukkit/level/format/generic/BaseChunk.java
@@ -185,7 +185,6 @@ public boolean setFullBlockId(int x, int y, int z, int layer, int fullId) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
- @PowerNukkitOnly
@Override
public boolean setBlock(int x, int y, int z, int blockId, int meta) {
return this.setBlockAtLayer(x, y, z, 0, blockId, meta);
@@ -271,6 +270,7 @@ public int getBlockData(int x, int y, int z) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
@Override
+ @PowerNukkitOnly
public int getBlockData(int x, int y, int z, int layer) {
return this.sections[y >> 4].getBlockData(x, y & 0x0f, z, layer);
}
@@ -284,6 +284,7 @@ public void setBlockData(int x, int y, int z, int data) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public void setBlockData(int x, int y, int z, int layer, int data) {
int sectionY = y >> 4;
@@ -395,14 +396,16 @@ public LevelProvider getProvider() {
@Since("1.4.0.0-PN")
@Override
public boolean setBlockStateAt(int x, int y, int z, int layer, BlockState state) {
- return setBlockStateAtLayer(x, y, z, layer, state);
+ return setBlockStateAtLayer(x & 0xF, y, z & 0XF, layer, state);
}
+ @PowerNukkitOnly
@Override
public BlockState getBlockStateAt(int x, int y, int z, int layer) {
- return getBlockState(x, y, z, layer);
+ return getBlockState(x & 0xF, y, z & 0xF, layer);
}
+ @PowerNukkitOnly
@Override
public boolean isBlockChangeAllowed(int x, int y, int z) {
for (ChunkSection section: sections) {
@@ -436,6 +439,7 @@ public boolean isBlockChangeAllowed(int x, int y, int z) {
}
@Nonnull
+ @PowerNukkitOnly
@Override
public List findBorders(int x, int z) {
List borders = null;
@@ -455,6 +459,7 @@ public List findBorders(int x, int z) {
return borders != null? borders : Collections.emptyList();
}
+ @PowerNukkitOnly
@Override
public boolean isBlockedByBorder(int x, int z) {
for (ChunkSection section : sections) {
diff --git a/src/main/java/cn/nukkit/level/format/generic/BaseFullChunk.java b/src/main/java/cn/nukkit/level/format/generic/BaseFullChunk.java
index 11326b82493..b704b4158d2 100644
--- a/src/main/java/cn/nukkit/level/format/generic/BaseFullChunk.java
+++ b/src/main/java/cn/nukkit/level/format/generic/BaseFullChunk.java
@@ -2,7 +2,6 @@
import cn.nukkit.Player;
import cn.nukkit.api.DeprecationDetails;
-import cn.nukkit.api.PowerNukkitDifference;
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
@@ -131,6 +130,7 @@ public void backwardCompatibilityUpdate(Level level) {
// Does nothing here
}
+ @Override
public void initChunk() {
if (this.getProvider() != null && !this.isInit) {
boolean changed = false;
@@ -207,11 +207,13 @@ public void setPosition(int x, int z) {
this.hash = Level.chunkHash(x, z);
}
+ @Override
public final void setX(int x) {
this.x = x;
this.hash = Level.chunkHash(x, getZ());
}
+ @Override
public final void setZ(int z) {
this.z = z;
this.hash = Level.chunkHash(getX(), z);
@@ -225,6 +227,10 @@ public LevelProvider getProvider() {
@Override
public void setProvider(LevelProvider provider) {
this.provider = provider;
+
+ if(provider != null) {
+ this.providerClass = provider.getClass();
+ }
}
@Override
@@ -257,12 +263,13 @@ public void recalculateHeightMap() {
}
}
+ @PowerNukkitOnly
@Override
public int recalculateHeightMapColumn(int x, int z) {
int max = getHighestBlockAt(x, z, false);
int y;
for (y = max; y >= 0; --y) {
- if (Block.lightFilter[getBlockIdAt(x, y, z)] > 1 || Block.diffusesSkyLight[getBlockIdAt(x, y, z)]) {
+ if (Block.getLightFilter(getBlockIdAt(x, y, z)) > 1 || Block.diffusesSkyLight(getBlockIdAt(x, y, z))) {
break;
}
}
@@ -332,14 +339,14 @@ public void populateSkyLight() {
// START of checks for the next block
int id = this.getBlockId(x, y, z);
- if (!Block.transparent[id]) { // if we encounter an opaque block, all the blocks under it will
+ if (!Block.isTransparent(id)) { // if we encounter an opaque block, all the blocks under it will
// have a skylight value of 0 (the block itself has a value of 15, if it's a top-most block)
nextLight = 0;
- } else if (Block.diffusesSkyLight[id]) {
+ } else if (Block.diffusesSkyLight(id)) {
nextDecrease += 1; // skylight value decreases by one for each block under a block
// that diffuses skylight. The block itself has a value of 15 (if it's a top-most block)
} else {
- nextDecrease -= Block.lightFilter[id]; // blocks under a light filtering block will have a skylight value
+ nextDecrease -= Block.getLightFilter(id); // blocks under a light filtering block will have a skylight value
// decreased by the lightFilter value of that block. The block itself
// has a value of 15 (if it's a top-most block)
}
@@ -567,6 +574,7 @@ public int getBlockIdAt(int x, int y, int z) {
return getBlockIdAt(x, y, z, 0);
}
+ @PowerNukkitOnly
@Override
public int getBlockIdAt(int x, int y, int z, int layer) {
if (x >> 4 == getX() && z >> 4 == getZ()) {
@@ -584,6 +592,7 @@ public void setBlockFullIdAt(int x, int y, int z, int fullId) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public void setBlockFullIdAt(int x, int y, int z, int layer, int fullId) {
if (x >> 4 == getX() && z >> 4 == getZ()) {
@@ -591,6 +600,7 @@ public void setBlockFullIdAt(int x, int y, int z, int layer, int fullId) {
}
}
+ @PowerNukkitOnly
@Override
public boolean setBlockAtLayer(int x, int y, int z, int layer, int blockId) {
return setBlockStateAtLayer(x, y, z, layer, BlockState.of(blockId));
@@ -598,6 +608,7 @@ public boolean setBlockAtLayer(int x, int y, int z, int layer, int blockId) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public boolean setBlockAtLayer(int x, int y, int z, int layer, int blockId, int meta) {
return setBlockStateAtLayer(x, y, z, layer, BlockState.of(blockId, meta));
@@ -608,6 +619,7 @@ public void setBlockIdAt(int x, int y, int z, int id) {
setBlockIdAt(x, y, z, 0, id);
}
+ @PowerNukkitOnly
@Override
public void setBlockIdAt(int x, int y, int z, int layer, int id) {
if (x >> 4 == getX() && z >> 4 == getZ()) {
@@ -634,7 +646,7 @@ public int getBlockDataAt(int x, int y, int z) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
@Override
- @PowerNukkitDifference(info = "Was returning the block id instead of the data", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
public int getBlockDataAt(int x, int y, int z, int layer) {
if (x >> 4 == getX() && z >> 4 == getZ()) {
return getBlockData(x & 15, y, z & 15, layer);
@@ -651,6 +663,7 @@ public void setBlockDataAt(int x, int y, int z, int data) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public void setBlockDataAt(int x, int y, int z, int layer, int data) {
if (x >> 4 == getX() && z >> 4 == getZ()) {
diff --git a/src/main/java/cn/nukkit/level/format/generic/BaseLevelProvider.java b/src/main/java/cn/nukkit/level/format/generic/BaseLevelProvider.java
index ea90e133c25..3a81b0ab20e 100644
--- a/src/main/java/cn/nukkit/level/format/generic/BaseLevelProvider.java
+++ b/src/main/java/cn/nukkit/level/format/generic/BaseLevelProvider.java
@@ -364,6 +364,7 @@ public void saveLevelData() {
}
}
+ @Override
public void updateLevelName(String name) {
if (!this.getName().equals(name)) {
this.levelData.putString("LevelName", name);
diff --git a/src/main/java/cn/nukkit/level/format/generic/EmptyChunkSection.java b/src/main/java/cn/nukkit/level/format/generic/EmptyChunkSection.java
index 6f4fab1d299..4be9320b818 100644
--- a/src/main/java/cn/nukkit/level/format/generic/EmptyChunkSection.java
+++ b/src/main/java/cn/nukkit/level/format/generic/EmptyChunkSection.java
@@ -37,7 +37,7 @@ public class EmptyChunkSection implements ChunkSection {
private static final byte[] EMPTY_2KB = new byte[2048];
public static final byte[] EMPTY_LIGHT_ARR = EMPTY_2KB;
- public static final byte[] EMPTY_SKY_LIGHT_ARR = new byte[2048];
+ public static final byte[] EMPTY_SKY_LIGHT_ARR = new byte[2048]; // Filled with 0xFF
static {
Arrays.fill(EMPTY_SKY_LIGHT_ARR, (byte) 255);
}
@@ -68,6 +68,7 @@ public final int getBlockId(int x, int y, int z) {
return 0;
}
+ @PowerNukkitOnly
@Override
public int getBlockId(int x, int y, int z, int layer) {
return 0;
@@ -78,18 +79,21 @@ public int getFullBlock(int x, int y, int z) {
return 0;
}
+ @PowerNukkitOnly
@Nonnull
@Override
public BlockState getBlockState(int x, int y, int z, int layer) {
return BlockState.AIR;
}
+ @PowerNukkitOnly
@Override
public boolean setBlockAtLayer(int x, int y, int z, int layer, int blockId) {
if (blockId != 0) throw new ChunkException(MODIFICATION_ERROR_MESSAGE);
return false;
}
+ @PowerNukkitOnly
@Nonnull
@Override
public Block getAndSetBlock(int x, int y, int z, int layer, Block block) {
@@ -113,6 +117,7 @@ public BlockState getAndSetBlockState(int x, int y, int z, int layer, BlockState
return BlockState.AIR;
}
+ @PowerNukkitOnly
@Override
public void setBlockId(int x, int y, int z, int layer, int id) {
if (id != 0) throw new ChunkException(MODIFICATION_ERROR_MESSAGE);
@@ -134,12 +139,14 @@ public boolean setBlock(int x, int y, int z, int blockId, int meta) {
@Deprecated
@DeprecationDetails(reason = "The data is limited to 32 bits", replaceWith = "getBlockState", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public boolean setBlockAtLayer(int x, int y, int z, int layer, int blockId, int meta) {
if (blockId != 0) throw new ChunkException(MODIFICATION_ERROR_MESSAGE);
return false;
}
+ @PowerNukkitOnly
@Override
public boolean setBlockStateAtLayer(int x, int y, int z, int layer, BlockState state) {
if (!state.equals(BlockState.AIR)) throw new ChunkException(MODIFICATION_ERROR_MESSAGE);
@@ -170,6 +177,7 @@ public final int getBlockData(int x, int y, int z) {
@Deprecated
@DeprecationDetails(reason = "The data is limited to 32 bits", replaceWith = "getBlockState", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public int getBlockData(int x, int y, int z, int layer) {
return 0;
@@ -184,6 +192,7 @@ public void setBlockData(int x, int y, int z, int data) {
@Deprecated
@DeprecationDetails(reason = "The data is limited to 32 bits", replaceWith = "getBlockState", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public void setBlockData(int x, int y, int z, int layer, int data) {
if (data != 0) throw new ChunkException(MODIFICATION_ERROR_MESSAGE);
@@ -199,12 +208,14 @@ public boolean setFullBlockId(int x, int y, int z, int fullId) {
@Deprecated
@DeprecationDetails(reason = "The data is limited to 32 bits", replaceWith = "getBlockState", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public boolean setFullBlockId(int x, int y, int z, int layer, int fullId) {
if (fullId != 0) throw new ChunkException(MODIFICATION_ERROR_MESSAGE);
return false;
}
+ @PowerNukkitOnly
@Deprecated
@DeprecationDetails(reason = "The data is limited to 32 bits", replaceWith = "getBlockState", since = "1.4.0.0-PN")
@Override
@@ -241,12 +252,14 @@ public boolean isEmpty() {
public void writeTo(@Nonnull BinaryStream stream) {
stream.put(EMPTY_CHUNK_DATA);
}
-
+
+ @PowerNukkitOnly
@Override
public int getMaximumLayer() {
return 0;
}
-
+
+ @PowerNukkitOnly
@Nonnull
@Override
public CompoundTag toNBT() {
@@ -275,6 +288,7 @@ public void setContentVersion(int contentVersion) {
}
}
+ @PowerNukkitOnly
@Override
public int getBlockChangeStateAbove(int x, int y, int z) {
return 0;
diff --git a/src/main/java/cn/nukkit/level/format/generic/serializer/NetworkChunkSerializer.java b/src/main/java/cn/nukkit/level/format/generic/serializer/NetworkChunkSerializer.java
new file mode 100644
index 00000000000..0a8478d6334
--- /dev/null
+++ b/src/main/java/cn/nukkit/level/format/generic/serializer/NetworkChunkSerializer.java
@@ -0,0 +1,120 @@
+package cn.nukkit.level.format.generic.serializer;
+
+import cn.nukkit.api.Since;
+import cn.nukkit.blockentity.BlockEntity;
+import cn.nukkit.blockentity.BlockEntitySpawnable;
+import cn.nukkit.level.DimensionData;
+import cn.nukkit.level.Level;
+import cn.nukkit.level.biome.Biome;
+import cn.nukkit.level.format.ChunkSection;
+import cn.nukkit.level.format.generic.BaseChunk;
+import cn.nukkit.level.format.generic.BaseFullChunk;
+import cn.nukkit.level.util.PalettedBlockStorage;
+import cn.nukkit.nbt.NBTIO;
+import cn.nukkit.nbt.tag.CompoundTag;
+import cn.nukkit.utils.BinaryStream;
+import cn.nukkit.utils.ThreadCache;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+
+import java.io.IOException;
+import java.nio.ByteOrder;
+import java.util.List;
+import java.util.function.BiConsumer;
+
+@Since("1.6.0.0-PN")
+public class NetworkChunkSerializer {
+
+ private static final int EXTENDED_NEGATIVE_SUB_CHUNKS = 4;
+
+ private static final byte[] negativeSubChunks;
+
+ static {
+ // Build up 4 SubChunks for the extended negative height
+ BinaryStream stream = new BinaryStream();
+ for (int i = 0; i < EXTENDED_NEGATIVE_SUB_CHUNKS; i++) {
+ stream.putByte((byte) 8); // SubChunk version
+ stream.putByte((byte) 0); // 0 layers
+ }
+ negativeSubChunks = stream.getBuffer();
+ }
+
+ @Since("1.6.0.0-PN")
+ public static void serialize(BaseChunk chunk, BiConsumer callback, DimensionData dimensionData) {
+ byte[] blockEntities;
+ if (chunk.getBlockEntities().isEmpty()) {
+ blockEntities = new byte[0];
+ } else {
+ blockEntities = serializeEntities(chunk);
+ }
+
+ int subChunkCount = 0;
+ ChunkSection[] sections = chunk.getSections();
+ for (int i = sections.length - 1; i >= 0; i--) {
+ if (!sections[i].isEmpty()) {
+ subChunkCount = i + 1;
+ break;
+ }
+ }
+
+ int maxDimensionSections = dimensionData.getHeight() >> 4;
+ subChunkCount = Math.min(maxDimensionSections, subChunkCount);
+
+ // In 1.18 3D biome palettes were introduced. However, current world format
+ // used internally doesn't support them, so we need to convert from legacy 2D
+ byte[] biomePalettes = convert2DBiomesTo3D(chunk, maxDimensionSections);
+ BinaryStream stream = ThreadCache.binaryStream.get().reset();
+
+ // Overworld has negative coordinates, but we currently do not support them
+ int writtenSections = subChunkCount;
+ if (dimensionData.getDimensionId() == Level.DIMENSION_OVERWORLD && subChunkCount < maxDimensionSections) {
+ stream.put(negativeSubChunks);
+ writtenSections += EXTENDED_NEGATIVE_SUB_CHUNKS;
+ }
+
+ for (int i = 0; i < subChunkCount; i++) {
+ sections[i].writeTo(stream);
+ }
+
+ stream.put(biomePalettes);
+ stream.putByte((byte) 0); // Border blocks
+ stream.put(blockEntities);
+ callback.accept(stream, writtenSections);
+ }
+
+ private static byte[] serializeEntities(BaseChunk chunk) {
+ List tagList = new ObjectArrayList<>();
+ for (BlockEntity blockEntity : chunk.getBlockEntities().values()) {
+ if (blockEntity instanceof BlockEntitySpawnable) {
+ tagList.add(((BlockEntitySpawnable) blockEntity).getSpawnCompound());
+ }
+ }
+
+ try {
+ return NBTIO.write(tagList, ByteOrder.LITTLE_ENDIAN, true);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private static byte[] convert2DBiomesTo3D(BaseFullChunk chunk, int sections) {
+ PalettedBlockStorage palette = PalettedBlockStorage.createWithDefaultState(Biome.getBiomeIdOrCorrect(chunk.getBiomeId(0, 0)));
+ for (int x = 0; x < 16; x++) {
+ for (int z = 0; z < 16; z++) {
+ int biomeId = Biome.getBiomeIdOrCorrect(chunk.getBiomeId(x, z));
+ for (int y = 0; y < 16; y++) {
+ palette.setBlock(x, y, z, biomeId);
+ }
+ }
+ }
+
+ BinaryStream stream = ThreadCache.binaryStream.get().reset();
+ palette.writeTo(stream);
+ byte[] bytes = stream.getBuffer();
+ stream.reset();
+
+ for (int i = 0; i < sections; i++) {
+ stream.put(bytes);
+ }
+ return stream.getBuffer();
+ }
+}
diff --git a/src/main/java/cn/nukkit/level/format/updater/BeehiveUpdater.java b/src/main/java/cn/nukkit/level/format/updater/BeehiveUpdater.java
index 2170cc728e2..98bd7f151bb 100644
--- a/src/main/java/cn/nukkit/level/format/updater/BeehiveUpdater.java
+++ b/src/main/java/cn/nukkit/level/format/updater/BeehiveUpdater.java
@@ -20,6 +20,7 @@ public BeehiveUpdater(ChunkSection section, boolean updateDirection) {
this.updateDirection = updateDirection;
}
+ @PowerNukkitOnly
@Override
public boolean update(int offsetX, int offsetY, int offsetZ, int x, int y, int z, BlockState state) {
int blockId = state.getBlockId();
diff --git a/src/main/java/cn/nukkit/level/format/updater/DoorUpdater.java b/src/main/java/cn/nukkit/level/format/updater/DoorUpdater.java
index e2071b51114..79350774a92 100644
--- a/src/main/java/cn/nukkit/level/format/updater/DoorUpdater.java
+++ b/src/main/java/cn/nukkit/level/format/updater/DoorUpdater.java
@@ -29,6 +29,7 @@ public DoorUpdater(Chunk chunk, ChunkSection section) {
this.section = section;
}
+ @PowerNukkitOnly
@Override
public boolean update(int offsetX, int offsetY, int offsetZ, int x, int y, int z, BlockState state) {
switch (state.getBlockId()) {
diff --git a/src/main/java/cn/nukkit/level/format/updater/FrameUpdater.java b/src/main/java/cn/nukkit/level/format/updater/FrameUpdater.java
index cee52a3963e..87885b4634c 100644
--- a/src/main/java/cn/nukkit/level/format/updater/FrameUpdater.java
+++ b/src/main/java/cn/nukkit/level/format/updater/FrameUpdater.java
@@ -21,6 +21,7 @@ public FrameUpdater(ChunkSection section) {
this.section = section;
}
+ @PowerNukkitOnly
@Override
public boolean update(int offsetX, int offsetY, int offsetZ, int x, int y, int z, BlockState state) {
if (state.getBlockId() != BlockID.ITEM_FRAME_BLOCK) {
diff --git a/src/main/java/cn/nukkit/level/format/updater/GroupedUpdaters.java b/src/main/java/cn/nukkit/level/format/updater/GroupedUpdaters.java
index ac4fe8af576..33d22220764 100644
--- a/src/main/java/cn/nukkit/level/format/updater/GroupedUpdaters.java
+++ b/src/main/java/cn/nukkit/level/format/updater/GroupedUpdaters.java
@@ -15,6 +15,7 @@ public GroupedUpdaters(Updater... updaters) {
this.updaters = updaters;
}
+ @PowerNukkitOnly
@Override
public boolean update(int offsetX, int offsetY, int offsetZ, int x, int y, int z, BlockState state) {
for (Updater updater : updaters) {
diff --git a/src/main/java/cn/nukkit/level/format/updater/MesaBiomeUpdater.java b/src/main/java/cn/nukkit/level/format/updater/MesaBiomeUpdater.java
index 6c2ffa30b79..87ce0c4a2f6 100644
--- a/src/main/java/cn/nukkit/level/format/updater/MesaBiomeUpdater.java
+++ b/src/main/java/cn/nukkit/level/format/updater/MesaBiomeUpdater.java
@@ -17,6 +17,7 @@ public MesaBiomeUpdater(ChunkSection section) {
this.section = section;
}
+ @PowerNukkitOnly
@SuppressWarnings("deprecation")
@Override
public boolean update(int offsetX, int offsetY, int offsetZ, int x, int y, int z, BlockState state) {
diff --git a/src/main/java/cn/nukkit/level/format/updater/NewLeafUpdater.java b/src/main/java/cn/nukkit/level/format/updater/NewLeafUpdater.java
index 7f83e19c1ba..73e70056c03 100644
--- a/src/main/java/cn/nukkit/level/format/updater/NewLeafUpdater.java
+++ b/src/main/java/cn/nukkit/level/format/updater/NewLeafUpdater.java
@@ -18,6 +18,7 @@ public NewLeafUpdater(ChunkSection section) {
this.section = section;
}
+ @PowerNukkitOnly
@Override
public boolean update(int offsetX, int offsetY, int offsetZ, int x, int y, int z, BlockState state) {
if (state.getBlockId() == BlockID.LEAVES2) {
diff --git a/src/main/java/cn/nukkit/level/format/updater/OldWoodBarkUpdater.java b/src/main/java/cn/nukkit/level/format/updater/OldWoodBarkUpdater.java
index ecf030f1dcf..ec851fbfeab 100644
--- a/src/main/java/cn/nukkit/level/format/updater/OldWoodBarkUpdater.java
+++ b/src/main/java/cn/nukkit/level/format/updater/OldWoodBarkUpdater.java
@@ -21,6 +21,7 @@ public OldWoodBarkUpdater(ChunkSection section, int fromLog, int increment) {
this.increment = increment;
}
+ @PowerNukkitOnly
@Override
public boolean update(int offsetX, int offsetY, int offsetZ, int x, int y, int z, BlockState state) {
if (state.getBlockId() != fromLog) {
diff --git a/src/main/java/cn/nukkit/level/format/updater/SnowLayerUpdater.java b/src/main/java/cn/nukkit/level/format/updater/SnowLayerUpdater.java
index 2f57693789e..b27a4b20316 100644
--- a/src/main/java/cn/nukkit/level/format/updater/SnowLayerUpdater.java
+++ b/src/main/java/cn/nukkit/level/format/updater/SnowLayerUpdater.java
@@ -21,6 +21,7 @@ public SnowLayerUpdater(Level level, ChunkSection section) {
this.section = section;
}
+ @PowerNukkitOnly
@Override
public boolean update(int offsetX, int offsetY, int offsetZ, int x, int y, int z, BlockState state) {
if (state.getBlockId() != BlockID.SNOW_LAYER) {
diff --git a/src/main/java/cn/nukkit/level/format/updater/StemStrippedUpdater.java b/src/main/java/cn/nukkit/level/format/updater/StemStrippedUpdater.java
index a94ab8741ae..40ad3e986f1 100644
--- a/src/main/java/cn/nukkit/level/format/updater/StemStrippedUpdater.java
+++ b/src/main/java/cn/nukkit/level/format/updater/StemStrippedUpdater.java
@@ -25,6 +25,7 @@ public StemStrippedUpdater(ChunkSection section) {
this.section = section;
}
+ @PowerNukkitOnly
@Override
public boolean update(int offsetX, int offsetY, int offsetZ, int x, int y, int z, BlockState state) {
switch (state.getBlockId()) {
diff --git a/src/main/java/cn/nukkit/level/format/updater/StemUpdater.java b/src/main/java/cn/nukkit/level/format/updater/StemUpdater.java
index ed12755b1a7..368bce4016b 100644
--- a/src/main/java/cn/nukkit/level/format/updater/StemUpdater.java
+++ b/src/main/java/cn/nukkit/level/format/updater/StemUpdater.java
@@ -26,6 +26,7 @@ public StemUpdater(Level level, ChunkSection section, int stemId, int productId)
this.productId = productId;
}
+ @PowerNukkitOnly
@Override
public boolean update(int offsetX, int offsetY, int offsetZ, int x, int y, int z, BlockState state) {
if (state.getBlockId() != stemId) {
diff --git a/src/main/java/cn/nukkit/level/format/updater/WallUpdater.java b/src/main/java/cn/nukkit/level/format/updater/WallUpdater.java
index 01882ad9c63..543d3cdc8a2 100644
--- a/src/main/java/cn/nukkit/level/format/updater/WallUpdater.java
+++ b/src/main/java/cn/nukkit/level/format/updater/WallUpdater.java
@@ -27,6 +27,7 @@ public WallUpdater(Level level, ChunkSection section) {
this.section = section;
}
+ @PowerNukkitOnly
@Override
public boolean update(int offsetX, int offsetY, int offsetZ, int x, int y, int z, BlockState state) {
if (state.getBlockId() != BlockID.COBBLE_WALL) {
diff --git a/src/main/java/cn/nukkit/level/generator/Flat.java b/src/main/java/cn/nukkit/level/generator/Flat.java
index 6a6d4c72b59..b9f47d6d384 100644
--- a/src/main/java/cn/nukkit/level/generator/Flat.java
+++ b/src/main/java/cn/nukkit/level/generator/Flat.java
@@ -1,6 +1,5 @@
package cn.nukkit.level.generator;
-import cn.nukkit.Server;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockID;
import cn.nukkit.level.ChunkManager;
diff --git a/src/main/java/cn/nukkit/level/generator/Generator.java b/src/main/java/cn/nukkit/level/generator/Generator.java
index 4659e3b0e2b..4c9e9f55340 100644
--- a/src/main/java/cn/nukkit/level/generator/Generator.java
+++ b/src/main/java/cn/nukkit/level/generator/Generator.java
@@ -1,7 +1,10 @@
package cn.nukkit.level.generator;
+import cn.nukkit.api.Since;
import cn.nukkit.block.BlockID;
import cn.nukkit.level.ChunkManager;
+import cn.nukkit.level.DimensionData;
+import cn.nukkit.level.DimensionEnum;
import cn.nukkit.level.Level;
import cn.nukkit.math.NukkitRandom;
import cn.nukkit.math.Vector3;
@@ -20,6 +23,16 @@ public abstract class Generator implements BlockID {
public abstract int getId();
+ @Since("1.6.0.0-PN")
+ public DimensionData getDimensionData() {
+ DimensionData dimensionData = DimensionEnum.getDataFromId(this.getDimension());
+ if (dimensionData == null) {
+ dimensionData = DimensionEnum.OVERWORLD.getDimensionData();
+ }
+ return dimensionData;
+ }
+
+ @Deprecated
public int getDimension() {
return Level.DIMENSION_OVERWORLD;
}
diff --git a/src/main/java/cn/nukkit/level/generator/Nether.java b/src/main/java/cn/nukkit/level/generator/Nether.java
index 64d7a9b08cd..5f250f433f7 100644
--- a/src/main/java/cn/nukkit/level/generator/Nether.java
+++ b/src/main/java/cn/nukkit/level/generator/Nether.java
@@ -154,6 +154,7 @@ public void populateChunk(int chunkX, int chunkZ) {
biome.populateChunk(this.level, chunkX, chunkZ, this.nukkitRandom);
}
+ @Override
public Vector3 getSpawn() {
return new Vector3(0, 64, 0);
}
diff --git a/src/main/java/cn/nukkit/level/generator/SimpleChunkManager.java b/src/main/java/cn/nukkit/level/generator/SimpleChunkManager.java
index 8160c302ef7..75f3fc60e1f 100644
--- a/src/main/java/cn/nukkit/level/generator/SimpleChunkManager.java
+++ b/src/main/java/cn/nukkit/level/generator/SimpleChunkManager.java
@@ -23,6 +23,7 @@ public int getBlockIdAt(int x, int y, int z) {
return getBlockIdAt(x, y, z, 0);
}
+ @PowerNukkitOnly
@Override
public int getBlockIdAt(int x, int y, int z, int layer) {
FullChunk chunk = this.getChunk(x >> 4, z >> 4);
@@ -32,6 +33,7 @@ public int getBlockIdAt(int x, int y, int z, int layer) {
return 0;
}
+ @PowerNukkitOnly
@Override
public BlockState getBlockStateAt(int x, int y, int z, int layer) {
FullChunk chunk = this.getChunk(x >> 4, z >> 4);
@@ -46,6 +48,7 @@ public void setBlockIdAt(int x, int y, int z, int id) {
setBlockIdAt(x, y, z, 0, id);
}
+ @PowerNukkitOnly
@Override
public void setBlockIdAt(int x, int y, int z, int layer, int id) {
FullChunk chunk = this.getChunk(x >> 4, z >> 4);
@@ -63,11 +66,12 @@ public void setBlockAt(int x, int y, int z, int id, int data) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public boolean setBlockAtLayer(int x, int y, int z, int layer, int id, int data) {
FullChunk chunk = this.getChunk(x >> 4, z >> 4);
if (chunk != null) {
- return chunk.setBlock(x & 0xf, y & 0xff, z & 0xf, id, data);
+ return chunk.setBlockAtLayer(x & 0xf, y & 0xff, z & 0xf, layer, id, data);
}
return false;
}
@@ -81,6 +85,7 @@ public void setBlockFullIdAt(int x, int y, int z, int fullId) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public void setBlockFullIdAt(int x, int y, int z, int layer, int fullId) {
FullChunk chunk = this.getChunk(x >> 4, z >> 4);
@@ -109,6 +114,7 @@ public int getBlockDataAt(int x, int y, int z) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public int getBlockDataAt(int x, int y, int z, int layer) {
FullChunk chunk = this.getChunk(x >> 4, z >> 4);
@@ -127,6 +133,7 @@ public void setBlockDataAt(int x, int y, int z, int data) {
@Deprecated
@DeprecationDetails(reason = "The meta is limited to 32 bits", since = "1.4.0.0-PN")
+ @PowerNukkitOnly
@Override
public void setBlockDataAt(int x, int y, int z, int layer, int data) {
FullChunk chunk = this.getChunk(x >> 4, z >> 4);
diff --git a/src/main/java/cn/nukkit/level/generator/object/ObjectNyliumVegetation.java b/src/main/java/cn/nukkit/level/generator/object/ObjectNyliumVegetation.java
index ef3bbb47799..8a6affc3171 100644
--- a/src/main/java/cn/nukkit/level/generator/object/ObjectNyliumVegetation.java
+++ b/src/main/java/cn/nukkit/level/generator/object/ObjectNyliumVegetation.java
@@ -6,9 +6,11 @@
import cn.nukkit.level.ChunkManager;
import cn.nukkit.math.NukkitRandom;
import cn.nukkit.math.Vector3;
+import lombok.experimental.UtilityClass;
@PowerNukkitOnly
@Since("1.4.0.0-PN")
+@UtilityClass
public class ObjectNyliumVegetation {
@PowerNukkitOnly
@Since("1.4.0.0-PN")
diff --git a/src/main/java/cn/nukkit/level/generator/object/ObjectTallGrass.java b/src/main/java/cn/nukkit/level/generator/object/ObjectTallGrass.java
index 9191ee519f9..1246705a489 100644
--- a/src/main/java/cn/nukkit/level/generator/object/ObjectTallGrass.java
+++ b/src/main/java/cn/nukkit/level/generator/object/ObjectTallGrass.java
@@ -1,5 +1,6 @@
package cn.nukkit.level.generator.object;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.level.ChunkManager;
import cn.nukkit.math.NukkitRandom;
@@ -48,6 +49,7 @@ public static void growGrass(ChunkManager level, Vector3 pos, NukkitRandom rando
}
}
+ @PowerNukkitOnly
public static void growGrass(ChunkManager level, Vector3 pos, NukkitRandom random, int count, int radius) {
int[][] arr = {
{Block.DANDELION, 0},
diff --git a/src/main/java/cn/nukkit/level/generator/object/mushroom/BigMushroom.java b/src/main/java/cn/nukkit/level/generator/object/mushroom/BigMushroom.java
index 19d261ef173..44634bdd0bf 100644
--- a/src/main/java/cn/nukkit/level/generator/object/mushroom/BigMushroom.java
+++ b/src/main/java/cn/nukkit/level/generator/object/mushroom/BigMushroom.java
@@ -37,6 +37,7 @@ public BigMushroom() {
this.mushroomType = -1;
}
+ @Override
public boolean generate(ChunkManager level, NukkitRandom rand, Vector3 position) {
int block = this.mushroomType;
if (block < 0) {
@@ -173,7 +174,7 @@ public boolean generate(ChunkManager level, NukkitRandom rand, Vector3 position)
if (position.getY() >= position.getY() + i - 1 || meta != ALL_INSIDE) {
Vector3 blockPos = new Vector3(l1, l2, i2);
- if (!Block.solid[level.getBlockIdAt(blockPos.getFloorX(), blockPos.getFloorY(), blockPos.getFloorZ())]) {
+ if (!Block.isSolid(level.getBlockIdAt(blockPos.getFloorX(), blockPos.getFloorY(), blockPos.getFloorZ()))) {
mushroom.setDamage(meta);
this.setBlockAndNotifyAdequately(level, blockPos, mushroom);
}
@@ -186,7 +187,7 @@ public boolean generate(ChunkManager level, NukkitRandom rand, Vector3 position)
Vector3 pos = position.up(i3);
int id = level.getBlockIdAt(pos.getFloorX(), pos.getFloorY(), pos.getFloorZ());
- if (!Block.solid[id]) {
+ if (!Block.isSolid(id)) {
mushroom.setDamage(STEM);
this.setBlockAndNotifyAdequately(level, pos, mushroom);
}
diff --git a/src/main/java/cn/nukkit/level/generator/object/tree/ObjectJungleBigTree.java b/src/main/java/cn/nukkit/level/generator/object/tree/ObjectJungleBigTree.java
index 4a4d7727c79..51b1cc91b90 100644
--- a/src/main/java/cn/nukkit/level/generator/object/tree/ObjectJungleBigTree.java
+++ b/src/main/java/cn/nukkit/level/generator/object/tree/ObjectJungleBigTree.java
@@ -13,6 +13,7 @@ public ObjectJungleBigTree(int baseHeightIn, int extraRandomHeight, Block woodMe
super(baseHeightIn, extraRandomHeight, woodMetadata, leavesMetadata);
}
+ @Override
public boolean generate(ChunkManager level, NukkitRandom rand, Vector3 position) {
int height = this.getHeight(rand);
diff --git a/src/main/java/cn/nukkit/level/generator/object/tree/ObjectSavannaTree.java b/src/main/java/cn/nukkit/level/generator/object/tree/ObjectSavannaTree.java
index 71226eb541f..8f8ba0e7888 100644
--- a/src/main/java/cn/nukkit/level/generator/object/tree/ObjectSavannaTree.java
+++ b/src/main/java/cn/nukkit/level/generator/object/tree/ObjectSavannaTree.java
@@ -13,6 +13,7 @@ public class ObjectSavannaTree extends TreeGenerator {
private static final Block TRUNK = Block.get(BlockID.WOOD2, BlockWood2.ACACIA);
private static final Block LEAF = Block.get(BlockID.LEAVES2, BlockLeaves2.ACACIA);
+ @Override
public boolean generate(ChunkManager level, NukkitRandom rand, Vector3 position) {
int i = rand.nextBoundedInt(3) + rand.nextBoundedInt(3) + 5;
boolean flag = true;
diff --git a/src/main/java/cn/nukkit/level/generator/object/tree/ObjectSpruceTree.java b/src/main/java/cn/nukkit/level/generator/object/tree/ObjectSpruceTree.java
index b8bf6aeac21..e1e798e8c3c 100644
--- a/src/main/java/cn/nukkit/level/generator/object/tree/ObjectSpruceTree.java
+++ b/src/main/java/cn/nukkit/level/generator/object/tree/ObjectSpruceTree.java
@@ -59,7 +59,7 @@ public void placeLeaves(ChunkManager level, int topSize, int lRadius, int x, int
continue;
}
- if (!Block.solid[level.getBlockIdAt(xx, yyy, zz)]) {
+ if (!Block.isSolid(level.getBlockIdAt(xx, yyy, zz))) {
level.setBlockAt(xx, yyy, zz, this.getLeafBlock(), this.getType());
}
}
diff --git a/src/main/java/cn/nukkit/level/generator/object/tree/ObjectTree.java b/src/main/java/cn/nukkit/level/generator/object/tree/ObjectTree.java
index 0ec0f53eba7..f1046dd8d96 100644
--- a/src/main/java/cn/nukkit/level/generator/object/tree/ObjectTree.java
+++ b/src/main/java/cn/nukkit/level/generator/object/tree/ObjectTree.java
@@ -140,7 +140,7 @@ public void placeObject(ChunkManager level, int x, int y, int z, NukkitRandom ra
if (xOff == mid && zOff == mid && (yOff == 0 || random.nextBoundedInt(2) == 0)) {
continue;
}
- if (!Block.solid[level.getBlockIdAt(xx, yy, zz)]) {
+ if (!Block.isSolid(level.getBlockIdAt(xx, yy, zz))) {
level.setBlockAt(xx, yy, zz, this.getLeafBlock(), this.getType());
}
}
diff --git a/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorGroundCover.java b/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorGroundCover.java
index 6e015728f88..4963e7ea075 100644
--- a/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorGroundCover.java
+++ b/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorGroundCover.java
@@ -1,5 +1,6 @@
package cn.nukkit.level.generator.populator.impl;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.block.Block;
import cn.nukkit.block.BlockID;
import cn.nukkit.level.ChunkManager;
@@ -14,6 +15,7 @@
* @author DaPorkchop_
*/
public class PopulatorGroundCover extends Populator {
+ @PowerNukkitOnly
public static final int STONE = BlockID.STONE << Block.DATA_BITS;
@Override
diff --git a/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorGroundFire.java b/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorGroundFire.java
index 9f40fffd531..9ee1b4ad492 100644
--- a/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorGroundFire.java
+++ b/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorGroundFire.java
@@ -25,7 +25,7 @@ protected int getBlockId(int x, int z, NukkitRandom random, FullChunk chunk) {
@Override
protected void placeBlock(int x, int y, int z, int id, FullChunk chunk, NukkitRandom random) {
super.placeBlock(x, y, z, id, chunk, random);
- chunk.setBlockLight(x, y, z, Block.light[FIRE]);
+ chunk.setBlockLight(x, y, z, Block.getLightLevel(FIRE));
}
@Override
diff --git a/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorLava.java b/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorLava.java
index c2f954a9474..b8b49772bf3 100644
--- a/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorLava.java
+++ b/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorLava.java
@@ -36,7 +36,7 @@ public void populate(ChunkManager level, int chunkX, int chunkZ, NukkitRandom ra
int y = this.getHighestWorkableBlock(chunk, x, z);
if (y != -1 && chunk.getBlockId(x, y, z) == Block.AIR) {
chunk.setBlock(x, y, z, Block.LAVA);
- chunk.setBlockLight(x, y, z, Block.light[Block.LAVA]);
+ chunk.setBlockLight(x, y, z, Block.getLightLevel(Block.LAVA));
this.lavaSpread(bx + x, y, bz + z);
}
}
diff --git a/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorOre.java b/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorOre.java
index 5b8852602aa..8f02a8d036b 100644
--- a/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorOre.java
+++ b/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorOre.java
@@ -1,7 +1,6 @@
package cn.nukkit.level.generator.populator.impl;
-import cn.nukkit.api.NewRakNetOnly;
-import cn.nukkit.api.RemovedFromNewRakNet;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
import cn.nukkit.level.ChunkManager;
@@ -21,8 +20,8 @@ public class PopulatorOre extends Populator {
/**
* @implNote Removed from the new-raknet branch
*/
- @RemovedFromNewRakNet
@Since("1.4.0.0-PN")
+ @PowerNukkitOnly
public PopulatorOre() {
this(Block.STONE);
}
@@ -30,13 +29,12 @@ public PopulatorOre() {
/**
* @implNote Removed from the new-raknet branch
*/
- @RemovedFromNewRakNet
@Since("1.4.0.0-PN")
+ @PowerNukkitOnly
public PopulatorOre(int id) {
this.replaceId = id;
}
- @NewRakNetOnly
public PopulatorOre(int replaceId, OreType[] oreTypes) {
this.replaceId = replaceId;
this.oreTypes = oreTypes;
@@ -64,7 +62,7 @@ public void populate(ChunkManager level, int chunkX, int chunkZ, NukkitRandom ra
/**
* @implNote Removed from the new-raknet branch
*/
- @RemovedFromNewRakNet
+ @PowerNukkitOnly
@Since("1.4.0.0-PN")
public void setOreTypes(OreType[] oreTypes) {
this.oreTypes = oreTypes;
diff --git a/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorOreEmerald.java b/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorOreEmerald.java
index 75718b38b33..9610f440e6c 100644
--- a/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorOreEmerald.java
+++ b/src/main/java/cn/nukkit/level/generator/populator/impl/PopulatorOreEmerald.java
@@ -18,7 +18,12 @@ public class PopulatorOreEmerald extends Populator {
private static final BlockState STATE_STONE = BlockState.of(STONE);
private static final BlockState STATE_EMERALD_ORE = BlockState.of(EMERALD_ORE);
-
+
+ @PowerNukkitOnly
+ public PopulatorOreEmerald() {
+ super();
+ }
+
@Override
public void populate(ChunkManager level, int chunkX, int chunkZ, NukkitRandom random, FullChunk chunk) {
for (int i = 0; i < 11; i++) {
diff --git a/src/main/java/cn/nukkit/level/particle/CloudParticle.java b/src/main/java/cn/nukkit/level/particle/CloudParticle.java
index bbcccdbf8dd..5f826c9b157 100644
--- a/src/main/java/cn/nukkit/level/particle/CloudParticle.java
+++ b/src/main/java/cn/nukkit/level/particle/CloudParticle.java
@@ -1,10 +1,17 @@
package cn.nukkit.level.particle;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.math.Vector3;
+@PowerNukkitOnly
public class CloudParticle extends GenericParticle {
+ @PowerNukkitOnly
public CloudParticle(Vector3 pos) {
this(pos, 0);
}
- public CloudParticle(Vector3 pos, int scale) { super(pos, Particle.TYPE_EVAPORATION, scale); }
+
+ @PowerNukkitOnly
+ public CloudParticle(Vector3 pos, int scale) {
+ super(pos, Particle.TYPE_EVAPORATION, scale);
+ }
}
diff --git a/src/main/java/cn/nukkit/level/particle/DustParticle.java b/src/main/java/cn/nukkit/level/particle/DustParticle.java
index c0faa971776..f5682317250 100644
--- a/src/main/java/cn/nukkit/level/particle/DustParticle.java
+++ b/src/main/java/cn/nukkit/level/particle/DustParticle.java
@@ -18,6 +18,6 @@ public DustParticle(Vector3 pos, int r, int g, int b) {
}
public DustParticle(Vector3 pos, int r, int g, int b, int a) {
- super(pos, Particle.TYPE_DUST, ((a & 0xff) << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff));
+ super(pos, Particle.TYPE_FALLING_DUST, ((a & 0xff) << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff));
}
}
diff --git a/src/main/java/cn/nukkit/level/particle/ItemBreakParticle.java b/src/main/java/cn/nukkit/level/particle/ItemBreakParticle.java
index 29a3651b3d0..4d3be2bfa4f 100644
--- a/src/main/java/cn/nukkit/level/particle/ItemBreakParticle.java
+++ b/src/main/java/cn/nukkit/level/particle/ItemBreakParticle.java
@@ -1,7 +1,6 @@
package cn.nukkit.level.particle;
import cn.nukkit.item.Item;
-import cn.nukkit.item.RuntimeItems;
import cn.nukkit.math.Vector3;
import cn.nukkit.network.protocol.DataPacket;
import cn.nukkit.network.protocol.LevelEventPacket;
@@ -16,9 +15,7 @@ public class ItemBreakParticle extends Particle {
public ItemBreakParticle(Vector3 pos, Item item) {
super(pos.x, pos.y, pos.z);
- int networkFullId = RuntimeItems.getRuntimeMapping().getNetworkFullId(item);
- int networkId = RuntimeItems.getNetworkId(networkFullId);
- this.data = (networkId << 16 | item.getDamage());
+ this.data = (item.getNetworkId() << 16 | item.getDamage());
}
@Override
diff --git a/src/main/java/cn/nukkit/level/particle/Particle.java b/src/main/java/cn/nukkit/level/particle/Particle.java
index e5d94c8944a..792d742a4a7 100644
--- a/src/main/java/cn/nukkit/level/particle/Particle.java
+++ b/src/main/java/cn/nukkit/level/particle/Particle.java
@@ -23,83 +23,94 @@ public abstract class Particle extends Vector3 {
public static final int TYPE_EXPLODE = dynamic(6);
public static final int TYPE_EVAPORATION = dynamic(7);
public static final int TYPE_FLAME = dynamic(8);
- public static final int TYPE_LAVA = dynamic(9);
- public static final int TYPE_LARGE_SMOKE = dynamic(10);
- public static final int TYPE_REDSTONE = dynamic(11);
- public static final int TYPE_RISING_RED_DUST = dynamic(12);
- public static final int TYPE_ITEM_BREAK = dynamic(13);
- public static final int TYPE_SNOWBALL_POOF = dynamic(14);
- public static final int TYPE_HUGE_EXPLODE = dynamic(15);
- public static final int TYPE_HUGE_EXPLODE_SEED = dynamic(16);
- public static final int TYPE_MOB_FLAME = dynamic(17);
- public static final int TYPE_HEART = dynamic(18);
- public static final int TYPE_TERRAIN = dynamic(19);
- public static final int TYPE_SUSPENDED_TOWN = dynamic(20), TYPE_TOWN_AURA = TYPE_SUSPENDED_TOWN;
- public static final int TYPE_PORTAL = dynamic(21);
- // 22 same as 21
- public static final int TYPE_SPLASH = dynamic(23), TYPE_WATER_SPLASH = TYPE_SPLASH;
- @Since("1.4.0.0-PN") public static final int TYPE_WATER_SPLASH_MANUAL = dynamic(24);
- public static final int TYPE_WATER_WAKE = dynamic(25);
- public static final int TYPE_DRIP_WATER = dynamic(26);
- public static final int TYPE_DRIP_LAVA = dynamic(27);
- public static final int TYPE_DRIP_HONEY = dynamic(28);
- @Since("1.4.0.0-PN") public static final int TYPE_STALACTITE_DRIP_WATER = dynamic(29);
- @Since("1.4.0.0-PN") public static final int TYPE_STALACTITE_DRIP_LAVA = dynamic(30);
- public static final int TYPE_FALLING_DUST = dynamic(31), TYPE_DUST = TYPE_FALLING_DUST;
- public static final int TYPE_MOB_SPELL = dynamic(32);
- public static final int TYPE_MOB_SPELL_AMBIENT = dynamic(33);
- public static final int TYPE_MOB_SPELL_INSTANTANEOUS = dynamic(34);
- public static final int TYPE_INK = dynamic(35);
- public static final int TYPE_SLIME = dynamic(36);
- public static final int TYPE_RAIN_SPLASH = dynamic(37);
- public static final int TYPE_VILLAGER_ANGRY = dynamic(38);
- public static final int TYPE_VILLAGER_HAPPY = dynamic(39);
- public static final int TYPE_ENCHANTMENT_TABLE = dynamic(40);
- public static final int TYPE_TRACKING_EMITTER = dynamic(41);
- public static final int TYPE_NOTE = dynamic(42);
-
- @PowerNukkitOnly("Backward compatibility")
- @Deprecated @DeprecationDetails(since = "1.4.0.0-PN", by = "NukkitX", reason = "Removed from Nukkit")
- public static final int TYPE_NOTE_AND_DUST = TYPE_NOTE;
-
- public static final int TYPE_WITCH_SPELL = dynamic(43);
- public static final int TYPE_CARROT = dynamic(44);
- @Since("1.4.0.0-PN") public static final int TYPE_MOB_APPEARANCE = dynamic(45);
- public static final int TYPE_END_ROD = dynamic(46);
- public static final int TYPE_RISING_DRAGONS_BREATH = dynamic(47);
- public static final int TYPE_SPIT = dynamic(48);
- public static final int TYPE_TOTEM = dynamic(49);
- public static final int TYPE_FOOD = dynamic(50);
- public static final int TYPE_FIREWORKS_STARTER = dynamic(51);
- public static final int TYPE_FIREWORKS_SPARK = dynamic(52);
- public static final int TYPE_FIREWORKS_OVERLAY = dynamic(53);
- public static final int TYPE_BALLOON_GAS = dynamic(54);
- public static final int TYPE_COLORED_FLAME = dynamic(55);
- public static final int TYPE_SPARKLER = dynamic(56);
- public static final int TYPE_CONDUIT = dynamic(57);
- public static final int TYPE_BUBBLE_COLUMN_UP = dynamic(58);
- public static final int TYPE_BUBBLE_COLUMN_DOWN = dynamic(59);
- public static final int TYPE_SNEEZE = dynamic(60);
- @Since("1.4.0.0-PN") public static final int TYPE_SHULKER_BULLET = dynamic(61);
- @Since("1.4.0.0-PN") public static final int TYPE_BLEACH = dynamic(62);
- public static final int TYPE_LARGE_EXPLOSION = dynamic(63);
- @Since("1.4.0.0-PN") public static final int TYPE_MYCELIUM_DUST = dynamic(64);
- public static final int TYPE_FALLING_RED_DUST = dynamic(65);
- public static final int TYPE_CAMPFIRE_SMOKE = dynamic(66);
- @Since("1.4.0.0-PN") public static final int TYPE_TALL_CAMPFIRE_SMOKE = dynamic(67);
- public static final int TYPE_FALLING_DRAGONS_BREATH = dynamic(68);
- public static final int TYPE_DRAGONS_BREATH = dynamic(69);
- @Since("1.4.0.0-PN") public static final int TYPE_BLUE_FLAME = dynamic(70);
- @Since("1.4.0.0-PN") public static final int TYPE_SOUL = dynamic(71);
- @Since("1.4.0.0-PN") public static final int TYPE_OBSIDIAN_TEAR = dynamic(72);
- @Since("1.4.0.0-PN") public static final int TYPE_PORTAL_REVERSE = dynamic(73);
- @Since("1.4.0.0-PN") public static final int TYPE_SNOWFLAKE = dynamic(74);
- @Since("1.4.0.0-PN") public static final int TYPE_VIBRATION_SIGNAL = dynamic(75);
- @Since("1.4.0.0-PN") public static final int TYPE_SCULK_SENSOR_REDSTONE = dynamic(76);
- @Since("1.4.0.0-PN") public static final int TYPE_SPORE_BLOSSOM_SHOWER = dynamic(77);
- @Since("1.4.0.0-PN") public static final int TYPE_SPORE_BLOSSOM_AMBIENT = dynamic(78);
- @Since("1.4.0.0-PN") public static final int TYPE_WAX = dynamic(79);
- @Since("1.4.0.0-PN") public static final int TYPE_ELECTRIC_SPARK = dynamic(80);
+ @Since("1.5.2.0-PN") public static final int TYPE_CANDLE_FLAME = dynamic(9);
+ public static final int TYPE_LAVA = dynamic(10);
+ public static final int TYPE_LARGE_SMOKE = dynamic(11);
+ public static final int TYPE_REDSTONE = dynamic(12);
+ public static final int TYPE_RISING_RED_DUST = dynamic(13);
+ public static final int TYPE_ITEM_BREAK = dynamic(14);
+ public static final int TYPE_SNOWBALL_POOF = dynamic(15);
+ public static final int TYPE_HUGE_EXPLODE = dynamic(16);
+ public static final int TYPE_HUGE_EXPLODE_SEED = dynamic(17);
+ public static final int TYPE_MOB_FLAME = dynamic(18);
+ public static final int TYPE_HEART = dynamic(19);
+ public static final int TYPE_TERRAIN = dynamic(20);
+ public static final int TYPE_TOWN_AURA = dynamic(21);
+
+ @Deprecated @DeprecationDetails(since = "1.5.2.0-PN", by = "PowerNukkit", reason = "Same as TYPE_TOWN_AURA",
+ replaceWith = "TYPE_TOWN_AURA")
+ public static final int TYPE_SUSPENDED_TOWN = TYPE_TOWN_AURA;
+
+ public static final int TYPE_PORTAL = dynamic(22);
+ @PowerNukkitOnly @Since("1.5.2.0-PN") public static final int TYPE_MOB_PORTAL = dynamic(23);
+ public static final int TYPE_SPLASH = dynamic(24);
+
+ @Deprecated @DeprecationDetails(since = "1.5.2.0-PN", by = "PowerNukkit", reason = "Same as TYPE_SPLASH",
+ replaceWith = "TYPE_SPLASH")
+ public static final int TYPE_WATER_SPLASH = TYPE_SPLASH;
+
+ @Since("1.4.0.0-PN") public static final int TYPE_WATER_SPLASH_MANUAL = dynamic(25);
+ public static final int TYPE_WATER_WAKE = dynamic(26);
+ public static final int TYPE_DRIP_WATER = dynamic(27);
+ public static final int TYPE_DRIP_LAVA = dynamic(28);
+ public static final int TYPE_DRIP_HONEY = dynamic(29);
+ @Since("1.4.0.0-PN") public static final int TYPE_STALACTITE_DRIP_WATER = dynamic(30);
+ @Since("1.4.0.0-PN") public static final int TYPE_STALACTITE_DRIP_LAVA = dynamic(31);
+ public static final int TYPE_FALLING_DUST = dynamic(32);
+
+ @Deprecated @DeprecationDetails(since = "1.5.2.0-PN", by = "PowerNukkit", reason = "Same as TYPE_FALLING_DUST",
+ replaceWith = "TYPE_FALLING_DUST")
+ public static final int TYPE_DUST = TYPE_FALLING_DUST;
+
+ public static final int TYPE_MOB_SPELL = dynamic(33);
+ public static final int TYPE_MOB_SPELL_AMBIENT = dynamic(34);
+ public static final int TYPE_MOB_SPELL_INSTANTANEOUS = dynamic(35);
+ public static final int TYPE_INK = dynamic(36);
+ public static final int TYPE_SLIME = dynamic(37);
+ public static final int TYPE_RAIN_SPLASH = dynamic(38);
+ public static final int TYPE_VILLAGER_ANGRY = dynamic(39);
+ public static final int TYPE_VILLAGER_HAPPY = dynamic(40);
+ public static final int TYPE_ENCHANTMENT_TABLE = dynamic(41);
+ public static final int TYPE_TRACKING_EMITTER = dynamic(42);
+ public static final int TYPE_NOTE = dynamic(43);
+ public static final int TYPE_WITCH_SPELL = dynamic(44);
+ public static final int TYPE_CARROT = dynamic(45);
+ @Since("1.4.0.0-PN") public static final int TYPE_MOB_APPEARANCE = dynamic(46);
+ public static final int TYPE_END_ROD = dynamic(47);
+ public static final int TYPE_RISING_DRAGONS_BREATH = dynamic(48);
+ public static final int TYPE_SPIT = dynamic(49);
+ public static final int TYPE_TOTEM = dynamic(50);
+ public static final int TYPE_FOOD = dynamic(51);
+ public static final int TYPE_FIREWORKS_STARTER = dynamic(52);
+ public static final int TYPE_FIREWORKS_SPARK = dynamic(53);
+ public static final int TYPE_FIREWORKS_OVERLAY = dynamic(54);
+ public static final int TYPE_BALLOON_GAS = dynamic(55);
+ public static final int TYPE_COLORED_FLAME = dynamic(56);
+ public static final int TYPE_SPARKLER = dynamic(57);
+ public static final int TYPE_CONDUIT = dynamic(58);
+ public static final int TYPE_BUBBLE_COLUMN_UP = dynamic(59);
+ public static final int TYPE_BUBBLE_COLUMN_DOWN = dynamic(60);
+ public static final int TYPE_SNEEZE = dynamic(61);
+ @Since("1.4.0.0-PN") public static final int TYPE_SHULKER_BULLET = dynamic(62);
+ @Since("1.4.0.0-PN") public static final int TYPE_BLEACH = dynamic(63);
+ public static final int TYPE_LARGE_EXPLOSION = dynamic(64);
+ @Since("1.4.0.0-PN") public static final int TYPE_MYCELIUM_DUST = dynamic(65);
+ public static final int TYPE_FALLING_RED_DUST = dynamic(66);
+ public static final int TYPE_CAMPFIRE_SMOKE = dynamic(67);
+ @Since("1.4.0.0-PN") public static final int TYPE_TALL_CAMPFIRE_SMOKE = dynamic(68);
+ public static final int TYPE_FALLING_DRAGONS_BREATH = dynamic(69);
+ public static final int TYPE_DRAGONS_BREATH = dynamic(70);
+ @Since("1.4.0.0-PN") public static final int TYPE_BLUE_FLAME = dynamic(71);
+ @Since("1.4.0.0-PN") public static final int TYPE_SOUL = dynamic(72);
+ @Since("1.4.0.0-PN") public static final int TYPE_OBSIDIAN_TEAR = dynamic(73);
+ @Since("1.4.0.0-PN") public static final int TYPE_PORTAL_REVERSE = dynamic(74);
+ @Since("1.4.0.0-PN") public static final int TYPE_SNOWFLAKE = dynamic(75);
+ @Since("1.4.0.0-PN") public static final int TYPE_VIBRATION_SIGNAL = dynamic(76);
+ @Since("1.4.0.0-PN") public static final int TYPE_SCULK_SENSOR_REDSTONE = dynamic(77);
+ @Since("1.4.0.0-PN") public static final int TYPE_SPORE_BLOSSOM_SHOWER = dynamic(78);
+ @Since("1.4.0.0-PN") public static final int TYPE_SPORE_BLOSSOM_AMBIENT = dynamic(79);
+ @Since("1.4.0.0-PN") public static final int TYPE_WAX = dynamic(80);
+ @Since("1.4.0.0-PN") public static final int TYPE_ELECTRIC_SPARK = dynamic(81);
@Since("1.4.0.0-PN")
public static Integer getParticleIdByName(String name) {
diff --git a/src/main/java/cn/nukkit/level/particle/SplashParticle.java b/src/main/java/cn/nukkit/level/particle/SplashParticle.java
index 0193cc38b85..3aa3fe6627c 100644
--- a/src/main/java/cn/nukkit/level/particle/SplashParticle.java
+++ b/src/main/java/cn/nukkit/level/particle/SplashParticle.java
@@ -8,6 +8,6 @@
*/
public class SplashParticle extends GenericParticle {
public SplashParticle(Vector3 pos) {
- super(pos, Particle.TYPE_WATER_SPLASH);
+ super(pos, Particle.TYPE_SPLASH);
}
}
diff --git a/src/main/java/cn/nukkit/level/util/PalettedBlockStorage.java b/src/main/java/cn/nukkit/level/util/PalettedBlockStorage.java
index 5e3ad0e62cf..ce52c7f82f6 100644
--- a/src/main/java/cn/nukkit/level/util/PalettedBlockStorage.java
+++ b/src/main/java/cn/nukkit/level/util/PalettedBlockStorage.java
@@ -1,6 +1,10 @@
package cn.nukkit.level.util;
-import cn.nukkit.level.GlobalBlockPalette;
+import cn.nukkit.api.DeprecationDetails;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+import cn.nukkit.block.BlockID;
+import cn.nukkit.blockstate.BlockStateRegistry;
import cn.nukkit.utils.BinaryStream;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
@@ -14,14 +18,53 @@ public class PalettedBlockStorage {
private final IntList palette;
private BitArray bitArray;
+ @Since("1.6.0.0-PN")
+ public static PalettedBlockStorage createFromBlockPalette() {
+ return createFromBlockPalette(BitArrayVersion.V2);
+ }
+
+ @Since("1.6.0.0-PN")
+ public static PalettedBlockStorage createFromBlockPalette(BitArrayVersion version) {
+ int runtimeId = BlockStateRegistry.getRuntimeId(BlockID.AIR);
+ return new PalettedBlockStorage(version, runtimeId);
+ }
+
+ @Since("1.6.0.0-PN")
+ public static PalettedBlockStorage createWithDefaultState(int defaultState) {
+ return createWithDefaultState(BitArrayVersion.V2, defaultState);
+ }
+
+ @Since("1.6.0.0-PN")
+ public static PalettedBlockStorage createWithDefaultState(BitArrayVersion version, int defaultState) {
+ return new PalettedBlockStorage(version, defaultState);
+ }
+
+ @PowerNukkitOnly("This was removed on 1.6.0.0-PN by Cloudburst Nukkit and re-added to fix plugin compatibility issue on 1.6.0.1-PN")
+ @Deprecated
+ @DeprecationDetails(
+ since = "1.6.0.0-PN",
+ reason = "Refactored by Cloudburst Nukkit to use static method instead of constructor",
+ replaceWith = "createFromBlockPalette()"
+ )
public PalettedBlockStorage() {
this(BitArrayVersion.V2);
}
+ @PowerNukkitOnly("This was removed on 1.6.0.0-PN by Cloudburst Nukkit and re-added to fix plugin compatibility issue on 1.6.0.1-PN")
+ @Deprecated
+ @DeprecationDetails(
+ since = "1.6.0.0-PN",
+ reason = "Refactored by Cloudburst Nukkit to use static method instead of constructor",
+ replaceWith = "createFromBlockPalette(BitArrayVersion)"
+ )
public PalettedBlockStorage(BitArrayVersion version) {
+ this(version, BlockStateRegistry.getRuntimeId(BlockID.AIR));
+ }
+
+ private PalettedBlockStorage(BitArrayVersion version, int defaultState) {
this.bitArray = version.createPalette(SIZE);
this.palette = new IntArrayList(16);
- this.palette.add(GlobalBlockPalette.getOrCreateRuntimeId(0)); // Air is at the start of every palette.
+ this.palette.add(defaultState);
}
private PalettedBlockStorage(BitArray bitArray, IntList palette) {
@@ -33,6 +76,15 @@ private int getPaletteHeader(BitArrayVersion version, boolean runtime) {
return (version.getId() << 1) | (runtime ? 1 : 0);
}
+ private int getIndex(int x, int y, int z) {
+ return (x << 8) | (z << 4) | y;
+ }
+
+ @Since("1.6.0.0-PN")
+ public void setBlock(int x, int y, int z, int runtimeId) {
+ this.setBlock(this.getIndex(x, y, z), runtimeId);
+ }
+
public void setBlock(int index, int runtimeId) {
try {
int id = this.idFor(runtimeId);
diff --git a/src/main/java/cn/nukkit/level/util/Pow2BitArray.java b/src/main/java/cn/nukkit/level/util/Pow2BitArray.java
index 6e2c1a02965..0205697f415 100644
--- a/src/main/java/cn/nukkit/level/util/Pow2BitArray.java
+++ b/src/main/java/cn/nukkit/level/util/Pow2BitArray.java
@@ -36,6 +36,7 @@ public class Pow2BitArray implements BitArray {
/**
* Sets the entry at the given location to the given value
*/
+ @Override
public void set(int index, int value) {
Preconditions.checkElementIndex(index, this.size);
Preconditions.checkArgument(value >= 0 && value <= this.version.maxEntryValue,
@@ -49,6 +50,7 @@ public void set(int index, int value) {
/**
* Gets the entry at the given index
*/
+ @Override
public int get(int index) {
Preconditions.checkElementIndex(index, this.size);
int bitIndex = index * this.version.bits;
@@ -60,6 +62,7 @@ public int get(int index) {
/**
* Gets the long array that is used to store the data in this BitArray. This is useful for sending packet data.
*/
+ @Override
public int size() {
return this.size;
}
@@ -74,6 +77,7 @@ public int[] getWords() {
return this.words;
}
+ @Override
public BitArrayVersion getVersion() {
return version;
}
diff --git a/src/main/java/cn/nukkit/math/AxisAlignedBB.java b/src/main/java/cn/nukkit/math/AxisAlignedBB.java
index 7425568bda3..046e65967d5 100644
--- a/src/main/java/cn/nukkit/math/AxisAlignedBB.java
+++ b/src/main/java/cn/nukkit/math/AxisAlignedBB.java
@@ -92,6 +92,7 @@ default AxisAlignedBB setBB(AxisAlignedBB bb) {
return this;
}
+ @PowerNukkitOnly
default AxisAlignedBB getOffsetBoundingBox(BlockFace face, double x, double y, double z) {
return getOffsetBoundingBox(face.getXOffset() * x, face.getYOffset() * y, face.getZOffset() * z);
}
diff --git a/src/main/java/cn/nukkit/math/BlockFace.java b/src/main/java/cn/nukkit/math/BlockFace.java
index 34260049184..b97a1a78f06 100644
--- a/src/main/java/cn/nukkit/math/BlockFace.java
+++ b/src/main/java/cn/nukkit/math/BlockFace.java
@@ -289,6 +289,7 @@ public CompassRoseDirection getCompassRoseDirection() {
}
}
+ @Override
public String toString() {
return name;
}
@@ -328,10 +329,12 @@ public String getName() {
return name;
}
+ @Override
public boolean test(BlockFace face) {
return face != null && face.getAxis() == this;
}
+ @Override
public String toString() {
return name;
}
@@ -353,6 +356,7 @@ public int getOffset() {
return offset;
}
+ @Override
public String toString() {
return description;
}
@@ -380,10 +384,12 @@ public BlockFace random(NukkitRandom rand) {
return faces[rand.nextBoundedInt(faces.length)];
}
+ @Override
public boolean test(BlockFace face) {
return face != null && face.getAxis().getPlane() == this;
}
+ @Override
public Iterator iterator() {
return Iterators.forArray(faces);
}
diff --git a/src/main/java/cn/nukkit/math/BlockVector3.java b/src/main/java/cn/nukkit/math/BlockVector3.java
index 2370d519b35..3651c77a16c 100644
--- a/src/main/java/cn/nukkit/math/BlockVector3.java
+++ b/src/main/java/cn/nukkit/math/BlockVector3.java
@@ -2,6 +2,7 @@
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
+import lombok.SneakyThrows;
public class BlockVector3 implements Cloneable {
public int x;
@@ -45,6 +46,24 @@ public int getZ() {
return this.z;
}
+ @Since("1.6.0.0-PN")
+ public BlockVector3 setX(int x) {
+ this.x = x;
+ return this;
+ }
+
+ @Since("1.6.0.0-PN")
+ public BlockVector3 setY(int y) {
+ this.y = y;
+ return this;
+ }
+
+ @Since("1.6.0.0-PN")
+ public BlockVector3 setZ(int z) {
+ this.z = z;
+ return this;
+ }
+
public Vector3 add(double x) {
return this.add(x, 0, 0);
}
@@ -257,13 +276,10 @@ public String toString() {
return "BlockPosition(level=" + ",x=" + this.x + ",y=" + this.y + ",z=" + this.z + ")";
}
+ @SneakyThrows
@Override
public BlockVector3 clone() {
- try {
- return (BlockVector3) super.clone();
- } catch (CloneNotSupportedException e) {
- return null;
- }
+ return (BlockVector3) super.clone();
}
public Vector3 asVector3() {
diff --git a/src/main/java/cn/nukkit/math/MathHelper.java b/src/main/java/cn/nukkit/math/MathHelper.java
index 109b56506d3..536d78cc497 100644
--- a/src/main/java/cn/nukkit/math/MathHelper.java
+++ b/src/main/java/cn/nukkit/math/MathHelper.java
@@ -1,5 +1,7 @@
package cn.nukkit.math;
+import cn.nukkit.api.PowerNukkitOnly;
+
import java.util.Random;
public class MathHelper {
@@ -92,6 +94,7 @@ public static int clamp(int check, int min, int max) {
return check > max ? max : (check < min ? min : check);
}
+ @PowerNukkitOnly
public static float clamp(float num, float min, float max) {
return num > max ? max : (num < min ? min : num);
}
diff --git a/src/main/java/cn/nukkit/math/Vector3.java b/src/main/java/cn/nukkit/math/Vector3.java
index 2f3653a53de..928d69019bc 100644
--- a/src/main/java/cn/nukkit/math/Vector3.java
+++ b/src/main/java/cn/nukkit/math/Vector3.java
@@ -3,6 +3,7 @@
import cn.nukkit.api.DeprecationDetails;
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
+import lombok.SneakyThrows;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -46,6 +47,25 @@ public double getZ() {
return this.z;
}
+ @Since("1.6.0.0-PN")
+ public Vector3 setX(double x) {
+ this.x = x;
+ return this;
+ }
+
+ @Since("1.6.0.0-PN")
+ public Vector3 setY(double y) {
+ this.y = y;
+ return this;
+ }
+
+ @Since("1.6.0.0-PN")
+ public Vector3 setZ(double z) {
+ this.z = z;
+ return this;
+ }
+
+
public int getFloorX() {
return (int) Math.floor(this.x);
}
@@ -259,6 +279,11 @@ public double maxPlainDistance(Vector3 x) {
return this.maxPlainDistance(x.x, x.z);
}
+ /**
+ * Calculates the Length of this Vector
+ *
+ * @return The Length of this Vector.
+ */
public double length() {
return Math.sqrt(this.lengthSquared());
}
@@ -275,10 +300,22 @@ public Vector3 normalize() {
return new Vector3(0, 0, 0);
}
+ /**
+ * Scalar Product of this Vector and the Vector supplied.
+ *
+ * @param v Vector to calculate the scalar product to.
+ * @return Scalar Product
+ */
public double dot(Vector3 v) {
return this.x * v.x + this.y * v.y + this.z * v.z;
}
+ /**
+ * Calculates the cross product of this Vector and the given Vector
+ *
+ * @param v the vector to calculate the cross product with.
+ * @return a Vector at right angle to this and other
+ */
public Vector3 cross(Vector3 v) {
return new Vector3(
this.y * v.z - this.z * v.y,
@@ -287,6 +324,16 @@ public Vector3 cross(Vector3 v) {
);
}
+ /* PowerNukkit: The Angle class was removed because it had all rights reserved copyright on it.
+ * Calculates the angle between this and the supplied Vector.
+ *
+ * @param v the Vector to calculate the angle to.
+ * @return the Angle between the two Vectors.
+ */
+ /*public Angle angleBetween(Vector3 v) {
+ return Angle.fromRadian(Math.acos(Math.min(Math.max(this.normalize().dot(v.normalize()), -1.0d), 1.0d)));
+ }*/
+
/**
* Returns a new vector with x value equal to the second parameter, along the line between this vector and the
* passed in vector, or null if not possible.
@@ -431,13 +478,10 @@ public int rawHashCode() {
return super.hashCode();
}
+ @SneakyThrows
@Override
public Vector3 clone() {
- try {
- return (Vector3) super.clone();
- } catch (CloneNotSupportedException e) {
- return null;
- }
+ return (Vector3) super.clone();
}
public Vector3f asVector3f() {
diff --git a/src/main/java/cn/nukkit/math/Vector3f.java b/src/main/java/cn/nukkit/math/Vector3f.java
index 5fea6bffc09..490298cae62 100644
--- a/src/main/java/cn/nukkit/math/Vector3f.java
+++ b/src/main/java/cn/nukkit/math/Vector3f.java
@@ -2,6 +2,7 @@
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
+import lombok.SneakyThrows;
public class Vector3f implements Cloneable {
public static final int SIDE_DOWN = 0;
@@ -45,6 +46,24 @@ public float getZ() {
return this.z;
}
+ @Since("1.6.0.0-PN")
+ public Vector3f setX(float x) {
+ this.x = x;
+ return this;
+ }
+
+ @Since("1.6.0.0-PN")
+ public Vector3f setY(float y) {
+ this.y = y;
+ return this;
+ }
+
+ @Since("1.6.0.0-PN")
+ public Vector3f setZ(float z) {
+ this.z = z;
+ return this;
+ }
+
public int getFloorX() {
return NukkitMath.floorFloat(this.x);
}
@@ -207,6 +226,11 @@ public float maxPlainDistance(Vector3f x) {
return this.maxPlainDistance(x.x, x.z);
}
+ /**
+ * Calculates the Length of this Vector
+ *
+ * @return The Length of this Vector.
+ */
public double length() {
return Math.sqrt(this.lengthSquared());
}
@@ -223,10 +247,22 @@ public Vector3f normalize() {
return new Vector3f(0, 0, 0);
}
+ /**
+ * Scalar Product of this Vector and the Vector supplied.
+ *
+ * @param v Vector to calculate the scalar product to.
+ * @return Scalar Product
+ */
public float dot(Vector3f v) {
return this.x * v.x + this.y * v.y + this.z * v.z;
}
+ /**
+ * Calculates the cross product of this Vector and the given Vector
+ *
+ * @param v the vector to calculate the cross product with.
+ * @return a Vector at right angle to this and other
+ */
public Vector3f cross(Vector3f v) {
return new Vector3f(
this.y * v.z - this.z * v.y,
@@ -235,9 +271,23 @@ public Vector3f cross(Vector3f v) {
);
}
- /*
+ /* PowerNukkit: The Angle class was removed because it had all rights reserved copyright on it.
+ * Calculates the angle between this and the supplied Vector.
+ *
+ * @param v the Vector to calculate the angle to.
+ * @return the Angle between the two Vectors.
+ */
+ /*public Angle angleBetween(Vector3f v) {
+ return Angle.fromRadian(Math.acos(Math.min(Math.max(this.normalize().dot(v.normalize()), -1.0f), 1.0f)));
+ }*/
+
+ /**
* Returns a new vector with x value equal to the second parameter, along the line between this vector and the
* passed in vector, or null if not possible.
+ *
+ * @param v vector
+ * @param x x value
+ * @return intermediate vector
*/
public Vector3f getIntermediateWithXValue(Vector3f v, float x) {
float xDiff = v.x - this.x;
@@ -254,9 +304,13 @@ public Vector3f getIntermediateWithXValue(Vector3f v, float x) {
}
}
- /*
+ /**
* Returns a new vector with y value equal to the second parameter, along the line between this vector and the
* passed in vector, or null if not possible.
+ *
+ * @param v vector
+ * @param y y value
+ * @return intermediate vector
*/
public Vector3f getIntermediateWithYValue(Vector3f v, float y) {
float xDiff = v.x - this.x;
@@ -273,9 +327,13 @@ public Vector3f getIntermediateWithYValue(Vector3f v, float y) {
}
}
- /*
+ /**
* Returns a new vector with z value equal to the second parameter, along the line between this vector and the
* passed in vector, or null if not possible.
+ *
+ * @param v vector
+ * @param z z value
+ * @return intermediate vector
*/
public Vector3f getIntermediateWithZValue(Vector3f v, float z) {
float xDiff = v.x - this.x;
@@ -332,13 +390,10 @@ public int rawHashCode() {
return super.hashCode();
}
+ @SneakyThrows
@Override
public Vector3f clone() {
- try {
- return (Vector3f) super.clone();
- } catch (CloneNotSupportedException e) {
- return null;
- }
+ return (Vector3f) super.clone();
}
public Vector3 asVector3() {
diff --git a/src/main/java/cn/nukkit/metrics/Metrics.java b/src/main/java/cn/nukkit/metrics/Metrics.java
index 8bea64d9481..7751eac5eb1 100644
--- a/src/main/java/cn/nukkit/metrics/Metrics.java
+++ b/src/main/java/cn/nukkit/metrics/Metrics.java
@@ -5,8 +5,8 @@
import cn.nukkit.utils.MainLogger;
import io.netty.util.internal.EmptyArrays;
import lombok.extern.log4j.Log4j2;
-import net.minidev.json.JSONArray;
-import net.minidev.json.JSONObject;
+import com.nimbusds.jose.shaded.json.JSONArray;
+import com.nimbusds.jose.shaded.json.JSONObject;
import javax.net.ssl.HttpsURLConnection;
import java.io.ByteArrayOutputStream;
@@ -52,7 +52,7 @@ public class Metrics {
/**
* Creates a new instance and starts submitting immediately.
- *
+ *
* @param name The bStats metrics identifier.
* @param serverUUID The unique identifier of this server.
* @param logFailedRequests If failed submissions should be logged.
@@ -319,7 +319,7 @@ protected JSONObject getChartData() throws Exception {
return createAdvancedChartData(callable);
}
}
-
+
private static JSONObject createAdvancedChartData(final Callable> callable) throws Exception {
JSONObject data = new JSONObject();
JSONObject values = new JSONObject();
@@ -539,3 +539,4 @@ protected JSONObject getChartData() throws Exception {
}
}
+
diff --git a/src/main/java/cn/nukkit/nbt/stream/FastByteArrayOutputStream.java b/src/main/java/cn/nukkit/nbt/stream/FastByteArrayOutputStream.java
index 175ac8a7e09..703299a7f82 100644
--- a/src/main/java/cn/nukkit/nbt/stream/FastByteArrayOutputStream.java
+++ b/src/main/java/cn/nukkit/nbt/stream/FastByteArrayOutputStream.java
@@ -82,7 +82,8 @@ public FastByteArrayOutputStream reset() {
return this;
}
- public void write( final int b ) {
+ @Override
+ public void write(final int b ) {
if ( position == length ) {
length++;
if ( position == array.length ) array = grow( array, length );
@@ -118,7 +119,8 @@ public static byte[] grow( final byte[] array, final int length, final int prese
return array;
}
- public void write( final byte[] b, final int off, final int len ) throws IOException {
+ @Override
+ public void write(final byte[] b, final int off, final int len ) throws IOException {
if ( position + len > array.length ) array = grow( array, position + len, position );
System.arraycopy( b, off, array, position, len );
if ( position + len > length ) length = position += len;
@@ -141,4 +143,4 @@ public byte[] toByteArray() {
if (position == array.length) return array;
return Arrays.copyOfRange(array, 0, position);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/cn/nukkit/nbt/tag/CompoundTag.java b/src/main/java/cn/nukkit/nbt/tag/CompoundTag.java
index ce61165702a..4d3f50d9594 100644
--- a/src/main/java/cn/nukkit/nbt/tag/CompoundTag.java
+++ b/src/main/java/cn/nukkit/nbt/tag/CompoundTag.java
@@ -24,10 +24,12 @@ public CompoundTag(String name) {
this(name, new HashMap<>());
}
+ @PowerNukkitOnly
public CompoundTag(Map tags) {
this("", tags);
}
+ @PowerNukkitOnly
public CompoundTag(String name, Map tags) {
super(name);
this.tags = tags;
@@ -308,12 +310,14 @@ public boolean getBoolean(String name) {
return getByte(name) != 0;
}
+ @Override
public String toString() {
StringJoiner joiner = new StringJoiner(",\n\t");
tags.forEach((key, tag) -> joiner.add('\'' + key + "' : " + tag.toString().replace("\n", "\n\t")));
return "CompoundTag '" + this.getName() + "' (" + tags.size() + " entries) {\n\t" + joiner.toString() + "\n}";
}
+ @Override
public void print(String prefix, PrintStream out) {
super.print(prefix, out);
out.println(prefix + "{");
@@ -329,6 +333,7 @@ public boolean isEmpty() {
return tags.isEmpty();
}
+ @Override
public CompoundTag copy() {
CompoundTag tag = new CompoundTag(getName());
for (String key : tags.keySet()) {
diff --git a/src/main/java/cn/nukkit/nbt/tag/ListTag.java b/src/main/java/cn/nukkit/nbt/tag/ListTag.java
index bdc142ce2fa..8fe398c7bb0 100644
--- a/src/main/java/cn/nukkit/nbt/tag/ListTag.java
+++ b/src/main/java/cn/nukkit/nbt/tag/ListTag.java
@@ -62,6 +62,7 @@ public String toString() {
return "ListTag '" + this.getName() + "' (" + list.size() + " entries of type " + Tag.getTagName(type) + ") {\n\t" + joiner.toString() + "\n}";
}
+ @Override
public void print(String prefix, PrintStream out) {
super.print(prefix, out);
diff --git a/src/main/java/cn/nukkit/nbt/tag/Tag.java b/src/main/java/cn/nukkit/nbt/tag/Tag.java
index 3b5a572a419..7e70c5e5854 100644
--- a/src/main/java/cn/nukkit/nbt/tag/Tag.java
+++ b/src/main/java/cn/nukkit/nbt/tag/Tag.java
@@ -28,6 +28,7 @@ public abstract class Tag {
abstract void load(NBTInputStream dis) throws IOException;
+ @Override
public abstract String toString();
public abstract byte getId();
diff --git a/src/main/java/cn/nukkit/network/CompressionProvider.java b/src/main/java/cn/nukkit/network/CompressionProvider.java
new file mode 100644
index 00000000000..ceb7a26cab4
--- /dev/null
+++ b/src/main/java/cn/nukkit/network/CompressionProvider.java
@@ -0,0 +1,44 @@
+package cn.nukkit.network;
+
+import cn.nukkit.network.protocol.types.PacketCompressionAlgorithm;
+import cn.nukkit.utils.BinaryStream;
+
+public interface CompressionProvider {
+
+ CompressionProvider NONE = new CompressionProvider() {
+ @Override
+ public byte[] compress(BinaryStream packet, int level) throws Exception {
+ return packet.getBuffer();
+ }
+
+ @Override
+ public byte[] decompress(byte[] compressed) throws Exception {
+ return compressed;
+ }
+ };
+
+ CompressionProvider ZLIB = new CompressionProvider() {
+ @Override
+ public byte[] compress(BinaryStream packet, int level) throws Exception {
+ return Network.deflateRaw(packet.getBuffer(), level);
+ }
+
+ @Override
+ public byte[] decompress(byte[] compressed) throws Exception {
+ return Network.inflateRaw(compressed);
+ }
+ };
+
+
+ byte[] compress(BinaryStream packet, int level) throws Exception;
+ byte[] decompress(byte[] compressed) throws Exception;
+
+ static CompressionProvider from(PacketCompressionAlgorithm algorithm) {
+ if (algorithm == null) {
+ return NONE;
+ } else if (algorithm == PacketCompressionAlgorithm.ZLIB) {
+ return ZLIB;
+ }
+ throw new UnsupportedOperationException();
+ }
+}
diff --git a/src/main/java/cn/nukkit/network/Network.java b/src/main/java/cn/nukkit/network/Network.java
index d46c1db15de..a1a8b699b9b 100644
--- a/src/main/java/cn/nukkit/network/Network.java
+++ b/src/main/java/cn/nukkit/network/Network.java
@@ -4,6 +4,7 @@
import cn.nukkit.Server;
import cn.nukkit.api.DeprecationDetails;
import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.nbt.stream.FastByteArrayOutputStream;
import cn.nukkit.network.protocol.*;
@@ -222,21 +223,32 @@ public Server getServer() {
return server;
}
+ @Since("FUTURE")
public void processBatch(BatchPacket packet, Player player) {
List packets = new ObjectArrayList<>();
try {
- processBatch(packet.payload, packets);
+ this.processBatch(packet.payload, packets, player.getNetworkSession() == null ? CompressionProvider.ZLIB : player.getNetworkSession().getCompression());
} catch (ProtocolException e) {
player.close("", e.getMessage());
log.error("Unable to process player packets ", e);
}
}
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ @Deprecated
+ @DeprecationDetails(since = "FUTURE", reason = "Cloudburst Nukkit has added a new method for batch packets", replaceWith = "Network.processBatch(BatchPacket, Player)")
+ public List unpackBatchedPackets(BatchPacket packet) throws ProtocolException {
+ List packets = new ObjectArrayList<>();
+ processBatch(packet.payload, packets, CompressionProvider.ZLIB);
+ return packets;
+ }
+
@Since("1.4.0.0-PN")
- public void processBatch(byte[] payload, Collection packets) throws ProtocolException {
+ public void processBatch(byte[] payload, Collection packets, CompressionProvider compression) throws ProtocolException {
byte[] data;
try {
- data = Network.inflateRaw(payload);
+ data = compression.decompress(payload);
} catch (Exception e) {
log.debug("Exception while inflating batch packet", e);
return;
@@ -308,13 +320,14 @@ public void processPackets(Player player, List packets) {
}
@Deprecated
- @DeprecationDetails(since = "1.4.0.0-PN", by = "Cloudburst Nukkit",
- reason = "Changed the id to int without backward compatibility",
+ @DeprecationDetails(since = "1.4.0.0-PN", by = "Cloudburst Nukkit",
+ reason = "Changed the id to int without backward compatibility",
replaceWith = "getPacket(int id)")
+ @PowerNukkitOnly
public DataPacket getPacket(byte id) {
return getPacket((int) id);
}
-
+
@Since("1.4.0.0-PN")
public DataPacket getPacket(int id) {
Class clazz = this.packetPool[id];
@@ -454,23 +467,34 @@ private void registerPackets() {
this.registerPacket(ProtocolInfo.MAP_CREATE_LOCKED_COPY_PACKET, MapCreateLockedCopyPacket.class);
this.registerPacket(ProtocolInfo.EMOTE_PACKET, EmotePacket.class);
this.registerPacket(ProtocolInfo.ON_SCREEN_TEXTURE_ANIMATION_PACKET, OnScreenTextureAnimationPacket.class);
+ this.registerPacket(ProtocolInfo.TICK_SYNC_PACKET, TickSyncPacket.class);
this.registerPacket(ProtocolInfo.COMPLETED_USING_ITEM_PACKET, CompletedUsingItemPacket.class);
- this.registerPacket(ProtocolInfo.CODE_BUILDER_PACKET, CodeBuilderPacket.class);
+ this.registerPacket(ProtocolInfo.NETWORK_SETTINGS_PACKET, NetworkSettingsPacket.class);
+ //this.registerPacket(ProtocolInfo.PLAYER_AUTH_INPUT_PACKET, PlayerAuthInputPacket.class);
this.registerPacket(ProtocolInfo.CREATIVE_CONTENT_PACKET, CreativeContentPacket.class);
- this.registerPacket(ProtocolInfo.DEBUG_INFO_PACKET, DebugInfoPacket.class);
- this.registerPacket(ProtocolInfo.EMOTE_LIST_PACKET, EmoteListPacket.class);
+ this.registerPacket(ProtocolInfo.PLAYER_ENCHANT_OPTIONS_PACKET, PlayerEnchantOptionsPacket.class);
this.registerPacket(ProtocolInfo.ITEM_STACK_REQUEST_PACKET, ItemStackRequestPacket.class);
this.registerPacket(ProtocolInfo.ITEM_STACK_RESPONSE_PACKET, ItemStackResponsePacket.class);
- this.registerPacket(ProtocolInfo.PACKET_VIOLATION_WARNING_PACKET, PacketViolationWarningPacket.class);
this.registerPacket(ProtocolInfo.PLAYER_ARMOR_DAMAGE_PACKET, PlayerArmorDamagePacket.class);
- this.registerPacket(ProtocolInfo.PLAYER_ENCHANT_OPTIONS_PACKET, PlayerEnchantOptionsPacket.class);
- this.registerPacket(ProtocolInfo.POS_TRACKING_CLIENT_REQUEST_PACKET, PositionTrackingDBClientRequestPacket.class);
- this.registerPacket(ProtocolInfo.POS_TRACKING_SERVER_BROADCAST_PACKET, PositionTrackingDBServerBroadcastPacket.class);
+ this.registerPacket(ProtocolInfo.CODE_BUILDER_PACKET, CodeBuilderPacket.class);
this.registerPacket(ProtocolInfo.UPDATE_PLAYER_GAME_TYPE_PACKET, UpdatePlayerGameTypePacket.class);
- this.registerPacket(ProtocolInfo.FILTER_TEXT_PACKET, FilterTextPacket.class);
+ this.registerPacket(ProtocolInfo.EMOTE_LIST_PACKET, EmoteListPacket.class);
+ this.registerPacket(ProtocolInfo.POS_TRACKING_SERVER_BROADCAST_PACKET, PositionTrackingDBServerBroadcastPacket.class);
+ this.registerPacket(ProtocolInfo.POS_TRACKING_CLIENT_REQUEST_PACKET, PositionTrackingDBClientRequestPacket.class);
+ this.registerPacket(ProtocolInfo.DEBUG_INFO_PACKET, DebugInfoPacket.class);
+ this.registerPacket(ProtocolInfo.PACKET_VIOLATION_WARNING_PACKET, PacketViolationWarningPacket.class);
+ this.registerPacket(ProtocolInfo.ANIMATE_ENTITY_PACKET, AnimateEntityPacket.class);
this.registerPacket(ProtocolInfo.ITEM_COMPONENT_PACKET, ItemComponentPacket.class);
- this.registerPacket(ProtocolInfo.ADD_VOLUME_ENTITY, AddVolumeEntityPacket.class);
- this.registerPacket(ProtocolInfo.REMOVE_VOLUME_ENTITY, RemoveVolumeEntityPacket.class);
- this.registerPacket(ProtocolInfo.SYNC_ENTITY_PROPERTY, SyncEntityPropertyPacket.class);
+ this.registerPacket(ProtocolInfo.FILTER_TEXT_PACKET, FilterTextPacket.class);
+ this.registerPacket(ProtocolInfo.SYNC_ENTITY_PROPERTY_PACKET, SyncEntityPropertyPacket.class);
+ this.registerPacket(ProtocolInfo.ADD_VOLUME_ENTITY_PACKET, AddVolumeEntityPacket.class);
+ this.registerPacket(ProtocolInfo.REMOVE_VOLUME_ENTITY_PACKET, RemoveVolumeEntityPacket.class);
+ this.registerPacket(ProtocolInfo.SIMULATION_TYPE_PACKET, SimulationTypePacket.class);
+ this.registerPacket(ProtocolInfo.NPC_DIALOGUE_PACKET, NPCDialoguePacket.class);
+ this.registerPacket(ProtocolInfo.REQUEST_ABILITY_PACKET, RequestAbilityPacket.class);
+ //this.registerPacket(ProtocolInfo.TOAST_REQUEST_PACKET, ToastRequestPacket.class);
+ this.registerPacket(ProtocolInfo.UPDATE_ABILITIES_PACKET, UpdateAbilitiesPacket.class);
+ this.registerPacket(ProtocolInfo.UPDATE_ADVENTURE_SETTINGS_PACKET, UpdateAdventureSettingsPacket.class);
+ this.registerPacket(ProtocolInfo.REQUEST_NETWORK_SETTINGS_PACKET, RequestNetworkSettingsPacket.class);
}
}
diff --git a/src/main/java/cn/nukkit/network/RakNetInterface.java b/src/main/java/cn/nukkit/network/RakNetInterface.java
index 481f0198d70..8a5aaffdf72 100644
--- a/src/main/java/cn/nukkit/network/RakNetInterface.java
+++ b/src/main/java/cn/nukkit/network/RakNetInterface.java
@@ -2,36 +2,31 @@
import cn.nukkit.Player;
import cn.nukkit.Server;
+import cn.nukkit.api.DeprecationDetails;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.event.player.PlayerCreationEvent;
import cn.nukkit.event.server.QueryRegenerateEvent;
-import cn.nukkit.network.protocol.BatchPacket;
import cn.nukkit.network.protocol.DataPacket;
import cn.nukkit.network.protocol.ProtocolInfo;
-import cn.nukkit.utils.BinaryStream;
+import cn.nukkit.network.session.NetworkPlayerSession;
+import cn.nukkit.network.session.RakNetPlayerSession;
import cn.nukkit.utils.Utils;
-import com.google.common.base.Preconditions;
+
import com.google.common.base.Strings;
+
import com.nukkitx.network.raknet.*;
-import com.nukkitx.network.util.DisconnectReason;
+
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.socket.DatagramPacket;
-import io.netty.util.concurrent.EventExecutor;
-import io.netty.util.concurrent.FastThreadLocal;
-import io.netty.util.concurrent.ScheduledFuture;
import io.netty.util.internal.PlatformDependent;
-import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import lombok.RequiredArgsConstructor;
+
import lombok.extern.log4j.Log4j2;
-import org.apache.logging.log4j.message.FormattedMessage;
-import java.io.IOException;
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
-import java.net.ProtocolException;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -43,43 +38,23 @@
public class RakNetInterface implements RakNetServerListener, AdvancedSourceInterface {
private final Server server;
-
private Network network;
-
private final RakNetServer raknet;
- private final Map sessions = new HashMap<>();
-
- private final Queue sessionCreationQueue = PlatformDependent.newMpscQueue();
+ private final Map sessions = new HashMap<>();
+ private final Queue sessionCreationQueue = PlatformDependent.newMpscQueue();
- private final Set> tickFutures = new HashSet<>();
-
- private final FastThreadLocal> sessionsToTick = new FastThreadLocal>() {
- @Override
- protected Set initialValue() {
- return Collections.newSetFromMap(new IdentityHashMap<>());
- }
- };
-
private byte[] advertisement;
public RakNetInterface(Server server) {
this.server = server;
InetSocketAddress bindAddress = new InetSocketAddress(Strings.isNullOrEmpty(this.server.getIp()) ? "0.0.0.0" : this.server.getIp(), this.server.getPort());
-
this.raknet = new RakNetServer(bindAddress, Runtime.getRuntime().availableProcessors());
+ this.raknet.setProtocolVersion(11);
this.raknet.bind().join();
this.raknet.setListener(this);
-
- for (EventExecutor executor : this.raknet.getBootstrap().config().group()) {
- this.tickFutures.add(executor.scheduleAtFixedRate(() -> {
- for (NukkitRakNetSession session : sessionsToTick.get()) {
- session.sendOutbound();
- }
- }, 0, 50, TimeUnit.MILLISECONDS));
- }
}
@Override
@@ -89,41 +64,35 @@ public void setNetwork(Network network) {
@Override
public boolean process() {
- NukkitRakNetSession session;
+ RakNetPlayerSession session;
while ((session = this.sessionCreationQueue.poll()) != null) {
- InetSocketAddress address = session.raknet.getAddress();
- PlayerCreationEvent ev = new PlayerCreationEvent(this, Player.class, Player.class, null, address);
- this.server.getPluginManager().callEvent(ev);
- Class clazz = ev.getPlayerClass();
-
+ InetSocketAddress address = session.getRakNetSession().getAddress();
try {
- Constructor constructor = clazz.getConstructor(SourceInterface.class, Long.class, InetSocketAddress.class);
- Player player = constructor.newInstance(this, ev.getClientId(), ev.getSocketAddress());
+ PlayerCreationEvent event = new PlayerCreationEvent(this, Player.class, Player.class, null, address);
+ this.server.getPluginManager().callEvent(event);
+
+ this.sessions.put(event.getSocketAddress(), session);
+
+ Constructor constructor = event.getPlayerClass().getConstructor(SourceInterface.class, Long.class, InetSocketAddress.class);
+ Player player = constructor.newInstance(this, event.getClientId(), event.getSocketAddress());
this.server.addPlayer(address, player);
- session.player = player;
- this.sessions.put(address, session);
- } catch (NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException e) {
- log.error("Error while creating the player class {}", clazz, e);
+ session.setPlayer(player);
+ } catch (Exception e) {
+ log.error("Failed to create player", e);
+ session.disconnect("Internal error");
+ this.sessions.remove(address);
}
}
- Iterator iterator = this.sessions.values().iterator();
+ Iterator iterator = this.sessions.values().iterator();
while (iterator.hasNext()) {
- NukkitRakNetSession nukkitSession = iterator.next();
- Player player = nukkitSession.player;
- if (nukkitSession.disconnectReason != null) {
- player.close(player.getLeaveMessage(), nukkitSession.disconnectReason, false);
+ RakNetPlayerSession nukkitSession = iterator.next();
+ Player player = nukkitSession.getPlayer();
+ if (nukkitSession.getDisconnectReason() != null) {
+ player.close(player.getLeaveMessage(), nukkitSession.getDisconnectReason(), false);
iterator.remove();
- continue;
- }
- DataPacket packet;
- while ((packet = nukkitSession.inbound.poll()) != null) {
- try {
- nukkitSession.player.handleDataPacket(packet);
- } catch (Exception e) {
- log.error(new FormattedMessage("An error occurred whilst handling {} for {}",
- new Object[]{packet.getClass().getSimpleName(), nukkitSession.player.getName()}, e));
- }
+ } else {
+ nukkitSession.serverTick();
}
}
return true;
@@ -131,10 +100,15 @@ public boolean process() {
@Override
public int getNetworkLatency(Player player) {
- RakNetServerSession session = this.raknet.getSession(player.getSocketAddress());
+ RakNetServerSession session = this.raknet.getSession(player.getRawSocketAddress());
return session == null ? -1 : (int) session.getPing();
}
+ @Override
+ public NetworkPlayerSession getSession(InetSocketAddress address) {
+ return this.sessions.get(address);
+ }
+
@Override
public void close(Player player) {
this.close(player, "unknown reason");
@@ -142,21 +116,21 @@ public void close(Player player) {
@Override
public void close(Player player, String reason) {
- RakNetServerSession session = this.raknet.getSession(player.getSocketAddress());
- if (session != null) {
- session.close();
+ NetworkPlayerSession playerSession = this.getSession(player.getRawSocketAddress());
+ if (playerSession != null) {
+ playerSession.disconnect(reason);
}
}
@Override
public void shutdown() {
- this.tickFutures.forEach(future -> future.cancel(false));
+ this.sessions.values().forEach(session -> session.disconnect("Shutdown"));
this.raknet.close();
}
@Override
public void emergencyShutdown() {
- this.tickFutures.forEach(future -> future.cancel(true));
+ this.sessions.values().forEach(session -> session.disconnect("Shutdown"));
this.raknet.close();
}
@@ -213,22 +187,15 @@ public Integer putPacket(Player player, DataPacket packet, boolean needACK) {
@Override
public Integer putPacket(Player player, DataPacket packet, boolean needACK, boolean immediate) {
- NukkitRakNetSession session = this.sessions.get(player.getSocketAddress());
-
+ RakNetPlayerSession session = this.sessions.get(player.getRawSocketAddress());
if (session != null) {
- packet.tryEncode();
- if (!immediate) {
- session.outbound.offer(packet.clone());
- } else {
- session.sendPacketImmediately(packet.clone());
- }
+ session.sendPacket(packet);
}
-
return null;
}
@Override
- public boolean onConnectionRequest(InetSocketAddress inetSocketAddress) {
+ public boolean onConnectionRequest(InetSocketAddress address, InetSocketAddress realAddress) {
return true;
}
@@ -239,15 +206,19 @@ public byte[] onQuery(InetSocketAddress inetSocketAddress) {
@Override
public void onSessionCreation(RakNetServerSession session) {
- NukkitRakNetSession nukkitSession = new NukkitRakNetSession(session);
- session.setListener(nukkitSession);
- this.sessionCreationQueue.offer(nukkitSession);
-
// We need to make sure this gets put into the correct thread local hashmap
// for ticking or race conditions will occur.
- session.getEventLoop().execute(() -> {
- this.sessionsToTick.get().add(nukkitSession);
- });
+ if (session.getEventLoop().inEventLoop()) {
+ this.onSessionCreation0(session);
+ } else {
+ session.getEventLoop().execute(() -> this.onSessionCreation0(session));
+ }
+ }
+
+ private void onSessionCreation0(RakNetServerSession session) {
+ RakNetPlayerSession nukkitSession = new RakNetPlayerSession(this, session);
+ session.setListener(nukkitSession);
+ this.sessionCreationQueue.offer(nukkitSession);
}
@Override
@@ -255,115 +226,20 @@ public void onUnhandledDatagram(ChannelHandlerContext ctx, DatagramPacket datagr
this.server.handlePacket(datagramPacket.sender(), datagramPacket.content());
}
- @RequiredArgsConstructor
- private class NukkitRakNetSession implements RakNetSessionListener {
- private final RakNetServerSession raknet;
- private final Queue inbound = PlatformDependent.newSpscQueue();
- private final Queue outbound = PlatformDependent.newMpscQueue();
- private String disconnectReason = null;
- private Player player;
-
- @Override
- public void onSessionChangeState(RakNetState rakNetState) {
- }
-
- @Override
- public void onDisconnect(DisconnectReason disconnectReason) {
- if (disconnectReason == DisconnectReason.TIMED_OUT) {
- this.disconnect("Timed out");
- } else {
- this.disconnect("Disconnected from Server");
- }
- }
-
- @Override
- public void onEncapsulated(EncapsulatedPacket packet) {
- ByteBuf buffer = packet.getBuffer();
- short packetId = buffer.readUnsignedByte();
- if (packetId == 0xfe) {
- byte[] packetBuffer = new byte[buffer.readableBytes()];
- buffer.readBytes(packetBuffer);
-
- try {
- RakNetInterface.this.network.processBatch(packetBuffer, this.inbound);
- } catch (ProtocolException e) {
- this.disconnect("Sent malformed packet");
- log.error("Unable to process batch packet", e);
- }
- }
- }
-
- @Override
- public void onDirect(ByteBuf byteBuf) {
- // We don't allow any direct packets so ignore.
- }
-
- private void disconnect(String message) {
- this.disconnectReason = message;
- RakNetInterface.this.sessionsToTick.get().remove(this);
- }
-
- private void sendOutbound() {
- List toBatch = new ObjectArrayList<>();
- DataPacket packet;
- while ((packet = this.outbound.poll()) != null) {
- if (packet.pid() == ProtocolInfo.BATCH_PACKET) {
- if (!toBatch.isEmpty()) {
- this.sendPackets(toBatch);
- toBatch.clear();
- }
-
- this.sendPacket(((BatchPacket) packet).payload);
- } else {
- toBatch.add(packet);
- }
- }
-
- if (!toBatch.isEmpty()) {
- this.sendPackets(toBatch);
- }
- }
-
- private void sendPackets(Collection packets) {
- BinaryStream batched = new BinaryStream();
- for (DataPacket packet : packets) {
- Preconditions.checkArgument(!(packet instanceof BatchPacket), "Cannot batch BatchPacket");
- Preconditions.checkState(packet.isEncoded, "Packet should have already been encoded");
- byte[] buf = packet.getBuffer();
- batched.putUnsignedVarInt(buf.length);
- batched.put(buf);
- }
-
- try {
- this.sendPacket(Network.deflateRaw(batched.getBuffer(), network.getServer().networkCompressionLevel));
- } catch (IOException e) {
- log.error("Unable to compress batched packets", e);
- }
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ @Deprecated
+ @DeprecationDetails(since = "FUTURE", reason = "New Player method for sending the packet immediately has added by Cloudburst Nukkit", replaceWith = "Player.forceDataPacket(DataPacket, Runnable)")
+ @Override
+ public Integer putResourcePacket(Player player, DataPacket packet) {
+ RakNetPlayerSession session = this.sessions.get(player.getRawSocketAddress());
+ if (session != null) {
+ session.sendImmediatePacket(packet, () -> {});
}
+ return null;
+ }
- private void sendPacket(byte[] payload) {
- ByteBuf byteBuf = ByteBufAllocator.DEFAULT.ioBuffer(1 + payload.length);
- byteBuf.writeByte(0xfe);
- byteBuf.writeBytes(payload);
- this.raknet.send(byteBuf);
- }
-
- private void sendPacketImmediately(DataPacket packet) {
- BinaryStream batched = new BinaryStream();
- Preconditions.checkArgument(!(packet instanceof BatchPacket), "Cannot batch BatchPacket");
- Preconditions.checkState(packet.isEncoded, "Packet should have already been encoded");
- byte[] buf = packet.getBuffer();
- batched.putUnsignedVarInt(buf.length);
- batched.put(buf);
- try {
- byte[] payload = Network.deflateRaw(batched.getBuffer(), network.getServer().networkCompressionLevel);
- ByteBuf byteBuf = ByteBufAllocator.DEFAULT.ioBuffer(1 + payload.length);
- byteBuf.writeByte(0xfe);
- byteBuf.writeBytes(payload);
- this.raknet.send(byteBuf, RakNetPriority.IMMEDIATE);
- } catch (Exception e) {
- log.error("Error occured while sending a packet immediately", e);
- }
- }
+ public Network getNetwork() {
+ return this.network;
}
}
diff --git a/src/main/java/cn/nukkit/network/SourceInterface.java b/src/main/java/cn/nukkit/network/SourceInterface.java
index 5d4c0be9da9..208a298e194 100644
--- a/src/main/java/cn/nukkit/network/SourceInterface.java
+++ b/src/main/java/cn/nukkit/network/SourceInterface.java
@@ -1,7 +1,12 @@
package cn.nukkit.network;
import cn.nukkit.Player;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.network.protocol.DataPacket;
+import cn.nukkit.network.session.NetworkPlayerSession;
+
+import java.net.InetSocketAddress;
/**
@@ -9,11 +14,22 @@
*/
public interface SourceInterface {
- Integer putPacket(Player player, DataPacket packet);
+ @Deprecated
+ default Integer putPacket(Player player, DataPacket packet) {
+ throw new UnsupportedOperationException("This method is deprecated");
+ }
+
+ @Deprecated
+ default Integer putPacket(Player player, DataPacket packet, boolean needACK) {
+ throw new UnsupportedOperationException("This method is deprecated");
+ }
- Integer putPacket(Player player, DataPacket packet, boolean needACK);
+ @Deprecated
+ default Integer putPacket(Player player, DataPacket packet, boolean needACK, boolean immediate) {
+ throw new UnsupportedOperationException("This method is deprecated");
+ }
- Integer putPacket(Player player, DataPacket packet, boolean needACK, boolean immediate);
+ NetworkPlayerSession getSession(InetSocketAddress address);
int getNetworkLatency(Player player);
@@ -28,4 +44,11 @@ public interface SourceInterface {
void shutdown();
void emergencyShutdown();
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ @Deprecated
+ default Integer putResourcePacket(Player player, DataPacket packet) {
+ throw new UnsupportedOperationException("This method is deprecated");
+ }
}
diff --git a/src/main/java/cn/nukkit/network/protocol/AbstractResourcePackDataPacket.java b/src/main/java/cn/nukkit/network/protocol/AbstractResourcePackDataPacket.java
new file mode 100644
index 00000000000..708b578d6df
--- /dev/null
+++ b/src/main/java/cn/nukkit/network/protocol/AbstractResourcePackDataPacket.java
@@ -0,0 +1,54 @@
+package cn.nukkit.network.protocol;
+
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+import lombok.NoArgsConstructor;
+import org.powernukkit.version.Version;
+
+import java.util.UUID;
+
+@PowerNukkitOnly
+@Since("1.5.2.0-PN")
+@NoArgsConstructor(onConstructor = @__(@PowerNukkitOnly))
+public abstract class AbstractResourcePackDataPacket extends DataPacket {
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public abstract Version getPackVersion();
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public abstract void setPackVersion(Version version);
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public abstract UUID getPackId();
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public abstract void setPackId(UUID uuid);
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ protected void decodePackInfo() {
+ String packInfo = this.getString();
+ String[] packInfoParts = packInfo.split("_", 2);
+ try {
+ setPackId(UUID.fromString(packInfoParts[0]));
+ } catch (IllegalArgumentException exception) {
+ setPackId(null);
+ }
+ setPackVersion((packInfoParts.length > 1)? new Version(packInfoParts[1]) : null);
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ protected void encodePackInfo() {
+ UUID packId = getPackId();
+ Version packVersion = getPackVersion();
+ String packInfo = (packId != null) ? packId.toString() : new UUID(0, 0).toString();
+ if (packVersion != null) {
+ packInfo += "_" + packVersion;
+ }
+ this.putString(packInfo);
+ }
+}
diff --git a/src/main/java/cn/nukkit/network/protocol/AddEntityPacket.java b/src/main/java/cn/nukkit/network/protocol/AddEntityPacket.java
index aca438392ea..09eee20fc1d 100644
--- a/src/main/java/cn/nukkit/network/protocol/AddEntityPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/AddEntityPacket.java
@@ -123,13 +123,17 @@ public class AddEntityPacket extends DataPacket {
.put(EntityRavager.NETWORK_ID, "minecraft:ravager")
.put(EntityVillager.NETWORK_ID, "minecraft:villager_v2")
.put(EntityZombieVillager.NETWORK_ID, "minecraft:zombie_villager_v2")
- .put(121, "minecraft:fox")
+ .put(EntityFox.NETWORK_ID, "minecraft:fox")
.put(EntityBee.NETWORK_ID, "minecraft:bee")
.put(EntityPiglin.NETWORK_ID, "minecraft:piglin")
.put(EntityHoglin.NETWORK_ID, "minecraft:hoglin")
.put(EntityStrider.NETWORK_ID, "minecraft:strider")
.put(EntityZoglin.NETWORK_ID, "minecraft:zoglin")
.put(EntityPiglinBrute.NETWORK_ID, "minecraft:piglin_brute")
+ .put(128, "minecraft:goat")
+ .put(129, "minecraft:glow_squid")
+ .put(130, "minecraft:axolotl")
+ .put(134, "minecraft:allay")
.build();
@Override
@@ -150,6 +154,7 @@ public byte pid() {
public float yaw;
public float pitch;
public float headYaw;
+ public float bodyYaw = -1;
public EntityMetadata metadata = new EntityMetadata();
public Attribute[] attributes = Attribute.EMPTY_ARRAY;
public EntityLink[] links = EntityLink.EMPTY_ARRAY;
@@ -173,8 +178,11 @@ public void encode() {
this.putLFloat(this.pitch);
this.putLFloat(this.yaw);
this.putLFloat(this.headYaw);
+ this.putLFloat(this.bodyYaw == -1 ? this.yaw : this.bodyYaw);
this.putAttributeList(this.attributes);
this.put(Binary.writeMetadata(this.metadata));
+ this.putUnsignedVarInt(0); // Entity properties int
+ this.putUnsignedVarInt(0); // Entity properties float
this.putUnsignedVarInt(this.links.length);
for (EntityLink link : links) {
putEntityLink(link);
diff --git a/src/main/java/cn/nukkit/network/protocol/AddPlayerPacket.java b/src/main/java/cn/nukkit/network/protocol/AddPlayerPacket.java
index 4a50b20ed2f..04a9c506142 100644
--- a/src/main/java/cn/nukkit/network/protocol/AddPlayerPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/AddPlayerPacket.java
@@ -1,5 +1,7 @@
package cn.nukkit.network.protocol;
+import cn.nukkit.Server;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.data.EntityMetadata;
import cn.nukkit.item.Item;
import cn.nukkit.utils.Binary;
@@ -33,6 +35,7 @@ public byte pid() {
public float pitch;
public float yaw;
public Item item;
+ @Since("1.6.0.0-PN") public int gameType = Server.getInstance().getGamemode();
public EntityMetadata metadata = new EntityMetadata();
//public EntityLink links = new EntityLink[0];
public String deviceId = "";
@@ -48,7 +51,7 @@ public void encode() {
this.reset();
this.putUUID(this.uuid);
this.putString(this.username);
- this.putEntityUniqueId(this.entityUniqueId);
+ // this.putEntityUniqueId(this.entityUniqueId);
this.putEntityRuntimeId(this.entityRuntimeId);
this.putString(this.platformChatId);
this.putVector3f(this.x, this.y, this.z);
@@ -57,13 +60,19 @@ public void encode() {
this.putLFloat(this.yaw); //TODO headrot
this.putLFloat(this.yaw);
this.putSlot(this.item);
+ this.putVarInt(this.gameType);
this.put(Binary.writeMetadata(this.metadata));
- this.putUnsignedVarInt(0); //TODO: Adventure settings
- this.putUnsignedVarInt(0);
- this.putUnsignedVarInt(0);
- this.putUnsignedVarInt(0);
- this.putUnsignedVarInt(0);
+ this.putUnsignedVarInt(0); // Entity properties int
+ this.putUnsignedVarInt(0); // Entity properties float
this.putLLong(entityUniqueId);
+ this.putUnsignedVarInt(0); // playerPermission
+ this.putUnsignedVarInt(0); // commandPermission
+ this.putUnsignedVarInt(1); // abilitiesLayer size
+ this.putLShort(1); // BASE layer type
+ this.putLInt(262143); // abilitiesSet - all abilities
+ this.putLInt(63); // abilityValues - survival abilities
+ this.putLFloat(0.1f); // flySpeed
+ this.putLFloat(0.05f); // walkSpeed
this.putUnsignedVarInt(0); //TODO: Entity links
this.putString(deviceId);
this.putLInt(buildPlatform);
diff --git a/src/main/java/cn/nukkit/network/protocol/AddVolumeEntityPacket.java b/src/main/java/cn/nukkit/network/protocol/AddVolumeEntityPacket.java
index fb2b4e38ec3..8947cacd6f1 100644
--- a/src/main/java/cn/nukkit/network/protocol/AddVolumeEntityPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/AddVolumeEntityPacket.java
@@ -9,11 +9,16 @@
public class AddVolumeEntityPacket extends DataPacket {
@PowerNukkitOnly
@Since("1.5.0.0-PN")
- public static final byte NETWORK_ID = ProtocolInfo.ADD_VOLUME_ENTITY;
+ public static final byte NETWORK_ID = ProtocolInfo.ADD_VOLUME_ENTITY_PACKET;
private long id;
private CompoundTag data;
+ @PowerNukkitOnly
+ @Since("1.5.0.0-PN")
+ public AddVolumeEntityPacket() {
+ // Does nothing
+ }
@Override
public byte pid() {
@@ -28,6 +33,7 @@ public void decode() {
@Override
public void encode() {
+ reset();
putUnsignedVarInt(id);
putTag(data);
}
diff --git a/src/main/java/cn/nukkit/network/protocol/AdventureSettingsPacket.java b/src/main/java/cn/nukkit/network/protocol/AdventureSettingsPacket.java
index e0d19d80312..e7673d35a6f 100644
--- a/src/main/java/cn/nukkit/network/protocol/AdventureSettingsPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/AdventureSettingsPacket.java
@@ -1,12 +1,15 @@
package cn.nukkit.network.protocol;
import cn.nukkit.Player;
+import cn.nukkit.api.DeprecationDetails;
import lombok.ToString;
/**
* @author Nukkit Project Team
*/
@ToString
+@Deprecated
+@DeprecationDetails(since = "FUTURE", reason = "It is no longer used since Minecraft BE 1.19.30", by = "Minecraft")
public class AdventureSettingsPacket extends DataPacket {
public static final byte NETWORK_ID = ProtocolInfo.ADVENTURE_SETTINGS_PACKET;
@@ -52,6 +55,7 @@ public class AdventureSettingsPacket extends DataPacket {
public long entityUniqueId; //This is a little-endian long, NOT a var-long. (WTF Mojang)
+ @Override
public void decode() {
this.flags = getUnsignedVarInt();
this.commandPermission = getUnsignedVarInt();
@@ -61,6 +65,7 @@ public void decode() {
this.entityUniqueId = getLLong();
}
+ @Override
public void encode() {
this.reset();
this.putUnsignedVarInt(this.flags);
diff --git a/src/main/java/cn/nukkit/network/protocol/AnimateEntityPacket.java b/src/main/java/cn/nukkit/network/protocol/AnimateEntityPacket.java
new file mode 100644
index 00000000000..1720e24e201
--- /dev/null
+++ b/src/main/java/cn/nukkit/network/protocol/AnimateEntityPacket.java
@@ -0,0 +1,131 @@
+package cn.nukkit.network.protocol;
+
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author IWareQ
+ */
+@PowerNukkitOnly
+@Since("1.5.1.0-PN")
+@NoArgsConstructor(onConstructor = @__(@PowerNukkitOnly))
+public class AnimateEntityPacket extends DataPacket {
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public static final byte NETWORK_ID = ProtocolInfo.ANIMATE_ENTITY_PACKET;
+
+ private String animation;
+ private String nextState;
+ private String stopExpression;
+ private String controller;
+ private float blendOutTime;
+ private List entityRuntimeIds = new ArrayList<>();
+
+ @Override
+ public void decode() {
+ this.animation = this.getString();
+ this.nextState = this.getString();
+ this.stopExpression = this.getString();
+ this.controller = this.getString();
+ this.blendOutTime = this.getLFloat();
+ for (int i = 0, len = (int) this.getUnsignedVarInt(); i < len; i++) {
+ this.entityRuntimeIds.add(this.getEntityRuntimeId());
+ }
+ }
+
+ @Override
+ public void encode() {
+ this.reset();
+ this.putString(this.animation);
+ this.putString(this.nextState);
+ this.putString(this.stopExpression);
+ this.putString(this.controller);
+ this.putLFloat(this.blendOutTime);
+ this.putUnsignedVarInt(this.entityRuntimeIds.size());
+ for (long entityRuntimeId : this.entityRuntimeIds){
+ this.putEntityRuntimeId(entityRuntimeId);
+ }
+ }
+
+ @Override
+ public byte pid() {
+ return NETWORK_ID;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public void setAnimation(String animation) {
+ this.animation = animation;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public String getAnimation() {
+ return this.animation;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public void setNextState(String nextState) {
+ this.nextState = nextState;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public String getNextState() {
+ return this.nextState;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public void setStopExpression(String stopExpression) {
+ this.stopExpression = stopExpression;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public String getStopExpression() {
+ return this.stopExpression;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public void setController(String controller) {
+ this.controller = controller;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public String getController() {
+ return this.controller;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public void setBlendOutTime(float blendOutTime) {
+ this.blendOutTime = blendOutTime;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public float getBlendOutTime() {
+ return this.blendOutTime;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public void setEntityRuntimeIds(List entityRuntimeIds) {
+ this.entityRuntimeIds = entityRuntimeIds;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.1.0-PN")
+ public List getEntityRuntimeIds() {
+ return this.entityRuntimeIds;
+ }
+}
diff --git a/src/main/java/cn/nukkit/network/protocol/AvailableCommandsPacket.java b/src/main/java/cn/nukkit/network/protocol/AvailableCommandsPacket.java
index 9b8bcc3a291..24ff7475df2 100644
--- a/src/main/java/cn/nukkit/network/protocol/AvailableCommandsPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/AvailableCommandsPacket.java
@@ -33,19 +33,19 @@ public class AvailableCommandsPacket extends DataPacket {
public static final int ARG_TYPE_VALUE = dynamic(4);
public static final int ARG_TYPE_WILDCARD_INT = dynamic(5);
public static final int ARG_TYPE_OPERATOR = dynamic(6);
- public static final int ARG_TYPE_TARGET = dynamic(7);
- public static final int ARG_TYPE_WILDCARD_TARGET = dynamic(8);
+ public static final int ARG_TYPE_TARGET = dynamic(8);
+ public static final int ARG_TYPE_WILDCARD_TARGET = dynamic(10);
- public static final int ARG_TYPE_FILE_PATH = dynamic(16);
+ public static final int ARG_TYPE_FILE_PATH = dynamic(17);
+ public static final int ARG_TYPE_EQUIPMENT_SLOT = dynamic(37);
+ public static final int ARG_TYPE_STRING = dynamic(39);
+ public static final int ARG_TYPE_BLOCK_POSITION = dynamic(47);
+ public static final int ARG_TYPE_POSITION = dynamic(48);
- public static final int ARG_TYPE_STRING = dynamic(32);
- public static final int ARG_TYPE_BLOCK_POSITION = dynamic(40);
- public static final int ARG_TYPE_POSITION = dynamic(41);
-
- public static final int ARG_TYPE_MESSAGE = dynamic(44);
- public static final int ARG_TYPE_RAWTEXT = dynamic(46);
- public static final int ARG_TYPE_JSON = dynamic(50);
- public static final int ARG_TYPE_COMMAND = dynamic(63);
+ public static final int ARG_TYPE_MESSAGE = dynamic(51);
+ public static final int ARG_TYPE_RAWTEXT = dynamic(53);
+ public static final int ARG_TYPE_JSON = dynamic(57);
+ public static final int ARG_TYPE_COMMAND = dynamic(70);
public Map commands;
public final Map> softEnums = new HashMap<>();
@@ -136,7 +136,7 @@ public void encode() {
putString(name);
putString(data.description);
- putByte((byte) data.flags);
+ putLShort(data.flags);
putByte((byte) data.permission);
putLInt(data.aliases == null ? -1 : enums.indexOf(data.aliases));
diff --git a/src/main/java/cn/nukkit/network/protocol/BossEventPacket.java b/src/main/java/cn/nukkit/network/protocol/BossEventPacket.java
index 2f422e96557..48c0e9c749e 100644
--- a/src/main/java/cn/nukkit/network/protocol/BossEventPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/BossEventPacket.java
@@ -1,5 +1,8 @@
package cn.nukkit.network.protocol;
+import cn.nukkit.api.DeprecationDetails;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import lombok.ToString;
/**
@@ -25,9 +28,14 @@ public class BossEventPacket extends DataPacket {
/* S2C: Sets title of the bar. */
public static final int TYPE_TITLE = 5;
/* S2C: Not sure on this. Includes color and overlay fields, plus an unknown short. TODO: check this */
- public static final int TYPE_UNKNOWN_6 = 6;
- /* S2C: Not implemented :( Intended to alter bar appearance, but these currently produce no effect on clientside whatsoever. */
+ @Since("1.6.0.0-PN") public static final int TYPE_UPDATE_PROPERTIES = 6;
+ @PowerNukkitOnly("Renamed by cloudburst")
+ @Deprecated
+ @DeprecationDetails(by = "Cloudburst", reason = "Renamed", replaceWith = "TYPE_UPDATE_PROPERTIES", since = "1.6.0.0-PN")
+ public static final int TYPE_UNKNOWN_6 = TYPE_UPDATE_PROPERTIES;
+ /* S2C: Sets color and overlay of the bar. */
public static final int TYPE_TEXTURE = 7;
+ public static final int TYPE_QUERY = 8;
public long bossEid;
public int type;
@@ -50,12 +58,13 @@ public void decode() {
switch (this.type) {
case TYPE_REGISTER_PLAYER:
case TYPE_UNREGISTER_PLAYER:
+ case TYPE_QUERY:
this.playerEid = this.getEntityUniqueId();
break;
case TYPE_SHOW:
this.title = this.getString();
this.healthPercent = this.getLFloat();
- case TYPE_UNKNOWN_6:
+ case TYPE_UPDATE_PROPERTIES:
this.unknown = (short) this.getShort();
case TYPE_TEXTURE:
this.color = (int) this.getUnsignedVarInt();
@@ -78,12 +87,13 @@ public void encode() {
switch (this.type) {
case TYPE_REGISTER_PLAYER:
case TYPE_UNREGISTER_PLAYER:
+ case TYPE_QUERY:
this.putEntityUniqueId(this.playerEid);
break;
case TYPE_SHOW:
this.putString(this.title);
this.putLFloat(this.healthPercent);
- case TYPE_UNKNOWN_6:
+ case TYPE_UPDATE_PROPERTIES:
this.putShort(this.unknown);
case TYPE_TEXTURE:
this.putUnsignedVarInt(this.color);
diff --git a/src/main/java/cn/nukkit/network/protocol/ClientboundMapItemDataPacket.java b/src/main/java/cn/nukkit/network/protocol/ClientboundMapItemDataPacket.java
index eba0bdc5470..c8cddc50655 100644
--- a/src/main/java/cn/nukkit/network/protocol/ClientboundMapItemDataPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/ClientboundMapItemDataPacket.java
@@ -2,6 +2,7 @@
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
+import cn.nukkit.math.BlockVector3;
import cn.nukkit.utils.Utils;
import io.netty.util.internal.EmptyArrays;
import lombok.ToString;
@@ -14,7 +15,9 @@
* @since 5.3.2017
*/
@ToString
-public class ClientboundMapItemDataPacket extends DataPacket { //TODO: update to 1.2
+public class ClientboundMapItemDataPacket extends DataPacket {
+
+ public static final byte NETWORK_ID = ProtocolInfo.CLIENTBOUND_MAP_ITEM_DATA_PACKET;
public int[] eids = EmptyArrays.EMPTY_INTS;
@@ -28,19 +31,20 @@ public class ClientboundMapItemDataPacket extends DataPacket { //TODO: update to
public int offsetZ;
public byte dimensionId;
+ public BlockVector3 origin = new BlockVector3();
public MapDecorator[] decorators = MapDecorator.EMPTY_ARRAY;
+ public MapTrackedObject[] trackedEntities = MapTrackedObject.EMPTY_ARRAY;
public int[] colors = EmptyArrays.EMPTY_INTS;
public BufferedImage image = null;
- //update
- public static final int TEXTURE_UPDATE = 2;
- public static final int DECORATIONS_UPDATE = 4;
- public static final int ENTITIES_UPDATE = 8;
+ public static final int TEXTURE_UPDATE = 0x02;
+ public static final int DECORATIONS_UPDATE = 0x04;
+ public static final int ENTITIES_UPDATE = 0x08;
@Override
public byte pid() {
- return ProtocolInfo.CLIENTBOUND_MAP_ITEM_DATA_PACKET;
+ return NETWORK_ID;
}
@Override
@@ -55,7 +59,7 @@ public void encode() {
int update = 0;
if (eids.length > 0) {
- update |= 0x08;
+ update |= ENTITIES_UPDATE;
}
if (decorators.length > 0) {
update |= DECORATIONS_UPDATE;
@@ -68,27 +72,40 @@ public void encode() {
this.putUnsignedVarInt(update);
this.putByte(this.dimensionId);
this.putBoolean(this.isLocked);
+ this.putBlockVector3(this.origin);
- if ((update & 0x08) != 0) { //TODO: find out what these are for
+ if ((update & ENTITIES_UPDATE) != 0) {
this.putUnsignedVarInt(eids.length);
for (int eid : eids) {
this.putEntityUniqueId(eid);
}
}
- if ((update & (TEXTURE_UPDATE | DECORATIONS_UPDATE)) != 0) {
+ if ((update & (ENTITIES_UPDATE | TEXTURE_UPDATE | DECORATIONS_UPDATE)) != 0) {
this.putByte(this.scale);
}
if ((update & DECORATIONS_UPDATE) != 0) {
+ this.putUnsignedVarInt(trackedEntities.length);
+ for (MapTrackedObject object : trackedEntities) {
+ this.putLInt(object.type);
+ if (object.type == MapTrackedObject.TYPE_BLOCK) {
+ this.putBlockVector3(object.x, object.y, object.z);
+ } else if (object.type == MapTrackedObject.TYPE_ENTITY) {
+ this.putEntityUniqueId(object.entityUniqueId);
+ } else {
+ throw new IllegalArgumentException("Unknown map object type " + object.type);
+ }
+ }
+
this.putUnsignedVarInt(decorators.length);
for (MapDecorator decorator : decorators) {
- this.putByte(decorator.rotation);
this.putByte(decorator.icon);
+ this.putByte(decorator.rotation);
this.putByte(decorator.offsetX);
this.putByte(decorator.offsetZ);
this.putString(decorator.label);
- this.putVarInt(decorator.color.getRGB());
+ this.putUnsignedVarInt(decorator.color.getRGB());
}
}
@@ -98,19 +115,19 @@ public void encode() {
this.putVarInt(offsetX);
this.putVarInt(offsetZ);
- this.putUnsignedVarInt(width * height);
+ this.putUnsignedVarInt((long) width * height);
if (image != null) {
for (int y = 0; y < width; y++) {
for (int x = 0; x < height; x++) {
- putUnsignedVarInt(Utils.toABGR(this.image.getRGB(x, y)));
+ this.putUnsignedVarInt(Utils.toABGR(this.image.getRGB(x, y)));
}
}
image.flush();
} else if (colors.length > 0) {
for (int color : colors) {
- putUnsignedVarInt(color);
+ this.putUnsignedVarInt(color);
}
}
}
@@ -120,7 +137,7 @@ public static class MapDecorator {
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public static final MapDecorator[] EMPTY_ARRAY = new MapDecorator[0];
-
+
public byte rotation;
public byte icon;
public byte offsetX;
@@ -128,4 +145,20 @@ public static class MapDecorator {
public String label;
public Color color;
}
+
+ public static class MapTrackedObject {
+ @PowerNukkitOnly
+ @Since("FUTURE")
+ public static final MapTrackedObject[] EMPTY_ARRAY = new MapTrackedObject[0];
+
+ public static final int TYPE_ENTITY = 0;
+ public static final int TYPE_BLOCK = 1;
+
+ public int type;
+ public long entityUniqueId;
+
+ public int x;
+ public int y;
+ public int z;
+ }
}
diff --git a/src/main/java/cn/nukkit/network/protocol/CraftingDataPacket.java b/src/main/java/cn/nukkit/network/protocol/CraftingDataPacket.java
index 31d40850681..2db3a3efafb 100644
--- a/src/main/java/cn/nukkit/network/protocol/CraftingDataPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/CraftingDataPacket.java
@@ -1,7 +1,7 @@
package cn.nukkit.network.protocol;
-import cn.nukkit.api.Since;
import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.inventory.*;
import cn.nukkit.item.Item;
import lombok.ToString;
@@ -26,6 +26,7 @@ public class CraftingDataPacket extends DataPacket {
public static final String CRAFTING_TAG_CAMPFIRE = "campfire";
public static final String CRAFTING_TAG_BLAST_FURNACE = "blast_furnace";
public static final String CRAFTING_TAG_SMOKER = "smoker";
+ @PowerNukkitOnly @Since("1.6.0.0-PN") public static final String CRAFTING_TAG_SMITHING_TABLE = "smithing_table";
private List entries = new ArrayList<>();
private final List brewingEntries = new ArrayList<>();
@@ -117,6 +118,8 @@ public void encode() {
break;
case SHAPELESS:
case CARTOGRAPHY:
+ case SHULKER_BOX:
+ case SMITHING:
ShapelessRecipe shapeless = (ShapelessRecipe) recipe;
this.putString(shapeless.getRecipeId());
List- ingredients = shapeless.getIngredientList();
@@ -127,7 +130,18 @@ public void encode() {
this.putUnsignedVarInt(1);
this.putSlot(shapeless.getResult(), true);
this.putUUID(shapeless.getId());
- this.putString(recipe.getType() == RecipeType.CARTOGRAPHY ? CRAFTING_TAG_CARTOGRAPHY_TABLE : CRAFTING_TAG_CRAFTING_TABLE);
+ switch (recipe.getType()) {
+ case CARTOGRAPHY:
+ this.putString(CRAFTING_TAG_CARTOGRAPHY_TABLE);
+ break;
+ case SHAPELESS:
+ case SHULKER_BOX:
+ this.putString(CRAFTING_TAG_CRAFTING_TABLE);
+ break;
+ case SMITHING:
+ this.putString(CRAFTING_TAG_SMITHING_TABLE);
+ break;
+ }
this.putVarInt(shapeless.getPriority());
this.putUnsignedVarInt(recipeNetworkId++);
break;
@@ -212,6 +226,8 @@ public void encode() {
this.putVarInt(recipe.getResult().getNetworkId());
}
+ this.putUnsignedVarInt(0); // Material reducers size
+
this.putBoolean(cleanRecipes);
}
diff --git a/src/main/java/cn/nukkit/network/protocol/CraftingEventPacket.java b/src/main/java/cn/nukkit/network/protocol/CraftingEventPacket.java
index fe0f70e2d4c..229649945ee 100644
--- a/src/main/java/cn/nukkit/network/protocol/CraftingEventPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/CraftingEventPacket.java
@@ -5,6 +5,7 @@
import cn.nukkit.api.Since;
import cn.nukkit.item.Item;
import cn.nukkit.utils.BinaryStream;
+import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.UUID;
@@ -13,6 +14,7 @@
* @author Nukkit Project Team
*/
@ToString
+@EqualsAndHashCode(callSuper = false)
public class CraftingEventPacket extends DataPacket {
public static final byte NETWORK_ID = ProtocolInfo.CRAFTING_EVENT_PACKET;
@@ -63,7 +65,7 @@ public class CraftingEventPacket extends DataPacket {
@Override
public void decode() {
this.windowId = this.getByte();
- this.type = (int) this.getUnsignedVarInt();
+ this.type = this.getVarInt();
this.id = this.getUUID();
this.input = this.getArray(Item.class, BinaryStream::getSlot);
@@ -72,7 +74,12 @@ public void decode() {
@Override
public void encode() {
+ putByte((byte) (windowId & 0xFF));
+ putVarInt(type);
+ putUUID(id);
+ putArray(input, this::putSlot);
+ putArray(output, this::putSlot);
}
@Override
diff --git a/src/main/java/cn/nukkit/network/protocol/DataPacket.java b/src/main/java/cn/nukkit/network/protocol/DataPacket.java
index 81fe8b501ea..7fc62c9ae71 100644
--- a/src/main/java/cn/nukkit/network/protocol/DataPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/DataPacket.java
@@ -1,6 +1,7 @@
package cn.nukkit.network.protocol;
import cn.nukkit.Server;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.network.Network;
import cn.nukkit.utils.Binary;
import cn.nukkit.utils.BinaryStream;
@@ -10,6 +11,7 @@
* @author MagicDroidX (Nukkit Project)
*/
public abstract class DataPacket extends BinaryStream implements Cloneable {
+ @PowerNukkitOnly
public static final DataPacket[] EMPTY_ARRAY = new DataPacket[0];
public volatile boolean isEncoded = false;
diff --git a/src/main/java/cn/nukkit/network/protocol/EntityEventPacket.java b/src/main/java/cn/nukkit/network/protocol/EntityEventPacket.java
index ed2c52e2865..da72b29328b 100644
--- a/src/main/java/cn/nukkit/network/protocol/EntityEventPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/EntityEventPacket.java
@@ -1,5 +1,6 @@
package cn.nukkit.network.protocol;
+import cn.nukkit.api.DeprecationDetails;
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
@@ -11,13 +12,14 @@
@ToString
public class EntityEventPacket extends DataPacket {
public static final int NETWORK_ID = ProtocolInfo.ENTITY_EVENT_PACKET;
-
+
@PowerNukkitOnly @Since("1.4.0.0-PN") public static final int NONE = 0;
- @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int JUMP = 1;
+ public static final int JUMP = 1;
public static final int HURT_ANIMATION = 2;
public static final int DEATH_ANIMATION = 3;
public static final int ARM_SWING = 4;
- @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int ATTACK_STOP = 5;
+ public static final int STOP_ATTACK = 5;
+ @Deprecated @DeprecationDetails(since = "FUTURE", reason = "Incorrect naming convention", by = "PowerNukkit", replaceWith = "STOP_ATTACK") @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int ATTACK_STOP = STOP_ATTACK;
public static final int TAME_FAIL = 6;
public static final int TAME_SUCCESS = 7;
public static final int SHAKE_WET = 8;
@@ -34,18 +36,22 @@ public class EntityEventPacket extends DataPacket {
public static final int IRON_GOLEM_OFFER_FLOWER = 19;
public static final int IRON_GOLEM_WITHDRAW_FLOWER = 20;
public static final int LOVE_PARTICLES = 21;
- @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int VILLAGER_ANGRY = 22;
- @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int VILLAGER_HAPPY = 23;
+ public static final int VILLAGER_ANGRY = 22;
+ public static final int VILLAGER_HAPPY = 23;
public static final int WITCH_SPELL_PARTICLES = 24;
public static final int FIREWORK_EXPLOSION = 25;
- @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int IN_LOVE_HEARTS = 26;
+ public static final int IN_LOVE_PARTICLES = 26;
+ @Deprecated @DeprecationDetails(since = "FUTURE", reason = "Incorrect naming convention", by = "PowerNukkit", replaceWith = "IN_LOVE_PARTICLES") @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int IN_LOVE_HEARTS = IN_LOVE_PARTICLES;
public static final int SILVERFISH_SPAWN_ANIMATION = 27;
- @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int GUARDIAN_ATTACK_ANIMATION = 28;
+ public static final int GUARDIAN_ATTACK = 28;
+ @Deprecated @DeprecationDetails(since = "FUTURE", reason = "Incorrect naming convention", by = "PowerNukkit", replaceWith = "GUARDIAN_ATTACK") @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int GUARDIAN_ATTACK_ANIMATION = GUARDIAN_ATTACK;
public static final int WITCH_DRINK_POTION = 29;
public static final int WITCH_THROW_POTION = 30;
public static final int MINECART_TNT_PRIME_FUSE = 31;
- @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int PRIME_CREEPER = 32;
- @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int AIR_SUPPLY = 33;
+ public static final int CREEPER_PRIME_FUSE = 32;
+ @Deprecated @DeprecationDetails(since = "FUTURE", reason = "Incorrect naming convention", by = "PowerNukkit", replaceWith = "CREEPER_PRIME_FUSE") @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int PRIME_CREEPER = CREEPER_PRIME_FUSE;
+ public static final int AIR_SUPPLY_EXPIRED = 33;
+ @Deprecated @DeprecationDetails(since = "FUTURE", reason = "Incorrect naming convention", by = "PowerNukkit", replaceWith = "AIR_SUPPLY_EXPIRED") @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int AIR_SUPPLY = AIR_SUPPLY_EXPIRED;
public static final int ENCHANT = 34;
public static final int ELDER_GUARDIAN_CURSE = 35;
public static final int AGENT_ARM_SWING = 36;
@@ -59,19 +65,27 @@ public class EntityEventPacket extends DataPacket {
public static final int DEATH_SMOKE_CLOUD = 61;
public static final int COMPLETE_TRADE = 62;
public static final int REMOVE_LEASH = 63;
- @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int CARAVAN = 64;
+ public static final int CARAVAN_UPDATED = 64;
+ @Deprecated @DeprecationDetails(since = "FUTURE", reason = "Incorrect naming convention", by = "PowerNukkit", replaceWith = "CARAVAN_UPDATED") @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int CARAVAN = CARAVAN_UPDATED;
public static final int CONSUME_TOTEM = 65;
public static final int PLAYER_CHECK_TREASURE_HUNTER_ACHIEVEMENT = 66;
public static final int ENTITY_SPAWN = 67;
public static final int DRAGON_PUKE = 68;
public static final int MERGE_ITEMS = 69;
- @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int START_SWIMMING = 70;
- @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int BALLOON_POP = 71;
- @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int TREASURE_HUNT = 72;
- @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int SUMMON_AGENT = 73;
- @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int FINISHED_CHARGING_CROSSBOW = 74;
- @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int LANDED_ON_GROUND = 75;
-
+ public static final int START_SWIM = 70;
+ @Deprecated @DeprecationDetails(since = "FUTURE", reason = "Incorrect naming convention", by = "PowerNukkit", replaceWith = "START_SWIM") @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int START_SWIMMING = START_SWIM;
+ public static final int BALLOON_POP = 71;
+ public static final int TREASURE_HUNT = 72;
+ public static final int AGENT_SUMMON = 73;
+ @Deprecated @DeprecationDetails(since = "FUTURE", reason = "Incorrect naming convention", by = "PowerNukkit", replaceWith = "AGENT_SUMMON") @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int SUMMON_AGENT = AGENT_SUMMON;
+ public static final int CHARGED_CROSSBOW = 74;
+ @Deprecated @DeprecationDetails(since = "FUTURE", reason = "Incorrect naming convention", by = "PowerNukkit", replaceWith = "CHARGED_CROSSBOW") @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int FINISHED_CHARGING_CROSSBOW = CHARGED_CROSSBOW;
+ public static final int FALL = 75;
+ @Deprecated @DeprecationDetails(since = "FUTURE", reason = "Incorrect naming convention", by = "PowerNukkit", replaceWith = "FALL") @PowerNukkitOnly @Since("1.4.0.0-PN") public static final int LANDED_ON_GROUND = FALL;
+ public static final int GROW_UP = 76;
+ public static final int VIBRATION_DETECTED = 77;
+ public static final int DRINK_MILK = 78;
+
@Override
public byte pid() {
return NETWORK_ID;
diff --git a/src/main/java/cn/nukkit/network/protocol/HurtArmorPacket.java b/src/main/java/cn/nukkit/network/protocol/HurtArmorPacket.java
index 81b84c0d29b..9d10bd9ad99 100644
--- a/src/main/java/cn/nukkit/network/protocol/HurtArmorPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/HurtArmorPacket.java
@@ -1,6 +1,5 @@
package cn.nukkit.network.protocol;
-import cn.nukkit.api.DeprecationDetails;
import cn.nukkit.api.Since;
import lombok.ToString;
@@ -18,16 +17,22 @@ public class HurtArmorPacket extends DataPacket {
@Since("1.3.0.0-PN")
public int damage;
+ @Since("1.5.2.0-PN")
+ public long armorSlots;
+
@Override
public void decode() {
-
+ this.cause = getVarInt();
+ this.damage = getVarInt();
+ this.armorSlots = getUnsignedVarLong();
}
@Override
public void encode() {
this.reset();
this.putVarInt(this.cause);
- this.putVarInt(damage);
+ this.putVarInt(this.damage);
+ this.putUnsignedVarLong(this.armorSlots);
}
@Override
diff --git a/src/main/java/cn/nukkit/network/protocol/ItemComponentPacket.java b/src/main/java/cn/nukkit/network/protocol/ItemComponentPacket.java
index c0dcb926944..bdbc1367316 100644
--- a/src/main/java/cn/nukkit/network/protocol/ItemComponentPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/ItemComponentPacket.java
@@ -5,24 +5,24 @@
import cn.nukkit.nbt.NBTIO;
import cn.nukkit.nbt.tag.CompoundTag;
import cn.nukkit.utils.MainLogger;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
import java.io.IOException;
import java.nio.ByteOrder;
-import lombok.ToString;
-
/**
* @author GoodLucky777
*/
@ToString
@PowerNukkitOnly
@Since("1.4.0.0-PN")
+@NoArgsConstructor(onConstructor = @__(@PowerNukkitOnly))
public class ItemComponentPacket extends DataPacket {
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public static final byte NETWORK_ID = ProtocolInfo.ITEM_COMPONENT_PACKET;
- @PowerNukkitOnly
@Since("1.4.0.0-PN")
private Entry[] entries = Entry.EMPTY_ARRAY;
diff --git a/src/main/java/cn/nukkit/network/protocol/ItemStackResponsePacket.java b/src/main/java/cn/nukkit/network/protocol/ItemStackResponsePacket.java
index 89f1dabc01b..c1e0c7baebf 100644
--- a/src/main/java/cn/nukkit/network/protocol/ItemStackResponsePacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/ItemStackResponsePacket.java
@@ -2,6 +2,7 @@
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
+import lombok.NoArgsConstructor;
import lombok.ToString;
/**
@@ -10,6 +11,7 @@
@PowerNukkitOnly
@Since("1.4.0.0-PN")
@ToString
+@NoArgsConstructor(onConstructor = @__(@PowerNukkitOnly))
public class ItemStackResponsePacket extends DataPacket {
@PowerNukkitOnly
@Since("1.4.0.0-PN")
diff --git a/src/main/java/cn/nukkit/network/protocol/LevelChunkPacket.java b/src/main/java/cn/nukkit/network/protocol/LevelChunkPacket.java
index 34643af62bb..682331f3fae 100644
--- a/src/main/java/cn/nukkit/network/protocol/LevelChunkPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/LevelChunkPacket.java
@@ -1,5 +1,6 @@
package cn.nukkit.network.protocol;
+import cn.nukkit.api.Since;
import lombok.ToString;
/**
@@ -18,6 +19,8 @@ public byte pid() {
public int chunkZ;
public int subChunkCount;
public boolean cacheEnabled;
+ @Since("1.6.0.0-PN") public boolean requestSubChunks;
+ @Since("1.6.0.0-PN") public int subChunkLimit;
public long[] blobIds;
public byte[] data;
@@ -31,7 +34,15 @@ public void encode() {
this.reset();
this.putVarInt(this.chunkX);
this.putVarInt(this.chunkZ);
- this.putUnsignedVarInt(this.subChunkCount);
+ if (!this.requestSubChunks) {
+ this.putUnsignedVarInt(this.subChunkCount);
+ } else if (this.subChunkLimit < 0) {
+ this.putUnsignedVarInt(-1);
+ } else {
+ this.putUnsignedVarInt(-2);
+ this.putUnsignedVarInt(this.subChunkLimit);
+ }
+
this.putBoolean(cacheEnabled);
if (this.cacheEnabled) {
this.putUnsignedVarInt(blobIds.length);
diff --git a/src/main/java/cn/nukkit/network/protocol/LevelSoundEventPacket.java b/src/main/java/cn/nukkit/network/protocol/LevelSoundEventPacket.java
index 0e0e65b01b1..4753cee87bb 100644
--- a/src/main/java/cn/nukkit/network/protocol/LevelSoundEventPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/LevelSoundEventPacket.java
@@ -1,7 +1,7 @@
package cn.nukkit.network.protocol;
import cn.nukkit.api.DeprecationDetails;
-import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.math.Vector3f;
import lombok.ToString;
@@ -161,7 +161,7 @@ public class LevelSoundEventPacket extends DataPacket {
public static final int SOUND_IMITATE_ELDER_GUARDIAN = 148;
public static final int SOUND_IMITATE_ENDER_DRAGON = 149;
public static final int SOUND_IMITATE_ENDERMAN = 150;
-
+ public static final int SOUND_IMITATE_ENDERMITE = 151;
public static final int SOUND_IMITATE_EVOCATION_ILLAGER = 152;
public static final int SOUND_IMITATE_GHAST = 153;
public static final int SOUND_IMITATE_HUSK = 154;
@@ -197,7 +197,7 @@ public class LevelSoundEventPacket extends DataPacket {
public static final int SOUND_ITEM_TRIDENT_THUNDER = 184;
public static final int SOUND_ITEM_TRIDENT_HIT_GROUND = 185;
public static final int SOUND_DEFAULT = 186;
-
+ public static final int SOUND_BLOCK_FLETCHING_TABLE_USE = 187;
public static final int SOUND_ELEMCONSTRUCT_OPEN = 188;
public static final int SOUND_ICEBOMB_HIT = 189;
public static final int SOUND_BALLOONPOP = 190;
@@ -205,7 +205,10 @@ public class LevelSoundEventPacket extends DataPacket {
public static final int SOUND_LT_REACTION_BLEACH = 192;
public static final int SOUND_LT_REACTION_EPASTE = 193;
public static final int SOUND_LT_REACTION_EPASTE2 = 194;
-
+ public static final int SOUND_LT_REACTION_GLOW_STICK = 195;
+ public static final int SOUND_LT_REACTION_GLOW_STICK_2 = 196;
+ public static final int SOUND_LT_REACTION_LUMINOL = 197;
+ public static final int SOUND_LT_REACTION_SALT = 198;
public static final int SOUND_LT_REACTION_FERTILIZER = 199;
public static final int SOUND_LT_REACTION_FIREBALL = 200;
public static final int SOUND_LT_REACTION_MGSALT = 201;
@@ -229,10 +232,14 @@ public class LevelSoundEventPacket extends DataPacket {
public static final int SOUND_HURT_BABY = 219;
public static final int SOUND_DEATH_BABY = 220;
public static final int SOUND_STEP_BABY = 221;
+ public static final int SOUND_SPAWN_BABY = 222;
+ @Deprecated @DeprecationDetails(since = "FUTURE", reason = "Incorrect naming convention", by = "PowerNukkit", replaceWith = "SOUND_SPAWN_BABY") @PowerNukkitOnly @Since("1.6.0.0-PN") public static final int SOUND_BABY_SPAWN = SOUND_SPAWN_BABY;
public static final int SOUND_BORN = 223;
public static final int SOUND_BLOCK_TURTLE_EGG_BREAK = 224;
public static final int SOUND_BLOCK_TURTLE_EGG_CRACK = 225;
public static final int SOUND_BLOCK_TURTLE_EGG_HATCH = 226;
+ public static final int SOUND_LAY_EGG = 227;
+ @Deprecated @DeprecationDetails(since = "FUTURE", reason = "Incorrect naming convention", by = "PowerNukkit", replaceWith = "SOUND_LAY_EGG") @PowerNukkitOnly @Since("1.6.0.0-PN") public static final int SOUND_TURTLE_LAY_EGG = SOUND_LAY_EGG;
public static final int SOUND_BLOCK_TURTLE_EGG_ATTACK = 228;
public static final int SOUND_BEACON_ACTIVATE = 229;
public static final int SOUND_BEACON_AMBIENT = 230;
@@ -260,9 +267,204 @@ public class LevelSoundEventPacket extends DataPacket {
public static final int SOUND_AMBIENT_AGGRESSIVE = 252;
public static final int SOUND_AMBIENT_WORRIED = 253;
public static final int SOUND_CANT_BREED = 254;
- public static final int SOUND_UNDEFINED = 255;
-
+ @Since("1.6.0.0-PN") public static final int SOUND_ITEM_SHIELD_BLOCK = 255;
+ @Since("1.6.0.0-PN") public static final int SOUND_ITEM_BOOK_PUT = 256;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_GRINDSTONE_USE = 257;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_BELL_HIT = 258;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_CAMPFIRE_CRACKLE = 259;
+ @Since("1.6.0.0-PN") public static final int SOUND_ROAR = 260;
+ @Since("1.6.0.0-PN") public static final int SOUND_STUN = 261;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_SWEET_BERRY_BUSH_HURT = 262;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_SWEET_BERRY_BUSH_PICK = 263;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_CARTOGRAPHY_TABLE_USE = 264;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_STONECUTTER_USE = 265;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_COMPOSTER_EMPTY = 266;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_COMPOSTER_FILL = 267;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_COMPOSTER_FILL_SUCCESS = 268;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_COMPOSTER_READY = 269;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_BARREL_OPEN = 270;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_BARREL_CLOSE = 271;
+ @Since("1.6.0.0-PN") public static final int SOUND_RAID_HORN = 272;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_LOOM_USE = 273;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_IN_RAID = 274;
+ @Since("1.6.0.0-PN") public static final int SOUND_UI_CARTOGRAPHY_TABLE_TAKE_RESULT = 275;
+ @Since("1.6.0.0-PN") public static final int SOUND_UI_STONECUTTER_TAKE_RESULT = 276;
+ @Since("1.6.0.0-PN") public static final int SOUND_UI_LOOM_TAKE_RESULT = 277;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_SMOKER_SMOKE = 278;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_BLASTFURNACE_FIRE_CRACKLE = 279;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_SMITHING_TABLE_USE = 280;
+ @Since("1.6.0.0-PN") public static final int SOUND_SCREECH = 281;
+ @Since("1.6.0.0-PN") public static final int SOUND_SLEEP = 282;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_FURNACE_LIT = 283;
+ @Since("1.6.0.0-PN") public static final int SOUND_CONVERT_MOOSHROOM = 284;
+ @Since("1.6.0.0-PN") public static final int SOUND_MILK_SUSPICIOUSLY = 285;
+ @Since("1.6.0.0-PN") public static final int SOUND_CELEBRATE = 286;
+ @Since("1.6.0.0-PN") public static final int SOUND_JUMP_PREVENT = 287;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_POLLINATE = 288;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_BEEHIVE_DRIP = 289;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_BEEHIVE_ENTER = 290;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_BEEHIVE_EXIT = 291;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_BEEHIVE_WORK = 292;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_BEEHIVE_SHEAR = 293;
+ @Since("1.6.0.0-PN") public static final int SOUND_DRINK_HONEY = 294;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_CAVE = 295;
+ @Since("1.6.0.0-PN") public static final int SOUND_RETREAT = 296;
+ @Since("1.6.0.0-PN") public static final int SOUND_CONVERTED_TO_ZOMBIFIED = 297;
+ @Since("1.6.0.0-PN") public static final int SOUND_ADMIRE = 298;
+ @Since("1.6.0.0-PN") public static final int SOUND_STEP_LAVA = 299;
+ @Since("1.6.0.0-PN") public static final int SOUND_TEMPT = 300;
+ @Since("1.6.0.0-PN") public static final int SOUND_PANIC = 301;
+ @Since("1.6.0.0-PN") public static final int SOUND_ANGRY = 302;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_WARPED_FOREST_MOOD = 303;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_SOULSAND_VALLEY_MOOD = 304;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_NETHER_WASTES_MOOD = 305;
+ @Since("1.6.0.0-PN") public static final int SOUND_RESPAWN_ANCHOR_BASALT_DELTAS_MOOD = 306;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_CRIMSON_FOREST_MOOD = 307;
+ @Since("1.6.0.0-PN") public static final int SOUND_RESPAWN_ANCHOR_CHARGE = 308;
+ @Since("1.6.0.0-PN") public static final int SOUND_RESPAWN_ANCHOR_DEPLETE = 309;
+ @Since("1.6.0.0-PN") public static final int SOUND_RESPAWN_ANCHOR_SET_SPAWN = 310;
+ @Since("1.6.0.0-PN") public static final int SOUND_RESPAWN_ANCHOR_AMBIENT = 311;
+ @Since("1.6.0.0-PN") public static final int SOUND_PARTICLE_SOUL_ESCAPE_QUIET = 312;
+ @Since("1.6.0.0-PN") public static final int SOUND_PARTICLE_SOUL_ESCAPE_LOUD = 313;
@Since("1.4.0.0-PN") public static final int SOUND_RECORD_PIGSTEP = 314;
+ @Since("1.6.0.0-PN") public static final int SOUND_LODESTONE_COMPASS_LINK_COMPASS_TO_LODESTONE = 315;
+ @Since("1.6.0.0-PN") public static final int SOUND_SMITHING_TABLE_USE = 316;
+ @Since("1.6.0.0-PN") public static final int SOUND_ARMOR_EQUIP_NETHERITE = 317;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_WARPED_FOREST_LOOP = 318;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_SOULSAND_VALLEY_LOOP = 319;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_NETHER_WASTES_LOOP = 320;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_BASALT_DELTAS_LOOP = 321;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_CRIMSON_FOREST_LOOP = 322;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_WARPED_FOREST_ADDITIONS = 323;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_SOULSAND_VALLEY_ADDITIONS = 324;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_NETHER_WASTES_ADDITIONS = 325;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_BASALT_DELTAS_ADDITIONS = 326;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_CRIMSON_FOREST_ADDITIONS = 327;
+ @Since("1.6.0.0-PN") public static final int SOUND_SCULK_SENSOR_POWER_ON = 328;
+ @Since("1.6.0.0-PN") public static final int SOUND_SCULK_SENSOR_POWER_OFF = 329;
+ @Since("1.6.0.0-PN") public static final int SOUND_BUCKET_FILL_POWDER_SNOW = 330;
+ @Since("1.6.0.0-PN") public static final int SOUND_BUCKET_EMPTY_POWDER_SNOW = 331;
+ @Since("1.6.0.0-PN") public static final int SOUND_POINTED_DRIPSTONE_CAULDRON_DRIP_WATER = 332;
+ @Since("1.6.0.0-PN") public static final int SOUND_POINTED_DRIPSTONE_CAULDRON_DRIP_LAVA = 333;
+ @Since("1.6.0.0-PN") public static final int SOUND_POINTED_DRIPSTONE_DRIP_WATER = 334;
+ @Since("1.6.0.0-PN") public static final int SOUND_POINTED_DRIPSTONE_DRIP_LAVA = 335;
+ @Since("1.6.0.0-PN") public static final int SOUND_CAVE_VINES_PICK_BERRIES = 336;
+ @Since("1.6.0.0-PN") public static final int SOUND_BIG_DRIPLEAF_TILT_DOWN = 337;
+ @Since("1.6.0.0-PN") public static final int SOUND_BIG_DRIPLEAF_TILT_UP = 338;
+ @Since("1.6.0.0-PN") public static final int SOUND_COPPER_WAX_ON = 339;
+ @Since("1.6.0.0-PN") public static final int SOUND_COPPER_WAX_OFF = 340;
+ @Since("1.6.0.0-PN") public static final int SOUND_SCRAPE = 341;
+ @Since("1.6.0.0-PN") public static final int SOUND_PLAYER_HURT_DROWN = 342;
+ @Since("1.6.0.0-PN") public static final int SOUND_PLAYER_HURT_ON_FIRE = 343;
+ @Since("1.6.0.0-PN") public static final int SOUND_PLAYER_HURT_FREEZE = 344;
+ @Since("1.6.0.0-PN") public static final int SOUND_USE_SPYGLASS = 345;
+ @Since("1.6.0.0-PN") public static final int SOUND_STOP_USING_SPYGLASS = 346;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMETHYST_BLOCK_CHIME = 347;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_SCREAMER = 348;
+ @Since("1.6.0.0-PN") public static final int SOUND_HURT_SCREAMER = 349;
+ @Since("1.6.0.0-PN") public static final int SOUND_DEATH_SCREAMER = 350;
+ @Since("1.6.0.0-PN") public static final int SOUND_MILK_SCREAMER = 351;
+ @Since("1.6.0.0-PN") public static final int SOUND_JUMP_TO_BLOCK = 352;
+ @Since("1.6.0.0-PN") public static final int SOUND_PRE_RAM = 353;
+ @Since("1.6.0.0-PN") public static final int SOUND_PRE_RAM_SCREAMER = 354;
+ @Since("1.6.0.0-PN") public static final int SOUND_RAM_IMPACT = 355;
+ @Since("1.6.0.0-PN") public static final int SOUND_RAM_IMPACT_SCREAMER = 356;
+ @Since("1.6.0.0-PN") public static final int SOUND_SQUID_INK_SQUIRT = 357;
+ @Since("1.6.0.0-PN") public static final int SOUND_GLOW_SQUID_INK_SQUIRT = 358;
+ @Since("1.6.0.0-PN") public static final int SOUND_CONVERT_TO_STRAY = 359;
+ @Since("1.6.0.0-PN") public static final int SOUND_CAKE_ADD_CANDLE = 360;
+ @Since("1.6.0.0-PN") public static final int SOUND_EXTINGUISH_CANDLE = 361;
+ @Since("1.6.0.0-PN") public static final int SOUND_AMBIENT_CANDLE = 362;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_CLICK = 363;
+ @Since("1.6.0.0-PN") public static final int SOUND_BLOCK_CLICK_FAIL = 364;
+ @Since("1.6.0.0-PN") public static final int SOUND_SCULK_CATALYST_BLOOM = 365;
+ @Since("1.6.0.0-PN") public static final int SOUND_SCULK_SHRIEKER_SHRIEK = 366;
+ @Since("1.6.0.0-PN") public static final int SOUND_WARDEN_NEARBY_CLOSE = 367;
+ @Since("1.6.0.0-PN") public static final int SOUND_WARDEN_NEARBY_CLOSER = 368;
+ @Since("1.6.0.0-PN") public static final int SOUND_WARDEN_NEARBY_CLOSEST = 369;
+ @Since("1.6.0.0-PN") public static final int SOUND_WARDEN_SLIGHTLY_ANGRY = 370;
+ @Since("1.6.0.0-PN") public static final int SOUND_RECORD_OTHERSIDE = 371;
+ @Since("1.6.0.0-PN") public static final int SOUND_TONGUE = 372;
+ @Since("1.6.0.0-PN") public static final int SOUND_CRACK_IRON_GOLEM = 373;
+ @Since("1.6.0.0-PN") public static final int SOUND_REPAIR_IRON_GOLEM = 374;
+ public static final int SOUND_LISTENING = 375;
+ public static final int SOUND_HEARTBEAT = 376;
+ public static final int SOUND_HORN_BREAK = 377;
+ public static final int SOUND_SCULK_PLACE = 378;
+ public static final int SOUND_SCULK_SPREAD = 379;
+ public static final int SOUND_SCULK_CHARGE = 380;
+ public static final int SOUND_SCULK_SENSOR_PLACE = 381;
+ public static final int SOUND_SCULK_SHRIEKER_PLACE = 382;
+ public static final int SOUND_GOAT_CALL_0 = 383;
+ public static final int SOUND_GOAT_CALL_1 = 384;
+ public static final int SOUND_GOAT_CALL_2 = 385;
+ public static final int SOUND_GOAT_CALL_3 = 386;
+ public static final int SOUND_GOAT_CALL_4 = 387;
+ public static final int SOUND_GOAT_CALL_5 = 388;
+ public static final int SOUND_GOAT_CALL_6 = 389;
+ public static final int SOUND_GOAT_CALL_7 = 390;
+ public static final int SOUND_GOAT_CALL_8 = 391;
+ public static final int SOUND_GOAT_CALL_9 = 392;
+ public static final int SOUND_GOAT_HARMONY_0 = 393;
+ public static final int SOUND_GOAT_HARMONY_1 = 394;
+ public static final int SOUND_GOAT_HARMONY_2 = 395;
+ public static final int SOUND_GOAT_HARMONY_3 = 396;
+ public static final int SOUND_GOAT_HARMONY_4 = 397;
+ public static final int SOUND_GOAT_HARMONY_5 = 398;
+ public static final int SOUND_GOAT_HARMONY_6 = 399;
+ public static final int SOUND_GOAT_HARMONY_7 = 400;
+ public static final int SOUND_GOAT_HARMONY_8 = 401;
+ public static final int SOUND_GOAT_HARMONY_9 = 402;
+ public static final int SOUND_GOAT_MELODY_0 = 403;
+ public static final int SOUND_GOAT_MELODY_1 = 404;
+ public static final int SOUND_GOAT_MELODY_2 = 405;
+ public static final int SOUND_GOAT_MELODY_3 = 406;
+ public static final int SOUND_GOAT_MELODY_4 = 407;
+ public static final int SOUND_GOAT_MELODY_5 = 408;
+ public static final int SOUND_GOAT_MELODY_6 = 409;
+ public static final int SOUND_GOAT_MELODY_7 = 410;
+ public static final int SOUND_GOAT_MELODY_8 = 411;
+ public static final int SOUND_GOAT_MELODY_9 = 412;
+ public static final int SOUND_GOAT_BASS_0 = 413;
+ public static final int SOUND_GOAT_BASS_1 = 414;
+ public static final int SOUND_GOAT_BASS_2 = 415;
+ public static final int SOUND_GOAT_BASS_3 = 416;
+ public static final int SOUND_GOAT_BASS_4 = 417;
+ public static final int SOUND_GOAT_BASS_5 = 418;
+ public static final int SOUND_GOAT_BASS_6 = 419;
+ public static final int SOUND_GOAT_BASS_7 = 420;
+ public static final int SOUND_GOAT_BASS_8 = 421;
+ public static final int SOUND_GOAT_BASS_9 = 422;
+
+ public static final int SOUND_IMITATE_WARDEN = 426;
+ public static final int SOUND_LISTENING_ANGRY = 427;
+ public static final int SOUND_ITEM_GIVEN = 428;
+ public static final int SOUND_ITEM_TAKEN = 429;
+ public static final int SOUND_DISAPPEARED = 430;
+ public static final int SOUND_REAPPEARED = 431;
+ public static final int SOUND_MILK_DRINK = 432;
+ public static final int SOUND_FROGSPAWN_HATCHED = 433;
+ public static final int SOUND_LAY_SPAWN = 434;
+ public static final int SOUND_FROGSPAWN_BREAK = 435;
+ public static final int SOUND_SONIC_BOOM = 436;
+ public static final int SOUND_SONIC_CHARGE = 437;
+ public static final int SOUND_ITEM_THROWN = 438;
+ public static final int SOUND_RECORD_5 = 439;
+ public static final int SOUND_CONVERT_TO_FROG = 440;
+ public static final int SOUND_RECORD_PLAYING = 441;
+ public static final int SOUND_ENCHANTING_TABLE_USE = 442;
+
+ public static final int SOUND_PRESSURE_PLATE_CLICK_OFF = 448;
+ public static final int SOUND_PRESSURE_PLATE_CLICK_ON = 449;
+ public static final int SOUND_BUTTON_CLICK_OFF = 450;
+ public static final int SOUND_BUTTON_CLICK_ON = 451;
+ public static final int SOUND_DOOR_OPEN = 452;
+ public static final int SOUND_DOOR_CLOSE = 453;
+ public static final int SOUND_TRAPDOOR_OPEN = 454;
+ public static final int SOUND_TRAPDOOR_CLOSE = 455;
+ public static final int SOUND_FENCE_GATE_OPEN = 456;
+ public static final int SOUND_FENCE_GATE_CLOSE = 457;
+ public static final int SOUND_UNDEFINED = 458;
public int sound;
public float x;
diff --git a/src/main/java/cn/nukkit/network/protocol/ModalFormResponsePacket.java b/src/main/java/cn/nukkit/network/protocol/ModalFormResponsePacket.java
index a12a6bc0cf0..eae893fdc0f 100644
--- a/src/main/java/cn/nukkit/network/protocol/ModalFormResponsePacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/ModalFormResponsePacket.java
@@ -6,7 +6,8 @@
public class ModalFormResponsePacket extends DataPacket {
public int formId;
- public String data;
+ public String data = "null";
+ public int cancelReason;
@Override
public byte pid() {
@@ -16,7 +17,12 @@ public byte pid() {
@Override
public void decode() {
this.formId = this.getVarInt();
- this.data = this.getString(); //Data will be null if player close form without submit (by cross button or ESC)
+ if (this.getBoolean()) {
+ this.data = this.getString();
+ }
+ if (this.getBoolean()) {
+ this.cancelReason = this.getByte();
+ }
}
@Override
diff --git a/src/main/java/cn/nukkit/network/protocol/MoveEntityAbsolutePacket.java b/src/main/java/cn/nukkit/network/protocol/MoveEntityAbsolutePacket.java
index b6b05c46816..d0001918371 100644
--- a/src/main/java/cn/nukkit/network/protocol/MoveEntityAbsolutePacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/MoveEntityAbsolutePacket.java
@@ -1,5 +1,6 @@
package cn.nukkit.network.protocol;
+import cn.nukkit.api.Since;
import cn.nukkit.math.Vector3f;
import lombok.ToString;
@@ -19,6 +20,7 @@ public class MoveEntityAbsolutePacket extends DataPacket {
public double pitch;
public boolean onGround;
public boolean teleport;
+ @Since("1.6.0.0-PN") public boolean forceMoveLocalEntity;
@Override
public byte pid() {
@@ -29,8 +31,9 @@ public byte pid() {
public void decode() {
this.eid = this.getEntityRuntimeId();
int flags = this.getByte();
- teleport = (flags & 0x01) != 0;
- onGround = (flags & 0x02) != 0;
+ onGround = (flags & 0x01) != 0;
+ teleport = (flags & 0x02) != 0;
+ forceMoveLocalEntity = (flags & 0x04) != 0;
Vector3f v = this.getVector3f();
this.x = v.x;
this.y = v.y;
@@ -51,6 +54,9 @@ public void encode() {
if (teleport) {
flags |= 0x02;
}
+ if (forceMoveLocalEntity) {
+ flags |= 0x04;
+ }
this.putByte(flags);
this.putVector3f((float) this.x, (float) this.y, (float) this.z);
this.putByte((byte) (this.pitch / (360d / 256d)));
diff --git a/src/main/java/cn/nukkit/network/protocol/MoveEntityDeltaPacket.java b/src/main/java/cn/nukkit/network/protocol/MoveEntityDeltaPacket.java
index 9fbebea6e5c..691972aeae6 100644
--- a/src/main/java/cn/nukkit/network/protocol/MoveEntityDeltaPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/MoveEntityDeltaPacket.java
@@ -1,44 +1,30 @@
package cn.nukkit.network.protocol;
-import cn.nukkit.api.DeprecationDetails;
-import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
-import cn.nukkit.math.NukkitMath;
import lombok.ToString;
@ToString
public class MoveEntityDeltaPacket extends DataPacket {
public static final byte NETWORK_ID = ProtocolInfo.MOVE_ENTITY_DELTA_PACKET;
- public static final int FLAG_HAS_X = 0b1;
- public static final int FLAG_HAS_Y = 0b10;
- public static final int FLAG_HAS_Z = 0b100;
- public static final int FLAG_HAS_YAW = 0b1000;
- public static final int FLAG_HAS_HEAD_YAW = 0b10000;
- public static final int FLAG_HAS_PITCH = 0b100000;
+ public static final int FLAG_HAS_X = 0B1;
+ public static final int FLAG_HAS_Y = 0B10;
+ public static final int FLAG_HAS_Z = 0B100;
+ public static final int FLAG_HAS_PITCH = 0B1000;
+ public static final int FLAG_HAS_YAW = 0B10000;
+ public static final int FLAG_HAS_HEAD_YAW = 0B100000;
+ @Since("1.6.0.0-PN") public static final int FLAG_ON_GROUND = 0B1000000;
+ @Since("1.6.0.0-PN") public static final int FLAG_TELEPORTING = 0B10000000;
+ @Since("1.6.0.0-PN") public static final int FLAG_FORCE_MOVE_LOCAL_ENTITY = 0B100000000;
+ @Since("1.6.0.0-PN") public long runtimeEntityId;
public int flags = 0;
@Since("1.4.0.0-PN") public float x = 0;
@Since("1.4.0.0-PN") public float y = 0;
@Since("1.4.0.0-PN") public float z = 0;
-
- @Deprecated @DeprecationDetails(since = "1.4.0.0-PN", reason = "Changed to float", replaceWith = "x")
- @PowerNukkitOnly("Re-added for backward-compatibility")
- public int xDelta = 0;
- @Deprecated @DeprecationDetails(since = "1.4.0.0-PN", reason = "Changed to float", replaceWith = "y")
- @PowerNukkitOnly("Re-added for backward-compatibility")
- public int yDelta = 0;
- @PowerNukkitOnly("Re-added for backward-compatibility")
- @Deprecated @DeprecationDetails(since = "1.4.0.0-PN", reason = "Changed to float", replaceWith = "z")
- public int zDelta = 0;
-
- private int xDecoded;
- private int yDecoded;
- private int zDecoded;
-
- public double yawDelta = 0;
- public double headYawDelta = 0;
- public double pitchDelta = 0;
+ @Since("1.6.0.0-PN") public float pitch = 0;
+ @Since("1.6.0.0-PN") public float yaw = 0;
+ @Since("1.6.0.0-PN") public float headYaw = 0;
@Override
public byte pid() {
@@ -47,61 +33,71 @@ public byte pid() {
@Override
public void decode() {
- this.flags = this.getByte();
- this.x = getCoordinate(FLAG_HAS_X);
- this.y = getCoordinate(FLAG_HAS_Y);
- this.z = getCoordinate(FLAG_HAS_Z);
- this.yawDelta = getRotation(FLAG_HAS_YAW);
- this.headYawDelta = getRotation(FLAG_HAS_HEAD_YAW);
- this.pitchDelta = getRotation(FLAG_HAS_PITCH);
-
- this.xDelta = this.xDecoded = NukkitMath.floorFloat(x);
- this.yDelta = this.yDecoded = NukkitMath.floorFloat(y);
- this.zDelta = this.zDecoded = NukkitMath.floorFloat(z);
+ this.runtimeEntityId = this.getEntityRuntimeId();
+ this.flags = this.getLShort();
+ if ((this.flags & FLAG_HAS_X) != 0) {
+ this.x = this.getCoordinate();
+ }
+ if ((this.flags & FLAG_HAS_Y) != 0) {
+ this.y = this.getCoordinate();
+ }
+ if ((this.flags & FLAG_HAS_Z) != 0) {
+ this.z = this.getCoordinate();
+ }
+ if ((this.flags & FLAG_HAS_PITCH) != 0) {
+ this.pitch = this.getRotation();
+ }
+ if ((this.flags & FLAG_HAS_YAW) != 0) {
+ this.yaw = this.getRotation();
+ }
+ if ((this.flags & FLAG_HAS_HEAD_YAW) != 0) {
+ this.headYaw = this.getRotation();
+ }
}
@Override
public void encode() {
- this.putByte((byte) flags);
- float x = this.x;
- float y = this.y;
- float z = this.z;
- if (xDelta != xDecoded || yDelta != yDecoded || zDelta != zDecoded) {
- x = xDelta;
- y = yDelta;
- z = zDelta;
+ this.reset();
+ this.putEntityRuntimeId(this.runtimeEntityId);
+ this.putLShort(this.flags);
+ if ((this.flags & FLAG_HAS_X) != 0) {
+ this.putCoordinate(this.x);
+ }
+ if ((this.flags & FLAG_HAS_Y) != 0) {
+ this.putCoordinate(this.y);
+ }
+ if ((this.flags & FLAG_HAS_Z) != 0) {
+ this.putCoordinate(this.z);
+ }
+ if ((this.flags & FLAG_HAS_PITCH) != 0) {
+ this.putRotation(this.pitch);
+ }
+ if ((this.flags & FLAG_HAS_YAW) != 0) {
+ this.putRotation(this.yaw);
+ }
+ if ((this.flags & FLAG_HAS_HEAD_YAW) != 0) {
+ this.putRotation(this.headYaw);
}
- putCoordinate(FLAG_HAS_X, x);
- putCoordinate(FLAG_HAS_Y, y);
- putCoordinate(FLAG_HAS_Z, z);
- putRotation(FLAG_HAS_YAW, this.yawDelta);
- putRotation(FLAG_HAS_HEAD_YAW, this.headYawDelta);
- putRotation(FLAG_HAS_PITCH, this.pitchDelta);
}
- private float getCoordinate(int flag) {
- if ((flags & flag) != 0) {
- return this.getLFloat();
- }
- return 0;
+ private float getCoordinate() {
+ return this.getLFloat();
}
- private double getRotation(int flag) {
- if ((flags & flag) != 0) {
- return this.getByte() * (360d / 256d);
- }
- return 0d;
+ private void putCoordinate(float value) {
+ this.putLFloat(value);
}
- private void putCoordinate(int flag, float value) {
- if ((flags & flag) != 0) {
- this.putLFloat(value);
- }
+ private float getRotation() {
+ return this.getByte() * (360F / 256F);
}
- private void putRotation(int flag, double value) {
- if ((flags & flag) != 0) {
- this.putByte((byte) (value / (360d / 256d)));
- }
+ private void putRotation(float value) {
+ this.putByte((byte) (value / (360F / 256F)));
+ }
+
+ @Since("1.6.0.0-PN")
+ public boolean hasFlag(int flag) {
+ return (this.flags & flag) != 0;
}
}
diff --git a/src/main/java/cn/nukkit/network/protocol/NPCDialoguePacket.java b/src/main/java/cn/nukkit/network/protocol/NPCDialoguePacket.java
new file mode 100644
index 00000000000..2bb251387b2
--- /dev/null
+++ b/src/main/java/cn/nukkit/network/protocol/NPCDialoguePacket.java
@@ -0,0 +1,161 @@
+/*
+ * https://PowerNukkit.org - The Nukkit you know but Powerful!
+ * Copyright (C) 2021 José Roberto de Araújo Júnior
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package cn.nukkit.network.protocol;
+
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author joserobjr
+ * @since 2021-07-06
+ */
+@PowerNukkitOnly
+@Since("1.5.2.0-PN")
+public class NPCDialoguePacket extends DataPacket {
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public static final byte NETWORK_ID = ProtocolInfo.NPC_DIALOGUE_PACKET;
+
+ private static final NPCDialogAction[] ACTIONS = NPCDialogAction.values();
+
+ private long runtimeEntityId;
+ private NPCDialogAction action = NPCDialogAction.OPEN;
+ private String dialogue = "";
+ private String sceneName = "";
+ private String npcName = "";
+ private String actionJson = "";
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public NPCDialoguePacket() {
+ // Indicates when this public constructor were accessible
+ }
+
+ @Override
+ public byte pid() {
+ return NETWORK_ID;
+ }
+
+ @Override
+ public void decode() {
+ runtimeEntityId = getUnsignedVarLong();
+ action = ACTIONS[getVarInt()];
+ dialogue = getString();
+ sceneName = getString();
+ npcName = getString();
+ actionJson = getString();
+ }
+
+ @Override
+ public void encode() {
+ reset();
+ putUnsignedVarLong(runtimeEntityId);
+ putVarInt(action.ordinal());
+ putString(dialogue);
+ putString(sceneName);
+ putString(npcName);
+ putString(actionJson);
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public long getRuntimeEntityId() {
+ return runtimeEntityId;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setRuntimeEntityId(long runtimeEntityId) {
+ this.runtimeEntityId = runtimeEntityId;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ @Nonnull
+ public NPCDialogAction getAction() {
+ return action;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setAction(@Nonnull NPCDialogAction action) {
+ this.action = action;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ @Nonnull
+ public String getDialogue() {
+ return dialogue;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setDialogue(@Nonnull String dialogue) {
+ this.dialogue = dialogue;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ @Nonnull
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setSceneName(@Nonnull String sceneName) {
+ this.sceneName = sceneName;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ @Nonnull
+ public String getNpcName() {
+ return npcName;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setNpcName(@Nonnull String npcName) {
+ this.npcName = npcName;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ @Nonnull
+ public String getActionJson() {
+ return actionJson;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setActionJson(@Nonnull String actionJson) {
+ this.actionJson = actionJson;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public enum NPCDialogAction {
+ @PowerNukkitOnly @Since("1.5.2.0-PN") OPEN,
+ @PowerNukkitOnly @Since("1.5.2.0-PN") CLOSE
+ }
+}
diff --git a/src/main/java/cn/nukkit/network/protocol/NPCRequestPacket.java b/src/main/java/cn/nukkit/network/protocol/NPCRequestPacket.java
index 1e8f891e741..075da0c65a4 100644
--- a/src/main/java/cn/nukkit/network/protocol/NPCRequestPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/NPCRequestPacket.java
@@ -1,18 +1,86 @@
package cn.nukkit.network.protocol;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import lombok.ToString;
@ToString
public class NPCRequestPacket extends DataPacket {
- @Since("1.4.0.0-PN") public long entityRuntimeId;
+ @Since("1.4.0.0-PN")
+ public long entityRuntimeId;
+
+ @Since("1.4.0.0-PN")
+ public RequestType requestType;
+
+ @Since("1.4.0.0-PN")
+ public String commandString;
+
+ @Since("1.4.0.0-PN")
+ public int actionType;
+
+ @Since("1.6.0.0-PN")
+ public String sceneName;
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public long getRequestedEntityRuntimeId() {
+ return entityRuntimeId;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setRequestedEntityRuntimeId(long entityRuntimeId) {
+ this.entityRuntimeId = entityRuntimeId;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public RequestType getRequestType() {
+ return requestType;
+ }
- @Since("1.4.0.0-PN") public RequestType requestType;
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setRequestType(RequestType requestType) {
+ this.requestType = requestType;
+ }
- @Since("1.4.0.0-PN") public String commandString;
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public String getCommandString() {
+ return commandString;
+ }
- @Since("1.4.0.0-PN") public int actionType;
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setCommandString(String commandString) {
+ this.commandString = commandString;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public int getActionType() {
+ return actionType;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setActionType(int actionType) {
+ this.actionType = actionType;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public String getSceneName() {
+ return sceneName;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setSceneName(String sceneName) {
+ this.sceneName = sceneName;
+ }
@Since("1.4.0.0-PN")
public enum RequestType {
@@ -33,18 +101,20 @@ public byte pid() {
@Override
public void decode() {
- this.entityRuntimeId = this.getEntityRuntimeId();
+ this.entityRuntimeId = super.getEntityRuntimeId();
this.requestType = RequestType.values()[this.getByte()];
this.commandString = this.getString();
this.actionType = this.getByte();
+ this.sceneName = this.getString();
}
@Override
public void encode() {
+ this.reset();
this.putEntityRuntimeId(this.entityRuntimeId);
this.putByte((byte) requestType.ordinal());
this.putString(this.commandString);
this.putByte((byte) this.actionType);
+ this.putString(this.sceneName);
}
-
}
diff --git a/src/main/java/cn/nukkit/network/protocol/NetworkChunkPublisherUpdatePacket.java b/src/main/java/cn/nukkit/network/protocol/NetworkChunkPublisherUpdatePacket.java
index e70e8a235e2..2e0fbf75f8d 100644
--- a/src/main/java/cn/nukkit/network/protocol/NetworkChunkPublisherUpdatePacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/NetworkChunkPublisherUpdatePacket.java
@@ -25,5 +25,6 @@ public void encode() {
this.reset();
this.putSignedBlockPosition(position);
this.putUnsignedVarInt(radius);
+ this.putInt(0); // Saved chunks
}
}
diff --git a/src/main/java/cn/nukkit/network/protocol/NetworkSettingsPacket.java b/src/main/java/cn/nukkit/network/protocol/NetworkSettingsPacket.java
new file mode 100644
index 00000000000..448315de4fe
--- /dev/null
+++ b/src/main/java/cn/nukkit/network/protocol/NetworkSettingsPacket.java
@@ -0,0 +1,34 @@
+package cn.nukkit.network.protocol;
+
+import cn.nukkit.network.protocol.types.PacketCompressionAlgorithm;
+import lombok.ToString;
+
+@ToString
+public class NetworkSettingsPacket extends DataPacket {
+
+ public int compressionThreshold;
+ public PacketCompressionAlgorithm compressionAlgorithm;
+ public boolean clientThrottleEnabled;
+ public byte clientThrottleThreshold;
+ public float clientThrottleScalar;
+
+ @Override
+ public byte pid() {
+ return ProtocolInfo.NETWORK_SETTINGS_PACKET;
+ }
+
+ @Override
+ public void encode() {
+ this.reset();
+ this.putLShort(this.compressionThreshold);
+ this.putLShort(this.compressionAlgorithm.ordinal());
+ this.putBoolean(this.clientThrottleEnabled);
+ this.putByte(this.clientThrottleThreshold);
+ this.putLFloat(this.clientThrottleScalar);
+ }
+
+ @Override
+ public void decode() {
+ throw new UnsupportedOperationException();
+ }
+}
diff --git a/src/main/java/cn/nukkit/network/protocol/PlayStatusPacket.java b/src/main/java/cn/nukkit/network/protocol/PlayStatusPacket.java
index 45fa299b013..2e7a718ae88 100644
--- a/src/main/java/cn/nukkit/network/protocol/PlayStatusPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/PlayStatusPacket.java
@@ -23,6 +23,8 @@ public byte pid() {
public static final int LOGIN_FAILED_VANILLA_EDU = 5;
public static final int LOGIN_FAILED_EDU_VANILLA = 6;
public static final int LOGIN_FAILED_SERVER_FULL = 7;
+ public static final int LOGIN_FAILED_EDITOR_TO_VANILLA_MISMATCH = 8;
+ public static final int LOGIN_FAILED_VANILLA_TO_EDITOR_MISMATCH = 9;
public int status;
diff --git a/src/main/java/cn/nukkit/network/protocol/PlayerActionPacket.java b/src/main/java/cn/nukkit/network/protocol/PlayerActionPacket.java
index 2107901b9b6..716c710a009 100644
--- a/src/main/java/cn/nukkit/network/protocol/PlayerActionPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/PlayerActionPacket.java
@@ -1,5 +1,6 @@
package cn.nukkit.network.protocol;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.math.BlockVector3;
import lombok.ToString;
@@ -35,13 +36,14 @@ public class PlayerActionPacket extends DataPacket {
public static final int ACTION_STOP_SWIMMING = 22;
public static final int ACTION_START_SPIN_ATTACK = 23;
public static final int ACTION_STOP_SPIN_ATTACK = 24;
- public static final int ACTION_INTERACT_BLOCK = 25;
+ @PowerNukkitOnly public static final int ACTION_INTERACT_BLOCK = 25;
public long entityId;
public int action;
public int x;
public int y;
public int z;
+ public BlockVector3 resultPosition;
public int face;
@@ -53,6 +55,7 @@ public void decode() {
this.x = v.x;
this.y = v.y;
this.z = v.z;
+ this.resultPosition = this.getBlockVector3();
this.face = this.getVarInt();
}
@@ -62,6 +65,7 @@ public void encode() {
this.putEntityRuntimeId(this.entityId);
this.putVarInt(this.action);
this.putBlockVector3(this.x, this.y, this.z);
+ this.putBlockVector3(this.resultPosition);
this.putVarInt(this.face);
}
diff --git a/src/main/java/cn/nukkit/network/protocol/PlayerEnchantOptionsPacket.java b/src/main/java/cn/nukkit/network/protocol/PlayerEnchantOptionsPacket.java
index a9a0a089e46..b5709d3aaa2 100644
--- a/src/main/java/cn/nukkit/network/protocol/PlayerEnchantOptionsPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/PlayerEnchantOptionsPacket.java
@@ -1,7 +1,5 @@
package cn.nukkit.network.protocol;
-import cn.nukkit.api.DeprecationDetails;
-import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import lombok.ToString;
diff --git a/src/main/java/cn/nukkit/network/protocol/PositionTrackingDBClientRequestPacket.java b/src/main/java/cn/nukkit/network/protocol/PositionTrackingDBClientRequestPacket.java
index eda91ed7f26..5773a62a24a 100644
--- a/src/main/java/cn/nukkit/network/protocol/PositionTrackingDBClientRequestPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/PositionTrackingDBClientRequestPacket.java
@@ -2,6 +2,7 @@
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
+import lombok.NoArgsConstructor;
import lombok.ToString;
/**
@@ -10,6 +11,7 @@
@PowerNukkitOnly
@Since("1.4.0.0-PN")
@ToString
+@NoArgsConstructor(onConstructor = @__(@PowerNukkitOnly))
public class PositionTrackingDBClientRequestPacket extends DataPacket {
@PowerNukkitOnly
@Since("1.4.0.0-PN")
diff --git a/src/main/java/cn/nukkit/network/protocol/PositionTrackingDBServerBroadcastPacket.java b/src/main/java/cn/nukkit/network/protocol/PositionTrackingDBServerBroadcastPacket.java
index afaa3fe9e7a..a65ab5b615f 100644
--- a/src/main/java/cn/nukkit/network/protocol/PositionTrackingDBServerBroadcastPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/PositionTrackingDBServerBroadcastPacket.java
@@ -10,6 +10,7 @@
import cn.nukkit.nbt.tag.ListTag;
import io.netty.handler.codec.EncoderException;
import it.unimi.dsi.fastutil.io.FastByteArrayInputStream;
+import lombok.NoArgsConstructor;
import lombok.ToString;
import javax.annotation.Nullable;
@@ -21,12 +22,11 @@
@PowerNukkitOnly
@Since("1.4.0.0-PN")
@ToString
+@NoArgsConstructor(onConstructor = @__(@PowerNukkitOnly))
public class PositionTrackingDBServerBroadcastPacket extends DataPacket {
@PowerNukkitOnly
@Since("1.4.0.0-PN")
public static final byte NETWORK_ID = ProtocolInfo.POS_TRACKING_SERVER_BROADCAST_PACKET;
- @PowerNukkitOnly
- @Since("1.4.0.0-PN")
private static final Action[] ACTIONS = Action.values();
private Action action;
diff --git a/src/main/java/cn/nukkit/network/protocol/ProtocolInfo.java b/src/main/java/cn/nukkit/network/protocol/ProtocolInfo.java
index fc1104ce4a3..bd3de67885e 100644
--- a/src/main/java/cn/nukkit/network/protocol/ProtocolInfo.java
+++ b/src/main/java/cn/nukkit/network/protocol/ProtocolInfo.java
@@ -1,5 +1,6 @@
package cn.nukkit.network.protocol;
+import cn.nukkit.api.DeprecationDetails;
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import com.google.common.primitives.Ints;
@@ -16,12 +17,12 @@ public interface ProtocolInfo {
/**
* Actual Minecraft: PE protocol version
*/
- int CURRENT_PROTOCOL = dynamic(440);
+ int CURRENT_PROTOCOL = dynamic(560);
List SUPPORTED_PROTOCOLS = Ints.asList(CURRENT_PROTOCOL);
- String MINECRAFT_VERSION = dynamic("v1.17.0");
- String MINECRAFT_VERSION_NETWORK = dynamic("1.17.0");
+ String MINECRAFT_VERSION = dynamic("v1.19.50");
+ String MINECRAFT_VERSION_NETWORK = dynamic("1.19.50");
byte LOGIN_PACKET = 0x01;
byte PLAY_STATUS_PACKET = 0x02;
@@ -181,9 +182,34 @@ public interface ProtocolInfo {
@Since("1.4.0.0-PN") byte ITEM_COMPONENT_PACKET = (byte) 0xa2;
@Since("1.4.0.0-PN") byte FILTER_TEXT_PACKET = (byte) 0xa3;
@Since("1.4.0.0-PN") byte CLIENTBOUND_DEBUG_RENDERER_PACKET = (byte) 0xa4;
- @Since("1.5.0.0-PN") @PowerNukkitOnly byte SYNC_ENTITY_PROPERTY = (byte) 0xa5;
- @Since("1.5.0.0-PN") @PowerNukkitOnly byte ADD_VOLUME_ENTITY = (byte) 0xa6;
- @Since("1.5.0.0-PN") @PowerNukkitOnly byte REMOVE_VOLUME_ENTITY = (byte) 0xa7;
+ @Since("1.5.2.0-PN") byte SYNC_ENTITY_PROPERTY_PACKET = (byte) 0xa5;
+ @Since("1.5.2.0-PN") byte ADD_VOLUME_ENTITY_PACKET = (byte) 0xa6;
+ @Since("1.5.2.0-PN") byte REMOVE_VOLUME_ENTITY_PACKET = (byte) 0xa7;
+ @Since("1.5.0.0-PN") @PowerNukkitOnly @Deprecated @DeprecationDetails(since = "1.5.2.0-PN", reason = "Incorrect naming convention", by = "PowerNukkit", replaceWith = "SYNC_ENTITY_PROPERTY_PACKET") byte SYNC_ENTITY_PROPERTY = SYNC_ENTITY_PROPERTY_PACKET;
+ @Since("1.5.0.0-PN") @PowerNukkitOnly @Deprecated @DeprecationDetails(since = "1.5.2.0-PN", reason = "Incorrect naming convention", by = "PowerNukkit", replaceWith = "ADD_VOLUME_ENTITY_PACKET") byte ADD_VOLUME_ENTITY = ADD_VOLUME_ENTITY_PACKET;
+ @Since("1.5.0.0-PN") @PowerNukkitOnly @Deprecated @DeprecationDetails(since = "1.5.2.0-PN", reason = "Incorrect naming convention", by = "PowerNukkit", replaceWith = "REMOVE_VOLUME_ENTITY_PACKET") byte REMOVE_VOLUME_ENTITY = REMOVE_VOLUME_ENTITY_PACKET;
+ @Since("1.5.2.0-PN") byte SIMULATION_TYPE_PACKET = (byte) 0xa8;
+ @Since("1.5.2.0-PN") byte NPC_DIALOGUE_PACKET = (byte) 0xa9;
+ byte EDU_URI_RESOURCE_PACKET = (byte) 0xaa;
+ byte CREATE_PHOTO_PACKET = (byte) 0xab;
+ byte UPDATE_SUB_CHUNK_BLOCKS_PACKET = (byte) 0xac;
+ byte PHOTO_INFO_REQUEST_PACKET = (byte) 0xad;
+ byte SUB_CHUNK_PACKET = (byte) 0xae;
+ byte SUB_CHUNK_REQUEST_PACKET = (byte) 0xaf;
+ byte PLAYER_START_ITEM_COOLDOWN_PACKET = (byte) 0xb0;
+ byte SCRIPT_MESSAGE_PACKET = (byte) 0xb1;
+ byte CODE_BUILDER_SOURCE_PACKET = (byte) 0xb2;
+ byte TICKING_AREAS_LOAD_STATUS_PACKET = (byte) 0xb3;
+ byte DIMENSION_DATA_PACKET = (byte) 0xb4;
+ byte AGENT_ACTION_EVENT_PACKET = (byte) 0xb5;
+ byte CHANGE_MOB_PROPERTY_PACKET = (byte) 0xb6;
+ byte LESSON_PROGRESS_PACKET = (byte) 0xb7;
+ byte REQUEST_ABILITY_PACKET = (byte) 0xb8;
+ byte REQUEST_PERMISSIONS_PACKET = (byte) 0xb9;
+ byte TOAST_REQUEST_PACKET = (byte) 0xba;
+ @Since("FUTURE") byte UPDATE_ABILITIES_PACKET = (byte) 0xbb;
+ @Since("FUTURE") byte UPDATE_ADVENTURE_SETTINGS_PACKET = (byte) 0xbc;
+ @Since("FUTURE") byte REQUEST_NETWORK_SETTINGS_PACKET = (byte) 0xc1;
byte BATCH_PACKET = (byte) 0xff;
}
diff --git a/src/main/java/cn/nukkit/network/protocol/RemoveVolumeEntityPacket.java b/src/main/java/cn/nukkit/network/protocol/RemoveVolumeEntityPacket.java
index 1f18fd3ddd1..30841ed9981 100644
--- a/src/main/java/cn/nukkit/network/protocol/RemoveVolumeEntityPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/RemoveVolumeEntityPacket.java
@@ -8,10 +8,15 @@
public class RemoveVolumeEntityPacket extends DataPacket {
@PowerNukkitOnly
@Since("1.5.0.0-PN")
- public static final byte NETWORK_ID = ProtocolInfo.REMOVE_VOLUME_ENTITY;
+ public static final byte NETWORK_ID = ProtocolInfo.REMOVE_VOLUME_ENTITY_PACKET;
private long id;
+ @PowerNukkitOnly
+ @Since("1.5.0.0-PN")
+ public RemoveVolumeEntityPacket() {
+ // Does nothing
+ }
@Override
public byte pid() {
@@ -25,6 +30,7 @@ public void decode() {
@Override
public void encode() {
+ reset();
putUnsignedVarInt(id);
}
diff --git a/src/main/java/cn/nukkit/network/protocol/RequestAbilityPacket.java b/src/main/java/cn/nukkit/network/protocol/RequestAbilityPacket.java
new file mode 100644
index 00000000000..19ae4f9b81b
--- /dev/null
+++ b/src/main/java/cn/nukkit/network/protocol/RequestAbilityPacket.java
@@ -0,0 +1,43 @@
+package cn.nukkit.network.protocol;
+
+import cn.nukkit.network.protocol.types.PlayerAbility;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@ToString
+@Getter
+@Setter
+public class RequestAbilityPacket extends DataPacket {
+ protected static final PlayerAbility[] ABILITIES = UpdateAbilitiesPacket.VALID_FLAGS;
+ protected static final AbilityType[] ABILITY_TYPES = AbilityType.values();
+
+ private PlayerAbility ability;
+ private AbilityType type;
+ private boolean boolValue;
+ private float floatValue;
+
+ @Override
+ public void decode() {
+ this.setAbility(ABILITIES[this.getVarInt()]);
+ this.setType(ABILITY_TYPES[this.getByte()]);
+ this.setBoolValue(this.getBoolean());
+ this.setFloatValue(this.getLFloat());
+ }
+
+ @Override
+ public void encode() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public byte pid() {
+ return ProtocolInfo.REQUEST_ABILITY_PACKET;
+ }
+
+ public enum AbilityType {
+ NONE,
+ BOOLEAN,
+ FLOAT
+ }
+}
diff --git a/src/main/java/cn/nukkit/network/protocol/RequestNetworkSettingsPacket.java b/src/main/java/cn/nukkit/network/protocol/RequestNetworkSettingsPacket.java
new file mode 100644
index 00000000000..0c09ad2489a
--- /dev/null
+++ b/src/main/java/cn/nukkit/network/protocol/RequestNetworkSettingsPacket.java
@@ -0,0 +1,24 @@
+package cn.nukkit.network.protocol;
+
+import lombok.ToString;
+
+@ToString
+public class RequestNetworkSettingsPacket extends DataPacket {
+
+ public int protocolVersion;
+
+ @Override
+ public byte pid() {
+ return ProtocolInfo.REQUEST_NETWORK_SETTINGS_PACKET;
+ }
+
+ @Override
+ public void encode() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void decode() {
+ this.protocolVersion = this.getInt();
+ }
+}
diff --git a/src/main/java/cn/nukkit/network/protocol/ResourcePackChunkDataPacket.java b/src/main/java/cn/nukkit/network/protocol/ResourcePackChunkDataPacket.java
index 72232810409..af3f5d79dab 100644
--- a/src/main/java/cn/nukkit/network/protocol/ResourcePackChunkDataPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/ResourcePackChunkDataPacket.java
@@ -1,22 +1,28 @@
package cn.nukkit.network.protocol;
+import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import lombok.ToString;
+import org.powernukkit.version.Version;
import java.util.UUID;
@ToString(exclude = "data")
-public class ResourcePackChunkDataPacket extends DataPacket {
+@PowerNukkitDifference(extendsOnlyInPowerNukkit = AbstractResourcePackDataPacket.class, insteadOf = DataPacket.class, since = "1.5.2.0-PN")
+public class ResourcePackChunkDataPacket extends AbstractResourcePackDataPacket {
public static final byte NETWORK_ID = ProtocolInfo.RESOURCE_PACK_CHUNK_DATA_PACKET;
public UUID packId;
+ private Version packVersion;
public int chunkIndex;
public long progress;
public byte[] data;
@Override
public void decode() {
- this.packId = UUID.fromString(this.getString());
+ decodePackInfo();
this.chunkIndex = this.getLInt();
this.progress = this.getLLong();
this.data = this.getByteArray();
@@ -25,12 +31,40 @@ public void decode() {
@Override
public void encode() {
this.reset();
- this.putString(this.packId.toString());
+ encodePackInfo();
this.putLInt(this.chunkIndex);
this.putLLong(this.progress);
this.putByteArray(this.data);
}
+ @Since("1.5.2.0-PN")
+ @PowerNukkitOnly
+ @Override
+ public Version getPackVersion() {
+ return packVersion;
+ }
+
+ @Since("1.5.2.0-PN")
+ @PowerNukkitOnly
+ @Override
+ public void setPackVersion(Version packVersion) {
+ this.packVersion = packVersion;
+ }
+
+ @Since("1.5.2.0-PN")
+ @PowerNukkitOnly
+ @Override
+ public UUID getPackId() {
+ return packId;
+ }
+
+ @Since("1.5.2.0-PN")
+ @PowerNukkitOnly
+ @Override
+ public void setPackId(UUID packId) {
+ this.packId = packId;
+ }
+
@Override
public byte pid() {
return NETWORK_ID;
diff --git a/src/main/java/cn/nukkit/network/protocol/ResourcePackChunkRequestPacket.java b/src/main/java/cn/nukkit/network/protocol/ResourcePackChunkRequestPacket.java
index ebed714e1f6..7f6c322f395 100644
--- a/src/main/java/cn/nukkit/network/protocol/ResourcePackChunkRequestPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/ResourcePackChunkRequestPacket.java
@@ -1,30 +1,65 @@
package cn.nukkit.network.protocol;
+import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+
import lombok.ToString;
+import org.powernukkit.version.Version;
import java.util.UUID;
@ToString
-public class ResourcePackChunkRequestPacket extends DataPacket {
+@PowerNukkitDifference(extendsOnlyInPowerNukkit = AbstractResourcePackDataPacket.class, insteadOf = DataPacket.class, since = "1.5.2.0-PN")
+public class ResourcePackChunkRequestPacket extends AbstractResourcePackDataPacket {
public static final byte NETWORK_ID = ProtocolInfo.RESOURCE_PACK_CHUNK_REQUEST_PACKET;
public UUID packId;
+ private Version packVersion;
public int chunkIndex;
@Override
public void decode() {
- this.packId = UUID.fromString(this.getString());
+ decodePackInfo();
this.chunkIndex = this.getLInt();
}
@Override
public void encode() {
this.reset();
- this.putString(this.packId.toString());
+ encodePackInfo();
this.putLInt(this.chunkIndex);
}
+ @Since("1.5.2.0-PN")
+ @PowerNukkitOnly
+ @Override
+ public Version getPackVersion() {
+ return packVersion;
+ }
+
+ @Since("1.5.2.0-PN")
+ @PowerNukkitOnly
+ @Override
+ public void setPackVersion(Version packVersion) {
+ this.packVersion = packVersion;
+ }
+
+ @Since("1.5.2.0-PN")
+ @PowerNukkitOnly
+ @Override
+ public UUID getPackId() {
+ return packId;
+ }
+
+ @Since("1.5.2.0-PN")
+ @PowerNukkitOnly
+ @Override
+ public void setPackId(UUID packId) {
+ this.packId = packId;
+ }
+
@Override
public byte pid() {
return NETWORK_ID;
diff --git a/src/main/java/cn/nukkit/network/protocol/ResourcePackDataInfoPacket.java b/src/main/java/cn/nukkit/network/protocol/ResourcePackDataInfoPacket.java
index d1960c9ec2c..b62a091591b 100644
--- a/src/main/java/cn/nukkit/network/protocol/ResourcePackDataInfoPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/ResourcePackDataInfoPacket.java
@@ -1,11 +1,16 @@
package cn.nukkit.network.protocol;
+import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import lombok.ToString;
+import org.powernukkit.version.Version;
import java.util.UUID;
@ToString(exclude = "sha256")
-public class ResourcePackDataInfoPacket extends DataPacket {
+@PowerNukkitDifference(extendsOnlyInPowerNukkit = AbstractResourcePackDataPacket.class, insteadOf = DataPacket.class, since = "1.5.2.0-PN")
+public class ResourcePackDataInfoPacket extends AbstractResourcePackDataPacket {
public static final byte NETWORK_ID = ProtocolInfo.RESOURCE_PACK_DATA_INFO_PACKET;
@@ -21,6 +26,7 @@ public class ResourcePackDataInfoPacket extends DataPacket {
public static final int TYPE_COUNT = 9;
public UUID packId;
+ private Version packVersion;
public int maxChunkSize;
public int chunkCount;
public long compressedPackSize;
@@ -30,7 +36,7 @@ public class ResourcePackDataInfoPacket extends DataPacket {
@Override
public void decode() {
- this.packId = UUID.fromString(this.getString());
+ decodePackInfo();
this.maxChunkSize = this.getLInt();
this.chunkCount = this.getLInt();
this.compressedPackSize = this.getLLong();
@@ -42,7 +48,7 @@ public void decode() {
@Override
public void encode() {
this.reset();
- this.putString(this.packId.toString());
+ encodePackInfo();
this.putLInt(this.maxChunkSize);
this.putLInt(this.chunkCount);
this.putLLong(this.compressedPackSize);
@@ -55,4 +61,32 @@ public void encode() {
public byte pid() {
return NETWORK_ID;
}
+
+ @Override
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public Version getPackVersion() {
+ return packVersion;
+ }
+
+ @Override
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setPackVersion(Version packVersion) {
+ this.packVersion = packVersion;
+ }
+
+ @Since("1.5.2.0-PN")
+ @PowerNukkitOnly
+ @Override
+ public UUID getPackId() {
+ return packId;
+ }
+
+ @Since("1.5.2.0-PN")
+ @PowerNukkitOnly
+ @Override
+ public void setPackId(UUID packId) {
+ this.packId = packId;
+ }
}
diff --git a/src/main/java/cn/nukkit/network/protocol/ResourcePacksInfoPacket.java b/src/main/java/cn/nukkit/network/protocol/ResourcePacksInfoPacket.java
index 30f521fedde..1fd5ae50d34 100644
--- a/src/main/java/cn/nukkit/network/protocol/ResourcePacksInfoPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/ResourcePacksInfoPacket.java
@@ -1,5 +1,7 @@
package cn.nukkit.network.protocol;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.resourcepacks.ResourcePack;
import lombok.ToString;
@@ -10,6 +12,7 @@ public class ResourcePacksInfoPacket extends DataPacket {
public boolean mustAccept;
public boolean scripting;
+ @Since("1.6.0.0-PN") public boolean forceServerPacks;
public ResourcePack[] behaviourPackEntries = ResourcePack.EMPTY_ARRAY;
public ResourcePack[] resourcePackEntries = ResourcePack.EMPTY_ARRAY;
@@ -23,12 +26,12 @@ public void encode() {
this.reset();
this.putBoolean(this.mustAccept);
this.putBoolean(this.scripting);
-
- encodePacks(this.behaviourPackEntries);
- encodePacks(this.resourcePackEntries);
+ this.putBoolean(this.forceServerPacks);
+ this.encodePacks(this.behaviourPackEntries, true);
+ this.encodePacks(this.resourcePackEntries, false);
}
- private void encodePacks(ResourcePack[] packs) {
+ private void encodePacks(ResourcePack[] packs, boolean behaviour) {
this.putLShort(packs.length);
for (ResourcePack entry : packs) {
this.putString(entry.getPackId().toString());
@@ -36,9 +39,11 @@ private void encodePacks(ResourcePack[] packs) {
this.putLLong(entry.getPackSize());
this.putString(""); // encryption key
this.putString(""); // sub-pack name
- this.putString(""); // content identity
+ this.putString(entry.getPackId().toString()); // content identity
this.putBoolean(false); // scripting
- this.putBoolean(false); // raytracing capable
+ if (!behaviour) {
+ this.putBoolean(false); // raytracing capable
+ }
}
}
@@ -46,4 +51,64 @@ private void encodePacks(ResourcePack[] packs) {
public byte pid() {
return NETWORK_ID;
}
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public boolean isForcedToAccept() {
+ return mustAccept;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setForcedToAccept(boolean mustAccept) {
+ this.mustAccept = mustAccept;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public boolean isScriptingEnabled() {
+ return scripting;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setScriptingEnabled(boolean scripting) {
+ this.scripting = scripting;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public ResourcePack[] getBehaviourPackEntries() {
+ return behaviourPackEntries;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setBehaviourPackEntries(ResourcePack[] behaviourPackEntries) {
+ this.behaviourPackEntries = behaviourPackEntries;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public ResourcePack[] getResourcePackEntries() {
+ return resourcePackEntries;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setResourcePackEntries(ResourcePack[] resourcePackEntries) {
+ this.resourcePackEntries = resourcePackEntries;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public boolean isForcingServerPacksEnabled() {
+ return forceServerPacks;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setForcingServerPacksEnabled(boolean forcingServerPacksEnabled) {
+ this.forceServerPacks = forcingServerPacksEnabled;
+ }
}
diff --git a/src/main/java/cn/nukkit/network/protocol/SetEntityDataPacket.java b/src/main/java/cn/nukkit/network/protocol/SetEntityDataPacket.java
index ad1e3098d14..1104c2a3a6f 100644
--- a/src/main/java/cn/nukkit/network/protocol/SetEntityDataPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/SetEntityDataPacket.java
@@ -31,6 +31,8 @@ public void encode() {
this.reset();
this.putEntityRuntimeId(this.eid);
this.put(Binary.writeMetadata(this.metadata));
+ this.putUnsignedVarInt(0); // Entity properties int
+ this.putUnsignedVarInt(0); // Entity properties float
this.putUnsignedVarLong(this.frame);
}
}
diff --git a/src/main/java/cn/nukkit/network/protocol/SetSpawnPositionPacket.java b/src/main/java/cn/nukkit/network/protocol/SetSpawnPositionPacket.java
index 3c8345c97a5..e7099c47113 100644
--- a/src/main/java/cn/nukkit/network/protocol/SetSpawnPositionPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/SetSpawnPositionPacket.java
@@ -1,7 +1,5 @@
package cn.nukkit.network.protocol;
-import cn.nukkit.api.DeprecationDetails;
-import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import lombok.ToString;
diff --git a/src/main/java/cn/nukkit/network/protocol/SetTitlePacket.java b/src/main/java/cn/nukkit/network/protocol/SetTitlePacket.java
index c2242c6917d..55f4bf0d919 100644
--- a/src/main/java/cn/nukkit/network/protocol/SetTitlePacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/SetTitlePacket.java
@@ -1,7 +1,11 @@
package cn.nukkit.network.protocol;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import lombok.ToString;
+import javax.annotation.Nonnull;
+
/**
* @author Tee7even
*/
@@ -9,6 +13,8 @@
public class SetTitlePacket extends DataPacket {
public static final byte NETWORK_ID = ProtocolInfo.SET_TITLE_PACKET;
+ private static final TitleAction[] TITLE_ACTIONS = TitleAction.values();
+
public static final int TYPE_CLEAR = 0;
public static final int TYPE_RESET = 1;
public static final int TYPE_TITLE = 2;
@@ -21,6 +27,8 @@ public class SetTitlePacket extends DataPacket {
public int fadeInTime = 0;
public int stayTime = 0;
public int fadeOutTime = 0;
+ @Since("1.6.0.0-PN") public String xuid = "";
+ @Since("1.6.0.0-PN") public String platformOnlineId = "";
@Override
public byte pid() {
@@ -34,6 +42,8 @@ public void decode() {
this.fadeInTime = this.getVarInt();
this.stayTime = this.getVarInt();
this.fadeOutTime = this.getVarInt();
+ this.xuid = this.getString();
+ this.platformOnlineId = this.getString();
}
@Override
@@ -44,5 +54,111 @@ public void encode() {
this.putVarInt(fadeInTime);
this.putVarInt(stayTime);
this.putVarInt(fadeOutTime);
+ this.putString(xuid);
+ this.putString(platformOnlineId);
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ @Nonnull
+ public TitleAction getTitleAction() {
+ int currentType = this.type;
+ if (currentType >= 0 && currentType < TITLE_ACTIONS.length) {
+ return TITLE_ACTIONS[currentType];
+ }
+ throw new UnsupportedOperationException("Bad type: "+currentType);
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setTitleAction(@Nonnull TitleAction type) {
+ this.type = type.ordinal();
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ @Nonnull
+ public String getText() {
+ return text;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setText(@Nonnull String text) {
+ this.text = text;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public int getFadeInTime() {
+ return fadeInTime;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setFadeInTime(int fadeInTime) {
+ this.fadeInTime = fadeInTime;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public int getStayTime() {
+ return stayTime;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setStayTime(int stayTime) {
+ this.stayTime = stayTime;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public int getFadeOutTime() {
+ return fadeOutTime;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setFadeOutTime(int fadeOutTime) {
+ this.fadeOutTime = fadeOutTime;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public String getXuid() {
+ return xuid;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setXuid(String xuid) {
+ this.xuid = xuid;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public String getPlatformOnlineId() {
+ return platformOnlineId;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setPlatformOnlineId(String platformOnlineId) {
+ this.platformOnlineId = platformOnlineId;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public enum TitleAction {
+ @PowerNukkitOnly @Since("1.5.2.0-PN") CLEAR,
+ @PowerNukkitOnly @Since("1.5.2.0-PN") RESET,
+ @PowerNukkitOnly @Since("1.5.2.0-PN") SET_TITLE_MESSAGE,
+ @PowerNukkitOnly @Since("1.5.2.0-PN") SET_SUBTITLE_MESSAGE,
+ @PowerNukkitOnly @Since("1.5.2.0-PN") SET_ACTION_BAR_MESSAGE,
+ @PowerNukkitOnly @Since("1.5.2.0-PN") SET_ANIMATION_TIMES,
+ @PowerNukkitOnly @Since("1.5.2.0-PN") SET_TITLE_JSON,
+ @PowerNukkitOnly @Since("1.5.2.0-PN") SET_SUBTITLE_JSON,
+ @PowerNukkitOnly @Since("1.5.2.0-PN") SET_ACTIONBAR_JSON,
}
}
diff --git a/src/main/java/cn/nukkit/network/protocol/SimulationTypePacket.java b/src/main/java/cn/nukkit/network/protocol/SimulationTypePacket.java
new file mode 100644
index 00000000000..cc5be5c8a4f
--- /dev/null
+++ b/src/main/java/cn/nukkit/network/protocol/SimulationTypePacket.java
@@ -0,0 +1,83 @@
+/*
+ * https://PowerNukkit.org - The Nukkit you know but Powerful!
+ * Copyright (C) 2021 José Roberto de Araújo Júnior
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package cn.nukkit.network.protocol;
+
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+
+import javax.annotation.Nonnull;
+
+/**
+ * @author joserobjr
+ * @since 2021-07-06
+ */
+@PowerNukkitOnly
+@Since("1.5.2.0-PN")
+public class SimulationTypePacket extends DataPacket {
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public static final byte NETWORK_ID = ProtocolInfo.NPC_DIALOGUE_PACKET;
+
+ private static final SimulationType[] TYPES = SimulationType.values();
+
+ private SimulationType type;
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public SimulationTypePacket() {
+ type = SimulationType.GAME;
+ }
+
+ @Override
+ public byte pid() {
+ return NETWORK_ID;
+ }
+
+ @Override
+ public void decode() {
+ type = TYPES[getByte()];
+ }
+
+ @Override
+ public void encode() {
+ reset();
+ putByte((byte) type.ordinal());
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ @Nonnull
+ public SimulationType getSimulationType() {
+ return type;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setSimulationType(@Nonnull SimulationType type) {
+ this.type = type;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public enum SimulationType {
+ @PowerNukkitOnly @Since("1.5.2.0-PN") GAME,
+ @PowerNukkitOnly @Since("1.5.2.0-PN") EDITOR,
+ @PowerNukkitOnly @Since("1.5.2.0-PN") TEST
+ }
+}
diff --git a/src/main/java/cn/nukkit/network/protocol/SpawnParticleEffectPacket.java b/src/main/java/cn/nukkit/network/protocol/SpawnParticleEffectPacket.java
index dfd3746517a..3f20056224e 100644
--- a/src/main/java/cn/nukkit/network/protocol/SpawnParticleEffectPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/SpawnParticleEffectPacket.java
@@ -28,5 +28,6 @@ public void encode() {
this.putEntityUniqueId(uniqueEntityId);
this.putVector3f(this.position);
this.putString(this.identifier);
+ this.putBoolean(false);
}
}
diff --git a/src/main/java/cn/nukkit/network/protocol/StartGamePacket.java b/src/main/java/cn/nukkit/network/protocol/StartGamePacket.java
index aee35678b90..57fb3f6eaee 100644
--- a/src/main/java/cn/nukkit/network/protocol/StartGamePacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/StartGamePacket.java
@@ -3,9 +3,14 @@
import cn.nukkit.api.Since;
import cn.nukkit.item.RuntimeItems;
import cn.nukkit.level.GameRules;
+import cn.nukkit.nbt.NBTIO;
+import cn.nukkit.nbt.tag.CompoundTag;
import lombok.ToString;
import lombok.extern.log4j.Log4j2;
+import java.io.IOException;
+import java.util.UUID;
+
/**
* @since 15-10-13
*/
@@ -43,6 +48,7 @@ public byte pid() {
public int spawnY;
public int spawnZ;
public boolean hasAchievementsDisabled = true;
+ public boolean worldEditor;
public int dayCycleStopTime = -1; //-1 = not stopped, any positive value = stopped at that time
public int eduEditionOffer = 0;
public boolean hasEduFeaturesEnabled = false;
@@ -58,7 +64,6 @@ public byte pid() {
public GameRules gameRules;
public boolean bonusChest = false;
public boolean hasStartWithMapEnabled = false;
- @Since("1.3.0.0-PN") public boolean trustingPlayers;
public int permissionLevel = 1;
public int serverChunkTickRange = 4;
public boolean hasLockedBehaviorPack = false;
@@ -76,10 +81,13 @@ public byte pid() {
public boolean isMovementServerAuthoritative;
@Since("1.3.0.0-PN") public boolean isInventoryServerAuthoritative;
public long currentTick;
-
public int enchantmentSeed;
-
public String multiplayerCorrelationId = "";
+ public boolean isDisablingPersonas;
+ public boolean isDisablingCustomSkins;
+ public boolean clientSideGenerationEnabled;
+ public byte chatRestrictionLevel;
+ public boolean disablePlayerInteractions;
@Override
public void decode() {
@@ -95,8 +103,8 @@ public void encode() {
this.putVector3f(this.x, this.y, this.z);
this.putLFloat(this.yaw);
this.putLFloat(this.pitch);
-
- this.putVarInt(this.seed);
+ /* Level settings start */
+ this.putLLong(this.seed);
this.putLShort(0x00); // SpawnBiomeType - Default
this.putString("plains"); // UserDefinedBiomeName
this.putVarInt(this.dimension);
@@ -105,6 +113,7 @@ public void encode() {
this.putVarInt(this.difficulty);
this.putBlockVector3(this.spawnX, this.spawnY, this.spawnZ);
this.putBoolean(this.hasAchievementsDisabled);
+ this.putBoolean(this.worldEditor);
this.putVarInt(this.dayCycleStopTime);
this.putVarInt(this.eduEditionOffer);
this.putBoolean(this.hasEduFeaturesEnabled);
@@ -132,12 +141,18 @@ public void encode() {
this.putBoolean(this.isFromWorldTemplate);
this.putBoolean(this.isWorldTemplateOptionLocked);
this.putBoolean(this.isOnlySpawningV1Villagers);
+ this.putBoolean(this.isDisablingPersonas);
+ this.putBoolean(this.isDisablingCustomSkins);
this.putString(this.vanillaVersion);
this.putLInt(16); // Limited world width
this.putLInt(16); // Limited world height
this.putBoolean(false); // Nether type
+ this.putString(""); // EduSharedUriResource buttonName
+ this.putString(""); // EduSharedUriResource linkUri
this.putBoolean(false); // Experimental Gameplay
-
+ this.putByte(this.chatRestrictionLevel);
+ this.putBoolean(this.disablePlayerInteractions);
+ /* Level settings end */
this.putString(this.levelId);
this.putString(this.worldName);
this.putString(this.premiumWorldTemplateId);
@@ -152,5 +167,13 @@ public void encode() {
this.putString(this.multiplayerCorrelationId);
this.putBoolean(this.isInventoryServerAuthoritative);
this.putString(""); // Server Engine
+ try {
+ this.put(NBTIO.writeNetwork(new CompoundTag(""))); // playerPropertyData
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ this.putLLong(0); // blockRegistryChecksum
+ this.putUUID(new UUID(0, 0)); // worldTemplateId
+ this.putBoolean(this.clientSideGenerationEnabled);
}
}
diff --git a/src/main/java/cn/nukkit/network/protocol/SyncEntityPropertyPacket.java b/src/main/java/cn/nukkit/network/protocol/SyncEntityPropertyPacket.java
index 3fd59c438ad..b7a8dcf50bd 100644
--- a/src/main/java/cn/nukkit/network/protocol/SyncEntityPropertyPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/SyncEntityPropertyPacket.java
@@ -9,10 +9,16 @@
public class SyncEntityPropertyPacket extends DataPacket {
@PowerNukkitOnly
@Since("1.5.0.0-PN")
- public static final byte NETWORK_ID = ProtocolInfo.SYNC_ENTITY_PROPERTY;
+ public static final byte NETWORK_ID = ProtocolInfo.SYNC_ENTITY_PROPERTY_PACKET;
private CompoundTag data;
+ @PowerNukkitOnly
+ @Since("1.5.0.0-PN")
+ public SyncEntityPropertyPacket() {
+ // Does nothing
+ }
+
@Override
public byte pid() {
return NETWORK_ID;
@@ -25,6 +31,7 @@ public void decode() {
@Override
public void encode() {
+ reset();
putTag(data);
}
diff --git a/src/main/java/cn/nukkit/network/protocol/TextPacket.java b/src/main/java/cn/nukkit/network/protocol/TextPacket.java
index a0eb44b41be..79096adca48 100644
--- a/src/main/java/cn/nukkit/network/protocol/TextPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/TextPacket.java
@@ -1,7 +1,5 @@
package cn.nukkit.network.protocol;
-import cn.nukkit.api.DeprecationDetails;
-import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.utils.BinaryStream;
import io.netty.util.internal.EmptyArrays;
diff --git a/src/main/java/cn/nukkit/network/protocol/TickSyncPacket.java b/src/main/java/cn/nukkit/network/protocol/TickSyncPacket.java
index 294640434a3..d2614543d88 100644
--- a/src/main/java/cn/nukkit/network/protocol/TickSyncPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/TickSyncPacket.java
@@ -3,6 +3,7 @@
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
+import lombok.NoArgsConstructor;
import lombok.ToString;
/**
@@ -11,6 +12,7 @@
@PowerNukkitOnly
@Since("1.5.0.0-PN")
@ToString
+@NoArgsConstructor(onConstructor = @__(@PowerNukkitOnly))
public class TickSyncPacket extends DataPacket {
@PowerNukkitOnly
diff --git a/src/main/java/cn/nukkit/network/protocol/UpdateAbilitiesPacket.java b/src/main/java/cn/nukkit/network/protocol/UpdateAbilitiesPacket.java
new file mode 100644
index 00000000000..f19a3b9a0aa
--- /dev/null
+++ b/src/main/java/cn/nukkit/network/protocol/UpdateAbilitiesPacket.java
@@ -0,0 +1,102 @@
+package cn.nukkit.network.protocol;
+
+import cn.nukkit.network.protocol.types.AbilityLayer;
+import cn.nukkit.network.protocol.types.PlayerAbility;
+import cn.nukkit.utils.BinaryStream;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Set;
+
+@ToString
+@Getter
+@Setter
+public class UpdateAbilitiesPacket extends DataPacket {
+
+ protected static final PlayerAbility[] VALID_FLAGS = {
+ PlayerAbility.BUILD,
+ PlayerAbility.MINE,
+ PlayerAbility.DOORS_AND_SWITCHES,
+ PlayerAbility.OPEN_CONTAINERS,
+ PlayerAbility.ATTACK_PLAYERS,
+ PlayerAbility.ATTACK_MOBS,
+ PlayerAbility.OPERATOR_COMMANDS,
+ PlayerAbility.TELEPORT,
+ PlayerAbility.INVULNERABLE,
+ PlayerAbility.FLYING,
+ PlayerAbility.MAY_FLY,
+ PlayerAbility.INSTABUILD,
+ PlayerAbility.LIGHTNING,
+ PlayerAbility.FLY_SPEED,
+ PlayerAbility.WALK_SPEED,
+ PlayerAbility.MUTED,
+ PlayerAbility.WORLD_BUILDER,
+ PlayerAbility.NO_CLIP
+ };
+ private static final EnumMap FLAGS_TO_BITS = new EnumMap<>(PlayerAbility.class);
+
+ static {
+ for (int i = 0; i < VALID_FLAGS.length; i++) {
+ FLAGS_TO_BITS.put(VALID_FLAGS[i], (1 << i));
+ }
+ }
+
+ private long entityId;
+ private PlayerPermission playerPermission;
+ private CommandPermission commandPermission;
+ private final List abilityLayers = new ObjectArrayList<>();
+
+ @Override
+ public void decode() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void encode() {
+ this.reset();
+ this.putLLong(this.entityId);
+ this.putUnsignedVarInt(this.playerPermission.ordinal());
+ this.putUnsignedVarInt(this.commandPermission.ordinal());
+ this.putArray(this.abilityLayers, this::writeAbilityLayer);
+ }
+
+ private void writeAbilityLayer(BinaryStream buffer, AbilityLayer abilityLayer) {
+ buffer.putLShort(abilityLayer.getLayerType().ordinal());
+ buffer.putLInt(getAbilitiesNumber(abilityLayer.getAbilitiesSet()));
+ buffer.putLInt(getAbilitiesNumber(abilityLayer.getAbilityValues()));
+ buffer.putLFloat(abilityLayer.getFlySpeed());
+ buffer.putLFloat(abilityLayer.getWalkSpeed());
+ }
+
+ private static int getAbilitiesNumber(Set abilities) {
+ int number = 0;
+ for (PlayerAbility ability : abilities) {
+ number |= FLAGS_TO_BITS.getOrDefault(ability, 0);
+ }
+ return number;
+ }
+
+ @Override
+ public byte pid() {
+ return ProtocolInfo.UPDATE_ABILITIES_PACKET;
+ }
+
+ public enum PlayerPermission {
+ VISITOR,
+ MEMBER,
+ OPERATOR,
+ CUSTOM
+ }
+
+ public enum CommandPermission {
+ NORMAL,
+ OPERATOR,
+ HOST,
+ AUTOMATION,
+ ADMIN
+ }
+}
diff --git a/src/main/java/cn/nukkit/network/protocol/UpdateAdventureSettingsPacket.java b/src/main/java/cn/nukkit/network/protocol/UpdateAdventureSettingsPacket.java
new file mode 100644
index 00000000000..634f57b1cf5
--- /dev/null
+++ b/src/main/java/cn/nukkit/network/protocol/UpdateAdventureSettingsPacket.java
@@ -0,0 +1,36 @@
+package cn.nukkit.network.protocol;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@ToString
+@Getter
+@Setter
+public class UpdateAdventureSettingsPacket extends DataPacket {
+ private boolean noPvM;
+ private boolean noMvP;
+ private boolean immutableWorld;
+ private boolean showNameTags;
+ private boolean autoJump;
+
+ @Override
+ public void decode() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void encode() {
+ this.reset();
+ this.putBoolean(this.isNoPvM());
+ this.putBoolean(this.isNoMvP());
+ this.putBoolean(this.isImmutableWorld());
+ this.putBoolean(this.isShowNameTags());
+ this.putBoolean(this.isAutoJump());
+ }
+
+ @Override
+ public byte pid() {
+ return ProtocolInfo.UPDATE_ADVENTURE_SETTINGS_PACKET;
+ }
+}
diff --git a/src/main/java/cn/nukkit/network/protocol/UpdateAttributesPacket.java b/src/main/java/cn/nukkit/network/protocol/UpdateAttributesPacket.java
index 242bc1a2c4e..98615da53d9 100644
--- a/src/main/java/cn/nukkit/network/protocol/UpdateAttributesPacket.java
+++ b/src/main/java/cn/nukkit/network/protocol/UpdateAttributesPacket.java
@@ -21,10 +21,12 @@ public byte pid() {
return NETWORK_ID;
}
+ @Override
public void decode() {
}
+ @Override
public void encode() {
this.reset();
@@ -40,6 +42,7 @@ public void encode() {
this.putLFloat(entry.getValue());
this.putLFloat(entry.getDefaultValue());
this.putString(entry.getName());
+ this.putUnsignedVarInt(0); // Modifiers
}
}
this.putUnsignedVarInt(this.frame);
diff --git a/src/main/java/cn/nukkit/network/protocol/types/AbilityLayer.java b/src/main/java/cn/nukkit/network/protocol/types/AbilityLayer.java
new file mode 100644
index 00000000000..b1b43e75ab8
--- /dev/null
+++ b/src/main/java/cn/nukkit/network/protocol/types/AbilityLayer.java
@@ -0,0 +1,23 @@
+package cn.nukkit.network.protocol.types;
+
+import lombok.Data;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+@Data
+public class AbilityLayer {
+ private Type layerType;
+ private final Set abilitiesSet = EnumSet.noneOf(PlayerAbility.class);
+ private final Set abilityValues = EnumSet.noneOf(PlayerAbility.class);
+ private float flySpeed;
+ private float walkSpeed;
+
+ public enum Type {
+ CACHE,
+ BASE,
+ SPECTATOR,
+ COMMANDS,
+ EDITOR
+ }
+}
diff --git a/src/main/java/cn/nukkit/network/protocol/types/EntityLink.java b/src/main/java/cn/nukkit/network/protocol/types/EntityLink.java
index 8c22e0bde24..35e1ab69ec9 100644
--- a/src/main/java/cn/nukkit/network/protocol/types/EntityLink.java
+++ b/src/main/java/cn/nukkit/network/protocol/types/EntityLink.java
@@ -1,6 +1,5 @@
package cn.nukkit.network.protocol.types;
-import cn.nukkit.api.DeprecationDetails;
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
diff --git a/src/main/java/cn/nukkit/network/protocol/types/PacketCompressionAlgorithm.java b/src/main/java/cn/nukkit/network/protocol/types/PacketCompressionAlgorithm.java
new file mode 100644
index 00000000000..c7eb3c67265
--- /dev/null
+++ b/src/main/java/cn/nukkit/network/protocol/types/PacketCompressionAlgorithm.java
@@ -0,0 +1,6 @@
+package cn.nukkit.network.protocol.types;
+
+public enum PacketCompressionAlgorithm {
+ ZLIB,
+ SNAPPY
+}
diff --git a/src/main/java/cn/nukkit/network/protocol/types/PlayerAbility.java b/src/main/java/cn/nukkit/network/protocol/types/PlayerAbility.java
new file mode 100644
index 00000000000..66707e97c7e
--- /dev/null
+++ b/src/main/java/cn/nukkit/network/protocol/types/PlayerAbility.java
@@ -0,0 +1,27 @@
+package cn.nukkit.network.protocol.types;
+
+import java.util.Arrays;
+import java.util.List;
+
+public enum PlayerAbility {
+ BUILD,
+ MINE,
+ DOORS_AND_SWITCHES,
+ OPEN_CONTAINERS,
+ ATTACK_PLAYERS,
+ ATTACK_MOBS,
+ OPERATOR_COMMANDS,
+ TELEPORT,
+ INVULNERABLE,
+ FLYING,
+ MAY_FLY,
+ INSTABUILD,
+ LIGHTNING,
+ FLY_SPEED,
+ WALK_SPEED,
+ MUTED,
+ WORLD_BUILDER,
+ NO_CLIP;
+
+ public static final List VALUES = Arrays.asList(values());
+}
diff --git a/src/main/java/cn/nukkit/network/rcon/RCONServer.java b/src/main/java/cn/nukkit/network/rcon/RCONServer.java
index 334de29d376..32b9ed3cf93 100644
--- a/src/main/java/cn/nukkit/network/rcon/RCONServer.java
+++ b/src/main/java/cn/nukkit/network/rcon/RCONServer.java
@@ -73,6 +73,7 @@ public void close() {
this.selector.wakeup();
}
+ @Override
public void run() {
while (this.running) {
try {
diff --git a/src/main/java/cn/nukkit/network/session/NetworkPlayerSession.java b/src/main/java/cn/nukkit/network/session/NetworkPlayerSession.java
new file mode 100644
index 00000000000..65627399936
--- /dev/null
+++ b/src/main/java/cn/nukkit/network/session/NetworkPlayerSession.java
@@ -0,0 +1,18 @@
+package cn.nukkit.network.session;
+
+import cn.nukkit.Player;
+import cn.nukkit.network.CompressionProvider;
+import cn.nukkit.network.protocol.DataPacket;
+
+public interface NetworkPlayerSession {
+
+ void sendPacket(DataPacket packet);
+ void sendImmediatePacket(DataPacket packet, Runnable callback);
+
+ void disconnect(String reason);
+
+ Player getPlayer();
+
+ void setCompression(CompressionProvider compression);
+ CompressionProvider getCompression();
+}
diff --git a/src/main/java/cn/nukkit/network/session/RakNetPlayerSession.java b/src/main/java/cn/nukkit/network/session/RakNetPlayerSession.java
new file mode 100644
index 00000000000..3b229f3dc0e
--- /dev/null
+++ b/src/main/java/cn/nukkit/network/session/RakNetPlayerSession.java
@@ -0,0 +1,213 @@
+package cn.nukkit.network.session;
+
+import cn.nukkit.Player;
+import cn.nukkit.Server;
+import cn.nukkit.network.CompressionProvider;
+import cn.nukkit.network.RakNetInterface;
+import cn.nukkit.network.protocol.BatchPacket;
+import cn.nukkit.network.protocol.DataPacket;
+import cn.nukkit.network.protocol.ProtocolInfo;
+import cn.nukkit.utils.BinaryStream;
+import com.google.common.base.Preconditions;
+import com.nukkitx.network.raknet.EncapsulatedPacket;
+import com.nukkitx.network.raknet.RakNetServerSession;
+import com.nukkitx.network.raknet.RakNetSessionListener;
+import com.nukkitx.network.raknet.RakNetState;
+import com.nukkitx.network.util.DisconnectReason;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.util.internal.PlatformDependent;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import lombok.extern.log4j.Log4j2;
+import org.apache.logging.log4j.message.FormattedMessage;
+
+import java.net.ProtocolException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+@Log4j2
+public class RakNetPlayerSession implements NetworkPlayerSession, RakNetSessionListener {
+
+ private final RakNetInterface server;
+ private final RakNetServerSession session;
+
+ private final Queue inbound = PlatformDependent.newSpscQueue();
+ private final Queue outbound = PlatformDependent.newMpscQueue();
+ private final ScheduledFuture tickFuture;
+
+ private Player player;
+ private String disconnectReason = null;
+
+ private CompressionProvider compression = CompressionProvider.NONE;
+
+ public RakNetPlayerSession(RakNetInterface server, RakNetServerSession session) {
+ this.server = server;
+ this.session = session;
+ this.tickFuture = session.getEventLoop().scheduleAtFixedRate(this::networkTick, 0, 50, TimeUnit.MILLISECONDS);
+ }
+
+ @Override
+ public void onEncapsulated(EncapsulatedPacket packet) {
+ ByteBuf buffer = packet.getBuffer();
+ short packetId = buffer.readUnsignedByte();
+ if (packetId == 0xfe) {
+ byte[] packetBuffer = new byte[buffer.readableBytes()];
+ buffer.readBytes(packetBuffer);
+
+ try {
+ this.server.getNetwork().processBatch(packetBuffer, this.inbound, this.getCompression());
+ } catch (ProtocolException e) {
+ this.disconnect("Sent malformed packet");
+ log.error("Unable to process batch packet", e);
+ }
+ }
+ }
+
+ @Override
+ public void onDirect(ByteBuf byteBuf) {
+ // We don't allow any direct packets so ignore.
+ }
+
+ @Override
+ public void onSessionChangeState(RakNetState rakNetState) {
+ }
+
+ @Override
+ public void onDisconnect(DisconnectReason reason) {
+ if (reason == DisconnectReason.TIMED_OUT) {
+ this.disconnect("Timed out");
+ } else {
+ this.disconnect("Disconnected from Server");
+ }
+ }
+
+ @Override
+ public void disconnect(String reason) {
+ if (this.disconnectReason != null) {
+ return;
+ }
+
+ this.disconnectReason = reason;
+ if (this.tickFuture != null) {
+ this.tickFuture.cancel(false);
+ }
+
+ // Give it a short time to make sure cancel message is delivered
+ this.session.getEventLoop().schedule(() -> this.session.close(), 10, TimeUnit.MILLISECONDS);
+ }
+
+ @Override
+ public void sendPacket(DataPacket packet) {
+ if (!this.session.isClosed()) {
+ packet.tryEncode();
+ this.outbound.offer(packet);
+ }
+ }
+
+ @Override
+ public void sendImmediatePacket(DataPacket packet, Runnable callback) {
+ if (this.session.isClosed()) {
+ return;
+ }
+
+
+ this.sendPacket(packet);
+ this.session.getEventLoop().execute(() -> {
+ this.networkTick();
+ callback.run();
+ });
+ }
+
+ private void networkTick() {
+ if (this.session.isClosed()) {
+ return;
+ }
+
+ List toBatch = new ObjectArrayList<>();
+ DataPacket packet;
+ while ((packet = this.outbound.poll()) != null) {
+ if (packet.pid() == ProtocolInfo.BATCH_PACKET) {
+ if (!toBatch.isEmpty()) {
+ this.sendPackets(toBatch);
+ toBatch.clear();
+ }
+
+ this.sendPacket(((BatchPacket) packet).payload);
+ } else {
+ toBatch.add(packet);
+ }
+ }
+
+ if (!toBatch.isEmpty()) {
+ this.sendPackets(toBatch);
+ }
+ }
+
+ public void serverTick() {
+ DataPacket packet;
+ while ((packet = this.inbound.poll()) != null) {
+ try {
+ this.player.handleDataPacket(packet);
+ } catch (Exception e) {
+ log.error(new FormattedMessage("An error occurred whilst handling {} for {}",
+ new Object[]{packet.getClass().getSimpleName(), this.player.getName()}, e));
+ }
+ }
+ }
+
+ private void sendPackets(Collection packets) {
+ BinaryStream batched = new BinaryStream();
+ for (DataPacket packet : packets) {
+ Preconditions.checkArgument(!(packet instanceof BatchPacket), "Cannot batch BatchPacket");
+ Preconditions.checkState(packet.isEncoded, "Packet should have already been encoded");
+ byte[] buf = packet.getBuffer();
+ batched.putUnsignedVarInt(buf.length);
+ batched.put(buf);
+ }
+
+ try {
+ this.sendPacket(this.compression.compress(batched, Server.getInstance().networkCompressionLevel));
+ } catch (Exception e) {
+ log.error("Unable to compress batched packets", e);
+ }
+ }
+
+ private void sendPacket(byte[] payload) {
+ ByteBuf byteBuf = ByteBufAllocator.DEFAULT.ioBuffer(1 + payload.length);
+ byteBuf.writeByte(0xfe);
+ byteBuf.writeBytes(payload);
+ this.session.send(byteBuf);
+ }
+
+ @Override
+ public void setCompression(CompressionProvider compression) {
+ Preconditions.checkNotNull(compression);
+ this.compression = compression;
+ }
+
+ @Override
+ public CompressionProvider getCompression() {
+ return this.compression;
+ }
+
+ public void setPlayer(Player player) {
+ Preconditions.checkArgument(this.player == null && player != null);
+ this.player = player;
+ }
+
+ @Override
+ public Player getPlayer() {
+ return this.player;
+ }
+
+ public RakNetServerSession getRakNetSession() {
+ return this.session;
+ }
+
+ public String getDisconnectReason() {
+ return this.disconnectReason;
+ }
+}
diff --git a/src/main/java/cn/nukkit/plugin/LibraryLoader.java b/src/main/java/cn/nukkit/plugin/LibraryLoader.java
index 72d53b8b27b..76eadbd7c4d 100644
--- a/src/main/java/cn/nukkit/plugin/LibraryLoader.java
+++ b/src/main/java/cn/nukkit/plugin/LibraryLoader.java
@@ -31,14 +31,17 @@ public static void load(String library) {
throw new IllegalArgumentException(library);
}
load(new Library() {
+ @Override
public String getGroupId() {
return split[0];
}
+ @Override
public String getArtifactId() {
return split[1];
}
+ @Override
public String getVersion() {
return split[2];
}
diff --git a/src/main/java/cn/nukkit/plugin/PluginBase.java b/src/main/java/cn/nukkit/plugin/PluginBase.java
index 1c1222faec8..ecdda8a3ca5 100644
--- a/src/main/java/cn/nukkit/plugin/PluginBase.java
+++ b/src/main/java/cn/nukkit/plugin/PluginBase.java
@@ -51,18 +51,22 @@ abstract public class PluginBase implements Plugin {
private PluginLogger logger;
+ @Override
public void onLoad() {
}
+ @Override
public void onEnable() {
}
+ @Override
public void onDisable() {
}
+ @Override
public final boolean isEnabled() {
return isEnabled;
}
@@ -105,14 +109,17 @@ public final void setEnabled(boolean value) {
}
}
+ @Override
public final boolean isDisabled() {
return !isEnabled;
}
+ @Override
public final File getDataFolder() {
return dataFolder;
}
+ @Override
public final PluginDescription getDescription() {
return description;
}
@@ -149,6 +156,7 @@ public final void init(PluginLoader loader, Server server, PluginDescription des
}
}
+ @Override
public PluginLogger getLogger() {
return logger;
}
diff --git a/src/main/java/cn/nukkit/plugin/PluginManager.java b/src/main/java/cn/nukkit/plugin/PluginManager.java
index 6df7836eddb..345ed3ca801 100644
--- a/src/main/java/cn/nukkit/plugin/PluginManager.java
+++ b/src/main/java/cn/nukkit/plugin/PluginManager.java
@@ -7,6 +7,7 @@
import cn.nukkit.command.PluginCommand;
import cn.nukkit.command.SimpleCommandMap;
import cn.nukkit.event.*;
+import cn.nukkit.lang.BaseLang;
import cn.nukkit.permission.Permissible;
import cn.nukkit.permission.Permission;
import cn.nukkit.utils.PluginException;
@@ -266,8 +267,9 @@ public Map loadPlugins(File dictionary, List newLoaders,
if (loadedPlugins.containsKey(dependency) || this.getPlugin(dependency) != null) {
dependencies.get(name).remove(dependency);
} else if (!plugins.containsKey(dependency)) {
- log.fatal(this.server.getLanguage().translateString("nukkit" +
- ".plugin.loadError", name, "%nukkit.plugin.unknownDependency", dependency));
+ BaseLang language = this.server.getLanguage();
+ String cause = language.translateString("nukkit.plugin.missingDependency", dependency);
+ log.fatal(language.translateString("nukkit.plugin.loadError", new String[]{name, cause}, null));
break;
}
}
diff --git a/src/main/java/cn/nukkit/plugin/PowerNukkitPlugin.java b/src/main/java/cn/nukkit/plugin/PowerNukkitPlugin.java
index 32fa019de40..6d96fd6245d 100644
--- a/src/main/java/cn/nukkit/plugin/PowerNukkitPlugin.java
+++ b/src/main/java/cn/nukkit/plugin/PowerNukkitPlugin.java
@@ -2,10 +2,11 @@
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
-import cn.nukkit.event.Listener;
+import lombok.NoArgsConstructor;
@PowerNukkitOnly
@Since("1.3.0.0-PN")
+@NoArgsConstructor(onConstructor = @__(@PowerNukkitOnly))
public class PowerNukkitPlugin extends PluginBase {
private static final PowerNukkitPlugin INSTANCE = new PowerNukkitPlugin();
@@ -14,31 +15,4 @@ public class PowerNukkitPlugin extends PluginBase {
public static PowerNukkitPlugin getInstance() {
return INSTANCE;
}
-
- @Override
- public void onEnable() {
- getServer().getPluginManager().registerEvents(new HotFixes(), this);
- }
-
- /**
- * These are temporary workaround to issues with great impact that wasn't fixed the right way yet.
- */
- private class HotFixes implements Listener {
- /*
- * Hotfix from MR.CLEAN: https://discordapp.com/channels/728280425255927879/728284727748067455/734488813774307329
- */
- /*@EventHandler
- public void onOpenEC(InventoryOpenEvent e) {
- if (!e.isCancelled() && e.getInventory() instanceof PlayerEnderChestInventory) {
- final Player p = e.getPlayer();
-
- Server.getInstance().getScheduler().scheduleDelayedTask(PowerNukkitPlugin.this, () -> {
- if (p != null && p.isOnline() && p.getTopWindow().isPresent() && p.getTopWindow().get() instanceof PlayerEnderChestInventory) {
- PlayerEnderChestInventory ec = (PlayerEnderChestInventory) p.getTopWindow().get();
- ec.sendContents(p);
- }
- }, 3);
- }
- }*/
- }
}
diff --git a/src/main/java/cn/nukkit/plugin/service/RegisteredServiceProvider.java b/src/main/java/cn/nukkit/plugin/service/RegisteredServiceProvider.java
index 879e12323e7..b4d5d0d131b 100644
--- a/src/main/java/cn/nukkit/plugin/service/RegisteredServiceProvider.java
+++ b/src/main/java/cn/nukkit/plugin/service/RegisteredServiceProvider.java
@@ -67,6 +67,7 @@ public int hashCode() {
return provider.hashCode();
}
+ @Override
public int compareTo(RegisteredServiceProvider other) {
return other.priority.ordinal() - priority.ordinal();
}
diff --git a/src/main/java/cn/nukkit/positiontracking/NamedPosition.java b/src/main/java/cn/nukkit/positiontracking/NamedPosition.java
index b40b5515c1d..50af725aedf 100644
--- a/src/main/java/cn/nukkit/positiontracking/NamedPosition.java
+++ b/src/main/java/cn/nukkit/positiontracking/NamedPosition.java
@@ -39,7 +39,8 @@ public NamedPosition(double x, double y, double z) {
@Since("1.4.0.0-PN")
@Nonnull
public abstract String getLevelName();
-
+
+ @PowerNukkitOnly
public boolean matchesNamedPosition(NamedPosition position) {
return x == position.x && y == position.y && z == position.z && getLevelName().equals(position.getLevelName());
}
diff --git a/src/main/java/cn/nukkit/potion/Potion.java b/src/main/java/cn/nukkit/potion/Potion.java
index 41f63637ad7..e6ace021d0c 100644
--- a/src/main/java/cn/nukkit/potion/Potion.java
+++ b/src/main/java/cn/nukkit/potion/Potion.java
@@ -1,6 +1,9 @@
package cn.nukkit.potion;
import cn.nukkit.Player;
+import cn.nukkit.api.DeprecationDetails;
+import cn.nukkit.api.PowerNukkitDifference;
+import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.EntityLiving;
@@ -9,10 +12,15 @@
import cn.nukkit.event.entity.EntityRegainHealthEvent;
import cn.nukkit.event.potion.PotionApplyEvent;
import cn.nukkit.utils.ServerException;
+import lombok.EqualsAndHashCode;
+
+import javax.annotation.Nonnull;
/**
* @author MagicDroidX (Nukkit Project)
*/
+@PowerNukkitDifference(since = "1.6.0.0-PN", info = "Implements equals() and hashcode() only in PowerNukkit")
+@EqualsAndHashCode
public class Potion implements Cloneable {
public static final int NO_EFFECTS = 0;
@@ -58,8 +66,14 @@ public class Potion implements Cloneable {
public static final int TURTLE_MASTER_II = 39;
public static final int SLOW_FALLING = 40;
public static final int SLOW_FALLING_LONG = 41;
- @Since("1.4.0.0-PN") public static final int SLOWNESS_LONG_II = 42;
- @Since("1.4.0.0-PN") public static final int SLOWNESS_IV = 43;
+ @Since("1.4.0.0-PN") @PowerNukkitOnly public static final int SLOWNESS_IV = 42;
+
+ @Since("1.4.0.0-PN")
+ @Deprecated
+ @DeprecationDetails(since = "1.6.0.0-PN", by = "PowerNukkit", reason =
+ "Incorrect name, there is vanilla potion with slowness long 2, the result of potion with slowness 1 + glowstone is slowness 4",
+ replaceWith = "SLOWNESS_IV")
+ public static final int SLOWNESS_LONG_II = SLOWNESS_IV;
protected static Potion[] potions;
@@ -108,7 +122,6 @@ public static void init() {
potions[Potion.TURTLE_MASTER_II] = new Potion(Potion.TURTLE_MASTER_II, 2);
potions[Potion.SLOW_FALLING] = new Potion(Potion.SLOW_FALLING);
potions[Potion.SLOW_FALLING_LONG] = new Potion(Potion.SLOW_FALLING_LONG);
- potions[Potion.SLOWNESS_LONG_II] = new Potion(Potion.SLOWNESS_LONG_II, 2);
potions[Potion.SLOWNESS_IV] = new Potion(Potion.SLOWNESS, 4);
}
@@ -397,7 +410,6 @@ public static int getApplySeconds(int potionType, boolean isSplash) {
case NIGHT_VISION_LONG:
case STRENGTH_LONG:
case WATER_BREATHING_LONG:
- case SPEED_II:
case SPEED_LONG:
case FIRE_RESISTANCE_LONG:
case LEAPING_LONG:
@@ -407,6 +419,7 @@ public static int getApplySeconds(int potionType, boolean isSplash) {
case WEAKNESS:
case STRENGTH_II:
case SLOWNESS:
+ case SPEED_II:
return 90;
case SLOWNESS_LONG:
case WEAKNESS_LONG:
@@ -429,4 +442,137 @@ public static int getApplySeconds(int potionType, boolean isSplash) {
}
}
}
+
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ @Nonnull
+ public String getPotionTypeName() {
+ switch (getId()) {
+ case WATER:
+ return "Water";
+ case MUNDANE:
+ case MUNDANE_II:
+ return "Mundane";
+ case THICK:
+ return "Thick";
+ case AWKWARD:
+ return "Awkward";
+ case NIGHT_VISION_LONG:
+ case NIGHT_VISION:
+ return "Night Vision";
+ case INVISIBLE:
+ case INVISIBLE_LONG:
+ return "Invisibility";
+ case LEAPING_LONG:
+ case LEAPING_II:
+ case LEAPING:
+ return "Leaping";
+ case FIRE_RESISTANCE_LONG:
+ case FIRE_RESISTANCE:
+ return "Fire Resistance";
+ case SPEED:
+ case SPEED_LONG:
+ case SPEED_II:
+ return "Swiftness";
+ case SLOWNESS_LONG:
+ case SLOWNESS:
+ case SLOWNESS_IV:
+ return "Slowness";
+ case WATER_BREATHING_LONG:
+ case WATER_BREATHING:
+ return "Water Breathing";
+ case INSTANT_HEALTH:
+ case INSTANT_HEALTH_II:
+ return "Healing";
+ case HARMING:
+ case HARMING_II:
+ return "Harming";
+ case POISON:
+ case POISON_LONG:
+ case POISON_II:
+ return "Poison";
+ case REGENERATION:
+ case REGENERATION_LONG:
+ case REGENERATION_II:
+ return "Regeneration";
+ case STRENGTH:
+ case STRENGTH_LONG:
+ case STRENGTH_II:
+ return "Strength";
+ case WEAKNESS:
+ case WEAKNESS_LONG:
+ return "Weakness";
+ case WITHER_II:
+ return "Decay";
+ case TURTLE_MASTER:
+ case TURTLE_MASTER_LONG:
+ case TURTLE_MASTER_II:
+ return "Turtle Master";
+ case SLOW_FALLING:
+ case SLOW_FALLING_LONG:
+ return "Slow Falling";
+ default:
+ return "";
+ }
+ }
+
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ @Nonnull
+ public String getName() {
+ String name = getPotionTypeName();
+ StringBuilder finalName = new StringBuilder(255).append("Potion");
+ if (!name.isEmpty()) {
+ int id = getId();
+ if (id >= TURTLE_MASTER && id <= TURTLE_MASTER_II) {
+ finalName.append(" of the ").append(name);
+ } else if (id <= AWKWARD) {
+ finalName.insert(0, name + " ");
+ } else {
+ finalName.append(" of ").append(name);
+ }
+ }
+
+ int currentLevel = getLevel();
+ if (currentLevel > 1) {
+ finalName.append(' ');
+ appendRoman(finalName, currentLevel);
+ }
+ return finalName.toString();
+ }
+
+ @PowerNukkitOnly
+ @Since("1.6.0.0-PN")
+ @Nonnull
+ public String getRomanLevel() {
+ int currentLevel = getLevel();
+ if (currentLevel == 0) {
+ return "0";
+ }
+
+ StringBuilder sb = new StringBuilder(4);
+ if (currentLevel < 0) {
+ sb.append('-');
+ currentLevel *= -1;
+ }
+
+ appendRoman(sb, currentLevel);
+ return sb.toString();
+ }
+
+ private static void appendRoman(StringBuilder sb, int num) {
+ int times;
+ String[] romans = new String[] { "I", "IV", "V", "IX", "X", "XL", "L",
+ "XC", "C", "CD", "D", "CM", "M" };
+ int[] ints = new int[] { 1, 4, 5, 9, 10, 40, 50, 90, 100, 400, 500,
+ 900, 1000 };
+ for (int i = ints.length - 1; i >= 0; i--) {
+ times = num / ints[i];
+ num %= ints[i];
+ while (times > 0) {
+ sb.append(romans[i]);
+ times--;
+ }
+ }
+ }
}
diff --git a/src/main/java/cn/nukkit/resourcepacks/ResourcePackManager.java b/src/main/java/cn/nukkit/resourcepacks/ResourcePackManager.java
index f1be64e54d3..d5282e8b1f5 100644
--- a/src/main/java/cn/nukkit/resourcepacks/ResourcePackManager.java
+++ b/src/main/java/cn/nukkit/resourcepacks/ResourcePackManager.java
@@ -1,7 +1,11 @@
package cn.nukkit.resourcepacks;
import cn.nukkit.Server;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
+
import com.google.common.io.Files;
+
import lombok.extern.log4j.Log4j2;
import java.io.File;
@@ -9,6 +13,9 @@
@Log4j2
public class ResourcePackManager {
+
+ private int maxChunkSize = 102400;
+
private final Map resourcePacksById = new HashMap<>();
private ResourcePack[] resourcePacks;
@@ -59,4 +66,16 @@ public ResourcePack[] getResourceStack() {
public ResourcePack getPackById(UUID id) {
return this.resourcePacksById.get(id);
}
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public int getMaxChunkSize() {
+ return this.maxChunkSize;
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void setMaxChunkSize(int size) {
+ this.maxChunkSize = size;
+ }
}
diff --git a/src/main/java/cn/nukkit/scheduler/AsyncTask.java b/src/main/java/cn/nukkit/scheduler/AsyncTask.java
index 3c05aa3547d..a22141d3af6 100644
--- a/src/main/java/cn/nukkit/scheduler/AsyncTask.java
+++ b/src/main/java/cn/nukkit/scheduler/AsyncTask.java
@@ -20,6 +20,7 @@ public abstract class AsyncTask implements Runnable {
private int taskId;
private boolean finished = false;
+ @Override
public void run() {
this.result = null;
this.onRun();
diff --git a/src/main/java/cn/nukkit/scheduler/AsyncWorker.java b/src/main/java/cn/nukkit/scheduler/AsyncWorker.java
index 2b44070f09c..47ecff7fd4b 100644
--- a/src/main/java/cn/nukkit/scheduler/AsyncWorker.java
+++ b/src/main/java/cn/nukkit/scheduler/AsyncWorker.java
@@ -32,6 +32,7 @@ public void unstack(AsyncTask task) {
}
}
+ @Override
public void run() {
while (true) {
synchronized (stack) {
diff --git a/src/main/java/cn/nukkit/utils/BinaryStream.java b/src/main/java/cn/nukkit/utils/BinaryStream.java
index a0437fcdbb2..90e135a0015 100644
--- a/src/main/java/cn/nukkit/utils/BinaryStream.java
+++ b/src/main/java/cn/nukkit/utils/BinaryStream.java
@@ -3,12 +3,11 @@
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.block.Block;
+import cn.nukkit.blockstate.BlockState;
+import cn.nukkit.blockstate.BlockStateRegistry;
import cn.nukkit.entity.Attribute;
import cn.nukkit.entity.data.Skin;
-import cn.nukkit.item.Item;
-import cn.nukkit.item.ItemDurable;
-import cn.nukkit.item.ItemID;
-import cn.nukkit.item.RuntimeItems;
+import cn.nukkit.item.*;
import cn.nukkit.level.GameRule;
import cn.nukkit.level.GameRules;
import cn.nukkit.math.BlockFace;
@@ -26,6 +25,8 @@
import io.netty.buffer.ByteBufAllocator;
import io.netty.util.internal.EmptyArrays;
import lombok.SneakyThrows;
+import lombok.extern.log4j.Log4j2;
+import lombok.val;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -33,13 +34,18 @@
import java.nio.ByteOrder;
import java.nio.charset.StandardCharsets;
import java.util.*;
+import java.util.function.Consumer;
+import java.util.function.BiConsumer;
import java.util.function.Function;
/**
* @author MagicDroidX (Nukkit Project)
*/
+@Log4j2
public class BinaryStream {
+ private static final int FALLBACK_ID = 248;
+
public int offset;
private byte[] buffer;
private int count;
@@ -286,10 +292,8 @@ public void putSkin(Skin skin) {
this.putImage(skin.getCapeData());
this.putString(skin.getGeometryData());
+ this.putString(skin.getGeometryDataEngineVersion());
this.putString(skin.getAnimationData());
- this.putBoolean(skin.isPremium());
- this.putBoolean(skin.isPersona());
- this.putBoolean(skin.isCapeOnClassic());
this.putString(skin.getCapeId());
this.putString(skin.getFullSkinId());
this.putString(skin.getArmSize());
@@ -314,6 +318,11 @@ public void putSkin(Skin skin) {
this.putString(color);
}
}
+
+ this.putBoolean(skin.isPremium());
+ this.putBoolean(skin.isPersona());
+ this.putBoolean(skin.isCapeOnClassic());
+ this.putBoolean(skin.isPrimaryUser());
}
public Skin getSkin() {
@@ -334,10 +343,8 @@ public Skin getSkin() {
skin.setCapeData(this.getImage());
skin.setGeometryData(this.getString());
+ skin.setGeometryDataEngineVersion(this.getString());
skin.setAnimationData(this.getString());
- skin.setPremium(this.getBoolean());
- skin.setPersona(this.getBoolean());
- skin.setCapeOnClassic(this.getBoolean());
skin.setCapeId(this.getString());
this.getString(); // TODO: Full skin id
skin.setArmSize(this.getString());
@@ -363,6 +370,11 @@ public Skin getSkin() {
}
skin.getTintColors().add(new PersonaPieceTint(pieceType, colors));
}
+
+ skin.setPremium(this.getBoolean());
+ skin.setPersona(this.getBoolean());
+ skin.setCapeOnClassic(this.getBoolean());
+ skin.setPrimaryUser(this.getBoolean());
return skin;
}
@@ -400,7 +412,13 @@ public Item getSlot() {
getVarInt(); // netId
}
- getVarInt(); // blockRuntimeId
+ int blockRuntimeId = getVarInt();
+ if (id <= 255 && id != FALLBACK_ID) {
+ BlockState blockStateByRuntimeId = BlockStateRegistry.getBlockStateByRuntimeId(blockRuntimeId);
+ if (blockStateByRuntimeId != null) {
+ damage = blockStateByRuntimeId.asItemBlock().getDamage();
+ }
+ }
byte[] bytes = getByteArray();
ByteBuf buf = AbstractByteBufAllocator.DEFAULT.ioBuffer(bytes.length);
@@ -424,7 +442,9 @@ public Item getSlot() {
if (compoundTag != null && compoundTag.getAllTags().size() > 0) {
if (compoundTag.contains("Damage")) {
- damage = compoundTag.getInt("Damage");
+ if (id > 255) {
+ damage = compoundTag.getInt("Damage");
+ }
compoundTag.remove("Damage");
}
if (compoundTag.contains("__DamageConflict__")) {
@@ -454,7 +474,7 @@ public Item getSlot() {
buf.release();
}
- Item item = Item.get(id, damage, count, nbt);
+ Item item = readUnknownItem(Item.get(id, damage, count, nbt));
if (canBreak.length > 0 || canPlace.length > 0) {
CompoundTag namedTag = item.getNamedTag();
@@ -484,6 +504,68 @@ public Item getSlot() {
return item;
}
+ private Item readUnknownItem(Item item) {
+ if (item.getId() != FALLBACK_ID || !item.hasCompoundTag()) {
+ return item;
+ }
+
+ CompoundTag tag = item.getNamedTag();
+ if (!tag.containsCompound("PowerNukkitUnknown")) {
+ return item;
+ }
+
+ CompoundTag pnTag = tag.getCompound("PowerNukkitUnknown");
+ int itemId = pnTag.getInt("OriginalItemId");
+ int meta = pnTag.getInt("OriginalMeta");
+ boolean hasCustomName = pnTag.getBoolean("HasCustomName");
+ boolean hasCompound = pnTag.getBoolean("HasCompound");
+ boolean hasDisplayTag = pnTag.getBoolean("HasDisplayTag");
+ String customName = pnTag.getString("OriginalCustomName");
+
+ item = Item.get(itemId, meta, item.getCount());
+ if (hasCompound) {
+ tag.remove("PowerNukkitUnknown");
+ if (!hasDisplayTag) {
+ tag.remove("display");
+ } else if (tag.containsCompound("display")) {
+ if (!hasCustomName) {
+ tag.getCompound("display").remove("Name");
+ } else {
+ tag.getCompound("display").putString("Name", customName);
+ }
+ }
+ item.setNamedTag(tag);
+ }
+
+ return item;
+ }
+
+ private Item createFakeUnknownItem(Item item) {
+ boolean hasCompound = item.hasCompoundTag();
+ Item fallback = Item.getBlock(FALLBACK_ID, 0, item.getCount());
+ CompoundTag tag = item.getNamedTag();
+ if (tag == null) {
+ tag = new CompoundTag();
+ }
+ tag.putCompound("PowerNukkitUnknown", new CompoundTag()
+ .putInt("OriginalItemId", item.getId())
+ .putInt("OriginalMeta", item.getDamage())
+ .putBoolean("HasCustomName", item.hasCustomName())
+ .putBoolean("HasDisplayTag", tag.contains("display"))
+ .putBoolean("HasCompound", hasCompound)
+ .putString("OriginalCustomName", item.getCustomName()));
+
+ fallback.setNamedTag(tag);
+ String suffix = "" + TextFormat.RESET + TextFormat.GRAY + TextFormat.ITALIC +
+ " (" + item.getId() + ":" + item.getDamage() + ")";
+ if (fallback.hasCustomName()) {
+ fallback.setCustomName(fallback.getCustomName() + suffix);
+ } else {
+ fallback.setCustomName(TextFormat.RESET + "" + TextFormat.BOLD + TextFormat.RED + "Unknown" + suffix);
+ }
+ return fallback;
+ }
+
public void putSlot(Item item) {
this.putSlot(item, false);
}
@@ -495,7 +577,14 @@ public void putSlot(Item item, boolean instanceItem) {
return;
}
- int networkFullId = RuntimeItems.getRuntimeMapping().getNetworkFullId(item);
+ int networkFullId;
+ try {
+ networkFullId = RuntimeItems.getRuntimeMapping().getNetworkFullId(item);
+ } catch (IllegalArgumentException e) {
+ log.trace(e);
+ item = createFakeUnknownItem(item);
+ networkFullId = RuntimeItems.getRuntimeMapping().getNetworkFullId(item);
+ }
int networkId = RuntimeItems.getNetworkId(networkFullId);
putVarInt(networkId);
@@ -511,7 +600,7 @@ public void putSlot(Item item, boolean instanceItem) {
if (!instanceItem) {
putBoolean(true); // hasNetId
- putVarInt(0); // netId
+ putVarInt(1); // netId
}
Block block = item.getBlockUnsafe();
@@ -597,10 +686,13 @@ public Item getRecipeIngredient() {
public void putRecipeIngredient(Item ingredient) {
if (ingredient == null || ingredient.getId() == 0) {
- this.putVarInt(0);
+ this.putBoolean(false); // isValid? - false
+ this.putVarInt(0); // item == null ? 0 : item.getCount()
return;
}
+ this.putBoolean(true); // isValid? - true
+
int networkFullId = RuntimeItems.getRuntimeMapping().getNetworkFullId(ingredient);
int networkId = RuntimeItems.getNetworkId(networkFullId);
int damage = ingredient.hasMeta() ? ingredient.getDamage() : 0x7fff;
@@ -608,8 +700,8 @@ public void putRecipeIngredient(Item ingredient) {
damage = 0;
}
- this.putVarInt(networkId);
- this.putVarInt(damage);
+ this.putLShort(networkId);
+ this.putLShort(damage);
this.putVarInt(ingredient.getCount());
}
@@ -725,7 +817,10 @@ public void putVector3f(float x, float y, float z) {
}
public void putGameRules(GameRules gameRules) {
- Map rules = gameRules.getGameRules();
+ // LinkedHashMap gives mutability and is faster in iteration
+ val rules = new LinkedHashMap<>(gameRules.getGameRules());
+ rules.keySet().removeIf(GameRule::isDeprecated);
+
this.putUnsignedVarInt(rules.size());
rules.forEach((gameRule, value) -> {
this.putString(gameRule.getName().toLowerCase());
@@ -789,6 +884,30 @@ public EntityLink getEntityLink() {
);
}
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void putArray(Collection collection, Consumer writer) {
+ if (collection == null) {
+ putUnsignedVarInt(0);
+ return;
+ }
+ putUnsignedVarInt(collection.size());
+ collection.forEach(writer);
+ }
+
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public void putArray(T[] collection, Consumer writer) {
+ if (collection == null) {
+ putUnsignedVarInt(0);
+ return;
+ }
+ putUnsignedVarInt(collection.length);
+ for (T t : collection) {
+ writer.accept(t);
+ }
+ }
+
@SuppressWarnings("unchecked")
public T[] getArray(Class clazz, Function function) {
ArrayDeque deque = new ArrayDeque<>();
@@ -799,6 +918,13 @@ public T[] getArray(Class clazz, Function function) {
return deque.toArray((T[]) Array.newInstance(clazz, 0));
}
+ public void putArray(Collection array, BiConsumer biConsumer) {
+ this.putUnsignedVarInt(array.size());
+ for (T val : array) {
+ biConsumer.accept(this, val);
+ }
+ }
+
public boolean feof() {
return this.offset < 0 || this.offset >= this.buffer.length;
}
@@ -812,7 +938,7 @@ public CompoundTag getTag() {
try {
return NBTIO.read(is);
} finally {
- offset += is.available() - initial;
+ offset += initial - is.available();
}
}
diff --git a/src/main/java/cn/nukkit/utils/BlockColor.java b/src/main/java/cn/nukkit/utils/BlockColor.java
index ec406c8fd6c..07069597df5 100644
--- a/src/main/java/cn/nukkit/utils/BlockColor.java
+++ b/src/main/java/cn/nukkit/utils/BlockColor.java
@@ -165,6 +165,12 @@ public int getRGB() {
return (this.red << 16 | this.green << 8 | this.blue) & 0xffffff;
}
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public int getARGB() {
+ return this.alpha << 24 | this.red << 16 | this.green << 8 | this.blue;
+ }
+
@Deprecated
public static BlockColor getDyeColor(int dyeColorMeta) {
return DyeColor.getByDyeData(dyeColorMeta).getColor();
diff --git a/src/main/java/cn/nukkit/utils/BossBarColor.java b/src/main/java/cn/nukkit/utils/BossBarColor.java
new file mode 100644
index 00000000000..1e2a2b1a636
--- /dev/null
+++ b/src/main/java/cn/nukkit/utils/BossBarColor.java
@@ -0,0 +1,19 @@
+package cn.nukkit.utils;
+
+import cn.nukkit.api.Since;
+
+/**
+ * @author Kevims
+ */
+@Since("1.6.0.0-PN")
+public enum BossBarColor {
+
+ @Since("1.6.0.0-PN") PINK,
+ @Since("1.6.0.0-PN") BLUE,
+ @Since("1.6.0.0-PN") RED,
+ @Since("1.6.0.0-PN") GREEN,
+ @Since("1.6.0.0-PN") YELLOW,
+ @Since("1.6.0.0-PN") PURPLE,
+ @Since("1.6.0.0-PN") WHITE
+
+}
diff --git a/src/main/java/cn/nukkit/utils/ClientChainData.java b/src/main/java/cn/nukkit/utils/ClientChainData.java
index d43be8c1c76..bec70142d23 100644
--- a/src/main/java/cn/nukkit/utils/ClientChainData.java
+++ b/src/main/java/cn/nukkit/utils/ClientChainData.java
@@ -1,19 +1,20 @@
package cn.nukkit.utils;
+import cn.nukkit.Server;
import cn.nukkit.network.protocol.LoginPacket;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.nimbusds.jose.JOSEException;
import com.nimbusds.jose.JWSObject;
-import com.nimbusds.jose.JWSVerifier;
-import com.nimbusds.jose.crypto.factories.DefaultJWSVerifierFactory;
-import net.minidev.json.JSONObject;
+import com.nimbusds.jose.crypto.ECDSAVerifier;
+import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.security.KeyFactory;
import java.security.NoSuchAlgorithmException;
import java.security.PublicKey;
+import java.security.interfaces.ECPublicKey;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.X509EncodedKeySpec;
import java.util.*;
@@ -108,7 +109,11 @@ public String getLanguageCode() {
@Override
public String getXUID() {
- return xuid;
+ if (this.isWaterdog()) {
+ return waterdogXUID;
+ } else {
+ return xuid;
+ }
}
private boolean xboxAuthed;
@@ -136,11 +141,29 @@ public int getUIProfile() {
return UIProfile;
}
+ @Override
+ public String getWaterdogXUID() {
+ return waterdogXUID;
+ }
+
+ @Override
+ public String getWaterdogIP() {
+ return waterdogIP;
+ }
+
@Override
public JsonObject getRawData() {
return rawData;
}
+ private boolean isWaterdog() {
+ if(waterdogXUID == null | Server.getInstance() == null) {
+ return false;
+ }
+
+ return Server.getInstance().isWaterdogCapable();
+ }
+
///////////////////////////////////////////////////////////////////////////
// Override
///////////////////////////////////////////////////////////////////////////
@@ -163,9 +186,10 @@ public int hashCode() {
private UUID clientUUID;
private String xuid;
- private static PublicKey generateKey(String base64) throws NoSuchAlgorithmException, InvalidKeySpecException {
- return KeyFactory.getInstance("EC").generatePublic(new X509EncodedKeySpec(Base64.getDecoder().decode(base64)));
+ private static ECPublicKey generateKey(String base64) throws NoSuchAlgorithmException, InvalidKeySpecException {
+ return (ECPublicKey) KeyFactory.getInstance("EC").generatePublic(new X509EncodedKeySpec(Base64.getDecoder().decode(base64)));
}
+
private String identityPublicKey;
private long clientId;
@@ -178,6 +202,8 @@ private static PublicKey generateKey(String base64) throws NoSuchAlgorithmExcept
private String languageCode;
private int currentInputMode;
private int defaultInputMode;
+ private String waterdogIP;
+ private String waterdogXUID;
private int UIProfile;
@@ -213,6 +239,12 @@ private void decodeSkinData() {
if (skinToken.has("DefaultInputMode")) this.defaultInputMode = skinToken.get("DefaultInputMode").getAsInt();
if (skinToken.has("UIProfile")) this.UIProfile = skinToken.get("UIProfile").getAsInt();
if (skinToken.has("CapeData")) this.capeData = skinToken.get("CapeData").getAsString();
+ if (skinToken.has("Waterdog_IP")) this.waterdogIP = skinToken.get("Waterdog_IP").getAsString();
+ if (skinToken.has("Waterdog_XUID")) this.waterdogXUID = skinToken.get("Waterdog_XUID").getAsString();
+
+ if (this.isWaterdog()) {
+ xboxAuthed = true;
+ }
this.rawData = skinToken;
}
@@ -258,35 +290,48 @@ private void decodeChainData() {
}
private boolean verifyChain(List chains) throws Exception {
-
- PublicKey lastKey = null;
+ ECPublicKey lastKey = null;
boolean mojangKeyVerified = false;
- for (String chain: chains) {
- JWSObject jws = JWSObject.parse(chain);
+ Iterator iterator = chains.iterator();
+ while (iterator.hasNext()) {
+ JWSObject jws = JWSObject.parse(iterator.next());
+
+ URI x5u = jws.getHeader().getX509CertURL();
+ if (x5u == null) {
+ return false;
+ }
+
+ ECPublicKey expectedKey = generateKey(x5u.toString());
+ // First key is self-signed
+ if (lastKey == null) {
+ lastKey = expectedKey;
+ } else if (!lastKey.equals(expectedKey)) {
+ return false;
+ }
+
+ if (!verify(lastKey, jws)) {
+ return false;
+ }
- if (!mojangKeyVerified) {
- // First chain should be signed using Mojang's private key. We'd be in big trouble if it leaked...
- mojangKeyVerified = verify(MOJANG_PUBLIC_KEY, jws);
+ if (mojangKeyVerified) {
+ return !iterator.hasNext();
}
- if (lastKey != null) {
- if (!verify(lastKey, jws)) {
- throw new JOSEException("Unable to verify key in chain.");
- }
+ if (lastKey.equals(MOJANG_PUBLIC_KEY)) {
+ mojangKeyVerified = true;
}
- JSONObject payload = jws.getPayload().toJSONObject();
- String base64key = payload.getAsString("identityPublicKey");
- if (base64key == null) {
+ Map payload = jws.getPayload().toJSONObject();
+ Object base64key = payload.get("identityPublicKey");
+ if (!(base64key instanceof String)) {
throw new RuntimeException("No key found");
}
- lastKey = generateKey(base64key);
+ lastKey = generateKey((String) base64key);
}
return mojangKeyVerified;
}
- private boolean verify(PublicKey key, JWSObject object) throws JOSEException {
- JWSVerifier verifier = new DefaultJWSVerifierFactory().createJWSVerifier(object.getHeader(), key);
- return object.verify(verifier);
+ private boolean verify(ECPublicKey key, JWSObject object) throws JOSEException {
+ return object.verify(new ECDSAVerifier(key));
}
}
diff --git a/src/main/java/cn/nukkit/utils/Config.java b/src/main/java/cn/nukkit/utils/Config.java
index 166d06b8bd5..5f767943980 100644
--- a/src/main/java/cn/nukkit/utils/Config.java
+++ b/src/main/java/cn/nukkit/utils/Config.java
@@ -1,6 +1,8 @@
package cn.nukkit.utils;
import cn.nukkit.Server;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.scheduler.FileWriteTask;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -9,6 +11,8 @@
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -184,6 +188,23 @@ public boolean load(InputStream inputStream) {
return correct;
}
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public boolean loadAsJson(@Nullable InputStream inputStream, @Nonnull Gson gson) {
+ if (inputStream == null) return false;
+ if (this.correct) {
+ String content;
+ try {
+ content = Utils.readFile(inputStream);
+ } catch (IOException e) {
+ log.error("An error occurred while loading a config from an input stream, input: {}", inputStream, e);
+ return false;
+ }
+ this.parseContentAsJson(content, gson);
+ }
+ return correct;
+ }
+
public boolean check() {
return this.correct;
}
@@ -209,10 +230,27 @@ public boolean save(File file) {
return save();
}
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public boolean saveAsJson(@Nonnull File file, boolean async, @Nonnull Gson gson) {
+ this.file = file;
+ return saveAsJson(async, gson);
+ }
+
public boolean save() {
return this.save(false);
}
+ @PowerNukkitOnly
+ @Since("1.5.2.0-PN")
+ public boolean saveAsJson(boolean async, @Nonnull Gson gson) {
+ if (!this.correct) {
+ return false;
+ }
+ save0(async, new StringBuilder(gson.toJson(this.config)).append('\n'));
+ return true;
+ }
+
public boolean save(Boolean async) {
if (this.file == null) throw new IllegalStateException("Failed to save Config. File object is undefined.");
if (this.correct) {
@@ -237,22 +275,25 @@ public boolean save(Boolean async) {
}
break;
}
- if (async) {
- Server.getInstance().getScheduler().scheduleAsyncTask(new FileWriteTask(this.file, content.toString()));
-
- } else {
- try {
- Utils.writeFile(this.file, content.toString());
- } catch (IOException e) {
- log.error("Failed to save the config file {}", file, e);
- }
- }
+ save0(async, content);
return true;
} else {
return false;
}
}
+ private void save0(boolean async, StringBuilder content) {
+ if (async) {
+ Server.getInstance().getScheduler().scheduleAsyncTask(new FileWriteTask(this.file, content.toString()));
+ } else {
+ try {
+ Utils.writeFile(this.file, content.toString());
+ } catch (IOException e) {
+ log.error("Failed to save the config file {}", file, e);
+ }
+ }
+ }
+
public void set(final String key, Object value) {
this.config.set(key, value);
}
@@ -535,6 +576,16 @@ public void removeNested(String key) {
remove(key);
}
+ private void parseContentAsJson(String content, Gson gson) {
+ try {
+ this.config = new ConfigSection(gson.fromJson(content, new TypeToken>() {
+ }.getType()));
+ } catch (Exception e) {
+ log.warn("Failed to parse the config file {}", file, e);
+ throw e;
+ }
+ }
+
private void parseContent(String content) {
try {
switch (this.type) {
diff --git a/src/main/java/cn/nukkit/utils/DummyBossBar.java b/src/main/java/cn/nukkit/utils/DummyBossBar.java
index 2b9b2c27faf..10a4a5da1ce 100644
--- a/src/main/java/cn/nukkit/utils/DummyBossBar.java
+++ b/src/main/java/cn/nukkit/utils/DummyBossBar.java
@@ -1,12 +1,14 @@
package cn.nukkit.utils;
import cn.nukkit.Player;
+import cn.nukkit.api.Since;
import cn.nukkit.entity.Attribute;
import cn.nukkit.entity.Entity;
import cn.nukkit.entity.data.EntityMetadata;
import cn.nukkit.entity.mob.EntityCreeper;
import cn.nukkit.network.protocol.*;
+import javax.annotation.Nullable;
import java.util.concurrent.ThreadLocalRandom;
/**
@@ -19,7 +21,7 @@ public class DummyBossBar {
private String text;
private float length;
- private BlockColor color;
+ private BossBarColor color;
private DummyBossBar(Builder builder) {
this.player = builder.player;
@@ -35,7 +37,7 @@ public static class Builder {
private String text = "";
private float length = 100;
- private BlockColor color = null;
+ private BossBarColor color = null;
public Builder(Player player) {
this.player = player;
@@ -52,15 +54,12 @@ public Builder length(float length) {
return this;
}
- public Builder color(BlockColor color) {
+ @Since("1.6.0.0-PN")
+ public Builder color(BossBarColor color) {
this.color = color;
return this;
}
- public Builder color(int red, int green, int blue) {
- return color(new BlockColor(red, green, blue));
- }
-
public DummyBossBar build() {
return new DummyBossBar(this);
}
@@ -98,26 +97,18 @@ public void setLength(float length) {
}
}
- /**
- * Color is not working in the current version. We are keep waiting for client support.
- * @param color the boss bar color
- */
- public void setColor(BlockColor color) {
- if (this.color == null || !this.color.equals(color)) {
+ @Since("1.6.0.0-PN")
+ public void setColor(@Nullable BossBarColor color) {
+ final BossBarColor currentColor = this.color;
+ if (currentColor == null || !currentColor.equals(color)) {
this.color = color;
this.sendSetBossBarTexture();
}
}
- public void setColor(int red, int green, int blue) {
- this.setColor(new BlockColor(red, green, blue));
- }
-
- public int getMixedColor() {
- return this.color.getRGB();//(this.color.getRed() << 16 | this.color.getGreen() << 8 | this.color.getBlue()) & 0xffffff;
- }
-
- public BlockColor getColor() {
+ @Since("1.6.0.0-PN")
+ @Nullable
+ public BossBarColor getColor() {
return this.color;
}
@@ -174,7 +165,7 @@ private void sendSetBossBarTexture() {
BossEventPacket pk = new BossEventPacket();
pk.bossEid = this.bossBarId;
pk.type = BossEventPacket.TYPE_TEXTURE;
- pk.color = this.getMixedColor();
+ pk.color = color != null? color.ordinal() : 0;
player.dataPacket(pk);
}
diff --git a/src/main/java/cn/nukkit/utils/DyeColor.java b/src/main/java/cn/nukkit/utils/DyeColor.java
index 51cef26c47f..a36bc75f767 100644
--- a/src/main/java/cn/nukkit/utils/DyeColor.java
+++ b/src/main/java/cn/nukkit/utils/DyeColor.java
@@ -10,9 +10,9 @@
public enum DyeColor {
- BLACK(0, 15, 16, "Black", "Ink Sack", BlockColor.BLACK_BLOCK_COLOR, new BlockColor(0x1D1D21)),
- RED(1, 14, 1, "Red", "Rose Red", BlockColor.RED_BLOCK_COLOR, new BlockColor(0xB02E26)),
- GREEN(2, 13, 2, "Green", "Cactus Green", BlockColor.GREEN_BLOCK_COLOR, new BlockColor(0x5E7C16)),
+ BLACK(0, 15, 16, "Black", "Ink Sac", BlockColor.BLACK_BLOCK_COLOR, new BlockColor(0x1D1D21)),
+ RED(1, 14, 1, "Red", "Red Dye", BlockColor.RED_BLOCK_COLOR, new BlockColor(0xB02E26)),
+ GREEN(2, 13, 2, "Green", "Green Dye", BlockColor.GREEN_BLOCK_COLOR, new BlockColor(0x5E7C16)),
BROWN(3, 12, 17, "Brown", "Cocoa Beans", BlockColor.BROWN_BLOCK_COLOR, new BlockColor(0x835432)),
BLUE(4, 11, 18, "Blue", "Lapis Lazuli", BlockColor.BLUE_BLOCK_COLOR, new BlockColor(0x3C44AA)),
PURPLE(5, 10, 5, "Purple", BlockColor.PURPLE_BLOCK_COLOR, new BlockColor(0x8932B8)),
@@ -21,7 +21,7 @@ public enum DyeColor {
GRAY(8, 7, 8, "Gray", BlockColor.GRAY_BLOCK_COLOR, new BlockColor(0x474F52)),
PINK(9, 6, 9, "Pink", BlockColor.PINK_BLOCK_COLOR, new BlockColor(0xF38BAA)),
LIME(10, 5, 10, "Lime", BlockColor.LIME_BLOCK_COLOR, new BlockColor(0x80C71F)),
- YELLOW(11, 4, 11, "Yellow", "Dandelion Yellow", BlockColor.YELLOW_BLOCK_COLOR, new BlockColor(0xFED83D)),
+ YELLOW(11, 4, 11, "Yellow", "Yellow Dye", BlockColor.YELLOW_BLOCK_COLOR, new BlockColor(0xFED83D)),
LIGHT_BLUE(12, 3, 12, "Light Blue", BlockColor.LIGHT_BLUE_BLOCK_COLOR, new BlockColor(0x3AB3DA)),
MAGENTA(13, 2, 13, "Magenta", BlockColor.MAGENTA_BLOCK_COLOR, new BlockColor(0xC74EBD)),
ORANGE(14, 1, 14, "Orange", BlockColor.ORANGE_BLOCK_COLOR, new BlockColor(0xFF9801)),
diff --git a/src/main/java/cn/nukkit/utils/Hash.java b/src/main/java/cn/nukkit/utils/Hash.java
index e7d43dc4c25..897d028a680 100644
--- a/src/main/java/cn/nukkit/utils/Hash.java
+++ b/src/main/java/cn/nukkit/utils/Hash.java
@@ -1,5 +1,7 @@
package cn.nukkit.utils;
+import cn.nukkit.api.PowerNukkitOnly;
+import cn.nukkit.api.Since;
import cn.nukkit.math.Vector3;
public class Hash {
@@ -20,9 +22,8 @@ public static final int hashBlockZ(long triple) {
return (int) ((((triple >> 34) & 0x3FFFFFF) << 38) >> 38);
}
- /**
- * @since 1.2.1.0-PN
- */
+ @PowerNukkitOnly
+ @Since("1.2.1.0-PN")
public static long hashBlock(Vector3 blockPos) {
return hashBlock(blockPos.getFloorX(), blockPos.getFloorY(), blockPos.getFloorZ());
}
diff --git a/src/main/java/cn/nukkit/utils/HumanStringComparator.java b/src/main/java/cn/nukkit/utils/HumanStringComparator.java
index e24ec736f35..4a6a1bcbbcb 100644
--- a/src/main/java/cn/nukkit/utils/HumanStringComparator.java
+++ b/src/main/java/cn/nukkit/utils/HumanStringComparator.java
@@ -2,35 +2,224 @@
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
+import lombok.NoArgsConstructor;
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.Comparator;
+import java.util.List;
@PowerNukkitOnly
@Since("1.4.0.0-PN")
+@NoArgsConstructor(onConstructor = @__(@PowerNukkitOnly))
public class HumanStringComparator implements Comparator {
private static final HumanStringComparator INSTANCE = new HumanStringComparator();
+ private static final int LEFT = -1;
+ private static final int RIGHT = 1;
+ private static final int EQUALS = 0;
+ private static final String SYMBOLS = "[:.;,/\\]{}|=";
@Override
public int compare(String o1, String o2) {
+ if (o1.equals(o2)) {
+ return EQUALS;
+ }
+
+ List l1 = splitSymbols(combineNegativeSign(split(o1)));
+ List l2 = splitSymbols(combineNegativeSign(split(o2)));
+
+ return compare(l1, l2);
+ }
+
+ private List splitSymbols(List list) {
+ boolean changed = false;
+ List result = list;
+ int size = list.size();
+ for (int i = size - 1; i >= 0; i--) {
+ String str = result.get(i);
+ int length = str.length();
+ int lastPart = length;
+ for (int j = length - 1; j >= 0; j--) {
+ char c = str.charAt(j);
+ if (SYMBOLS.indexOf(c) != -1) {
+ if (!changed) {
+ result = list instanceof ArrayList? list : new ArrayList<>(list);
+ changed = true;
+ }
+ int indexToAddLast;
+ if (j > 0) {
+ result.set(i, str.substring(0, j));
+ result.add(i + 1, Character.toString(c));
+ indexToAddLast = i + 2;
+ } else {
+ result.set(i, Character.toString(c));
+ indexToAddLast = i + 1;
+ }
+ if (j + 2 <= length) {
+ result.add(indexToAddLast, str.substring(j + 1, lastPart));
+ }
+ lastPart = j;
+ }
+ }
+ }
+ return result;
+ }
+
+ private int compare(List l1, List l2) {
+ int len1 = l1.size();
+ int len2 = l2.size();
+ int minLen = Math.min(len1, len2);
+ for (int i = 0; i < minLen; i++) {
+ String str1 = l1.get(i);
+ String str2 = l2.get(i);
+ int strLen1 = str1.length();
+ int strLen2 = str2.length();
+ assert strLen1 > 0;
+ assert strLen2 > 0;
+ boolean isNum1 = Character.isDigit(str1.charAt(strLen1 - 1));
+ boolean isNum2 = Character.isDigit(str2.charAt(strLen2 - 1));
+ if (isNum1) {
+ if (isNum2) {
+ int i1 = Integer.parseInt(str1);
+ int i2 = Integer.parseInt(str2);
+ int result = Integer.compare(i1, i2);
+ if (result != EQUALS) {
+ return result;
+ }
+ // Number with higher 0 padding goes before
+ result = Integer.compare(strLen1, strLen2);
+ if (result != EQUALS) {
+ return result;
+ }
+ } else {
+ return RIGHT;
+ }
+ } else if (isNum2) {
+ return LEFT;
+ } else {
+ if (strLen1 == strLen2) {
+ int result = str1.compareTo(str2);
+ if (result != EQUALS) {
+ return result;
+ }
+ } else {
+ int minStrLen = Math.min(strLen1, strLen2);
+ String commonPart1 = str1.substring(0, minStrLen);
+ String commonPart2 = str2.substring(0, minStrLen);
+ int result = commonPart1.compareTo(commonPart2);
+ if (result != EQUALS) {
+ return result;
+ }
+
+ // Detect omitted number
+ if (strLen1 < strLen2) {
+ if (detectOmittedNumber(l1, len1, i, str2, strLen2, minStrLen, commonPart1)) {
+ return RIGHT;
+ }
+ } else if (detectOmittedNumber(l2, len2, i, str1, strLen1, minStrLen, commonPart2)) {
+ return LEFT;
+ }
+
+ return Integer.compare(strLen1, strLen2);
+ }
+ }
+ }
- String o1StringPart = o1.replaceAll("\\d", "");
- String o2StringPart = o2.replaceAll("\\d", "");
+ return Integer.compare(len1, len2);
+ }
+
+ private boolean detectOmittedNumber(List l1, int len1, int i, String str2, int strLen2, int minStrLen, String commonPart1) {
+ String combined;
+ String comparingWith;
+ String next1 = len1 > i + 1? l1.get(i + 1) : null;
+ int nextLen1 = next1 == null? 0 : next1.length();
+ boolean isDigit1 = next1 != null && Character.isDigit(next1.charAt(nextLen1 - 1));
+ String afterNext1 = isDigit1 && len1 > i + 2? l1.get(i + 2) : null;
+ int afterNextLen1 = afterNext1 != null? afterNext1.length() : 0;
+ if (afterNextLen1 > 0) {
+ combined = commonPart1 + afterNext1.substring(0, Math.min(afterNextLen1, strLen2 - minStrLen));
+ comparingWith = str2;
+ return combined.equals(comparingWith);
+ }
+ return false;
+ }
+ private List
](https://powernukkit.org)
[](LICENSE)
-[](https://github.com/PowerNukkit/PowerNukkit/actions?query=branch%3Amaster)
+[](https://builds.powernukkit.org/buildConfiguration/PowerNukkit_Releases#all-projects)
+[/statusIcon)](https://builds.powernukkit.org/buildConfiguration/PowerNukkit_Snapshots)
+[](https://sonarcloud.io/dashboard?id=PowerNukkit_PowerNukkit)
[](https://powernukkit.org/discord)
Introduction
@@ -26,12 +28,17 @@ Most Cloudburst Nukkit plugins are supported but they may not understand the new
Links
--------------------
-* __[PowerNukkit Website](https://powernukkit.org/)__
-* __[PowerNukkit Forum and Guides](https://discuss.powernukkit.org/)__
-* __[Download PowerNukkit Releases](https://powernukkit.org/releases)__
-* __[Download PowerNukkit Snapshots](https://powernukkit.org/snapshots)__
-* __[PowerNukkit Discord](https://powernukkit.org/discord)__
-* __[Cloudburst Nukkit Plugins](https://cloudburstmc.org/resources/categories/nukkit-plugins.1/)__
+- __[🌐 PowerNukkit Website](https://powernukkit.org/)__
+- __[👩🏽💻 PowerNukkit Website for Plugin Developers](https://devs.powernukkit.org/)__
+- __[💬 PowerNukkit Forum and Guides](https://discuss.powernukkit.org/)__
+- __[💬 PowerNukkit Discord](https://powernukkit.org/discord)__
+- __[💾 Download PowerNukkit Recommended Build](https://powernukkit.org/#download)__
+- __[💾 Download PowerNukkit Releases](https://powernukkit.org/#stable)__
+- __[💾 Download PowerNukkit Snapshots](https://powernukkit.org/#snapshot)__
+- __[🥚 Download PowerNukkit Pterodactyl Eggs](https://powernukkit.org/#pterodactyl)__
+- __[🔌 Download PowerNukkit Plugins](https://plugins.powernukkit.org)__
+- __[🔌 Download Cloudburst Nukkit Plugins](https://cloudburstmc.org/resources/categories/nukkit-plugins.1/)__
+- __[🧩 PowerNukkit Plugin Requests](https://discuss.powernukkit.org/c/plugins/plugin-requests/13)__
Creating Plugins
----------------
@@ -44,7 +51,7 @@ repositories {
}
dependencies {
- compile group: 'org.powernukkit', name: 'powernukkit', version: '1.5.0.0-PN'
+ compile group: 'org.powernukkit', name: 'powernukkit', version: '1.6.0.1-PN'
}
```
@@ -54,7 +61,7 @@ dependencies {