1.21.30

src/main/java/cn/nukkit/command/defaults/EffectCommand.java

@@ -71,12 +71,11 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
         try {
             effect = Effect.getEffect(Integer.parseInt(args[1]));
         } catch (NumberFormatException | ServerException a) {
-            try {
-                effect = Effect.getEffectByName(args[1]);
-            } catch (Exception e) {
-                sender.sendMessage(new TranslationContainer("commands.effect.notFound", args[1]));
-                return true;
-            }
+            effect = Effect.getEffectByName(args[1]);
+        }
+        if (effect == null) {
+            sender.sendMessage(new TranslationContainer("commands.effect.notFound", args[1]));
+            return true;
         }
         int duration = 300;
         int amplification = 0;

src/main/java/cn/nukkit/entity/Entity.java

@@ -1090,7 +1090,7 @@ protected DataPacket createAddEntityPacket() {
 
         addEntity.links = new EntityLink[this.passengers.size()];
         for (int i = 0; i < addEntity.links.length; i++) {
-            addEntity.links[i] = new EntityLink(this.getId(), this.passengers.get(i).getId(), i == 0 ? EntityLink.TYPE_RIDER : TYPE_PASSENGER, false, false);
+            addEntity.links[i] = new EntityLink(this.getId(), this.passengers.get(i).getId(), i == 0 ? EntityLink.TYPE_RIDER : TYPE_PASSENGER, false, false, 0f);
         }
 
         return addEntity;

src/main/java/cn/nukkit/network/Network.java

@@ -47,7 +47,7 @@ public class Network {
     public static final byte CHANNEL_TEXT = 7; //Chat and other text stuff
     public static final byte CHANNEL_END = 31;
 
-    private Class<? extends DataPacket>[] packetPool = new Class[512];
+    private Class<? extends DataPacket>[] packetPool = new Class[256];
 
     private final Server server;
 
@@ -245,8 +245,8 @@ public void processBatch(byte[] payload, Collection<DataPacket> packets, Compres
                 // |   2 bits  |   2 bits  |  10 bits  |
                 int packetId = header & 0x3ff;
 
-                DataPacket pk = this.getPacket(packetId);
-
+                // Use internal backwards compatible IDs until pid() is rewritten
+                DataPacket pk = this.getPacket(packetId >= 300 ? packetId - 100 : packetId);
                 if (pk != null) {
                     pk.setBuffer(buf, buf.length - bais.available());
                     try {
@@ -261,7 +261,7 @@ public void processBatch(byte[] payload, Collection<DataPacket> packets, Compres
 
                     packets.add(pk);
                 } else {
-                    log.debug("Received unknown packet with ID: {}", Integer.toHexString(packetId));
+                    log.debug("Received unknown packet with vanilla ID 0x{}", Integer.toHexString(packetId));
                 }
             }
         } catch (Exception e) {
@@ -308,7 +308,7 @@ public void unblockAddress(InetAddress address) {
     }
 
     private void registerPackets() {
-        this.packetPool = new Class[512];
+        this.packetPool = new Class[256];
 
         this.registerPacket(ProtocolInfo.ADD_ENTITY_PACKET, AddEntityPacket.class);
         this.registerPacket(ProtocolInfo.ADD_ITEM_ENTITY_PACKET, AddItemEntityPacket.class);

src/main/java/cn/nukkit/network/protocol/AddEntityPacket.java

@@ -139,6 +139,12 @@ public class AddEntityPacket extends DataPacket {
             .put(EntityTadpole.NETWORK_ID, "minecraft:tadpole")
             .put(EntityAllay.NETWORK_ID, "minecraft:allay")
             .put(138, "minecraft:camel")
+            .put(139, "minecraft:sniffer")
+            .put(140, "minecraft:breeze")
+            .put(141, "minecraft:breeze_wind_charge_projectile")
+            .put(142, "minecraft:armadillo")
+            .put(143, "minecraft:wind_charge_projectile")
+            .put(144, "minecraft:bogged")
             .build();
 
     @Override

src/main/java/cn/nukkit/network/protocol/EmotePacket.java

@@ -10,6 +10,7 @@ public class EmotePacket extends DataPacket {
     public String platformId;
     public String emoteID;
     public byte flags;
+    public long emoteTicks;
 
     @Override
     public byte pid() {
@@ -20,6 +21,7 @@ public byte pid() {
     public void decode() {
         this.runtimeId = this.getEntityRuntimeId();
         this.emoteID = this.getString();
+        this.emoteTicks = this.getUnsignedVarInt();
         this.xuid = this.getString();
         this.platformId = this.getString();
         this.flags = (byte) this.getByte();
@@ -30,6 +32,7 @@ public void encode() {
         this.reset();
         this.putEntityRuntimeId(this.runtimeId);
         this.putString(this.emoteID);
+        this.putUnsignedVarInt(this.emoteTicks);
         this.putString(this.xuid);
         this.putString(this.platformId);
         this.putByte(flags);

src/main/java/cn/nukkit/network/protocol/InventoryContentPacket.java

@@ -25,7 +25,6 @@ public byte pid() {
 
     public int inventoryId;
     public Item[] slots = new Item[0];
-    public int dynamicContainerId;
 
     @Override
     public DataPacket clean() {
@@ -46,7 +45,9 @@ public void encode() {
         for (Item slot : this.slots) {
             this.putSlot(slot);
         }
-        this.putUnsignedVarInt(this.dynamicContainerId);
+        this.putByte((byte) 0); // fullContainerName.id
+        this.putBoolean(false); // fullContainerName.optional.present
+        this.putUnsignedVarInt(0); // dynamicContainerSize
     }
 
     @Override

src/main/java/cn/nukkit/network/protocol/InventorySlotPacket.java

@@ -20,7 +20,6 @@ public byte pid() {
     public int inventoryId;
     public int slot;
     public Item item;
-    public int dynamicContainerId;
 
     @Override
     public void decode() {
@@ -31,7 +30,9 @@ public void encode() {
         this.reset();
         this.putUnsignedVarInt(this.inventoryId);
         this.putUnsignedVarInt(this.slot);
-        this.putUnsignedVarInt(this.dynamicContainerId);
+        this.putByte((byte) 0); // fullContainerName.id
+        this.putBoolean(false); // fullContainerName.optional.present
+        this.putUnsignedVarInt(0); // dynamicContainerSize
         this.putSlot(this.item);
     }
 }

src/main/java/cn/nukkit/network/protocol/ProtocolInfo.java

@@ -14,11 +14,11 @@ public interface ProtocolInfo {
      * Actual Minecraft: PE protocol version
      */
     @SuppressWarnings("UnnecessaryBoxing")
-    int CURRENT_PROTOCOL = Integer.valueOf("712"); // DO NOT REMOVE BOXING
+    int CURRENT_PROTOCOL = Integer.valueOf("729"); // DO NOT REMOVE BOXING
 
     List<Integer> SUPPORTED_PROTOCOLS = Ints.asList(CURRENT_PROTOCOL);
 
-    String MINECRAFT_VERSION_NETWORK = "1.21.20";
+    String MINECRAFT_VERSION_NETWORK = "1.21.30";
     String MINECRAFT_VERSION = 'v' + MINECRAFT_VERSION_NETWORK;
 
     byte BATCH_PACKET = (byte) 0xff;
@@ -235,4 +235,6 @@ public interface ProtocolInfo {
     byte __INTERNAL__JIGSAW_STRUCTURE_DATA_PACKET = (byte) 213;
     byte __INTERNAL__CURRENT_STRUCTURE_FEATURE_PACKET = (byte) 214;
     byte __INTERNAL__SERVERBOUND_DIAGNOSTICS_PACKET = (byte) 215;
+    byte __INTERNAL__CAMERA_AIM_ASSIST_PACKET = (byte) 216;
+    byte __INTERNAL__CONTAINER_REGISTRY_CLEANUP_PACKET = (byte) 217;
 }

src/main/java/cn/nukkit/network/protocol/ResourcePackStackPacket.java

@@ -9,8 +9,8 @@ public class ResourcePackStackPacket extends DataPacket {
     public static final byte NETWORK_ID = ProtocolInfo.RESOURCE_PACK_STACK_PACKET;
 
     public boolean mustAccept = false;
-    public ResourcePack[] behaviourPackStack = new ResourcePack[0];
-    public ResourcePack[] resourcePackStack = new ResourcePack[0];
+    public ResourcePack[] behaviourPackStack = ResourcePack.EMPTY_ARRAY;
+    public ResourcePack[] resourcePackStack = ResourcePack.EMPTY_ARRAY;
     public boolean isExperimental = false;
     public String gameVersion = ProtocolInfo.MINECRAFT_VERSION_NETWORK;
 

src/main/java/cn/nukkit/network/protocol/ResourcePacksInfoPacket.java

@@ -14,10 +14,11 @@ public class ResourcePacksInfoPacket extends DataPacket {
 
     public boolean mustAccept;
     public boolean scripting;
-    public boolean forceServerPacks;
+    @Deprecated
+    public boolean forceServerPacks; // pre 1.21.30
     public boolean hasAddonPacks;
-    public ResourcePack[] behaviourPackEntries = new ResourcePack[0];
-    public ResourcePack[] resourcePackEntries = new ResourcePack[0];
+    public ResourcePack[] behaviourPackEntries = ResourcePack.EMPTY_ARRAY;
+    public ResourcePack[] resourcePackEntries = ResourcePack.EMPTY_ARRAY;
     public List<CDNEntry> CDNEntries = new ObjectArrayList<>();
 
     @Override
@@ -31,8 +32,7 @@ public void encode() {
         this.putBoolean(this.mustAccept);
         this.putBoolean(this.hasAddonPacks);
         this.putBoolean(this.scripting);
-        this.putBoolean(this.forceServerPacks);
-        this.encodeBehaviourPacks(this.behaviourPackEntries);
+
         this.encodeResourcePacks(this.resourcePackEntries);
 
         this.putUnsignedVarInt(this.CDNEntries.size());
@@ -42,19 +42,6 @@ public void encode() {
         });
     }
 
-    private void encodeBehaviourPacks(ResourcePack[] packs) {
-        this.putLShort(packs.length);
-        for (ResourcePack entry : packs) {
-            this.putString(entry.getPackId().toString());
-            this.putString(entry.getPackVersion());
-            this.putLLong(entry.getPackSize());
-            this.putString(entry.getEncryptionKey());
-            this.putString(""); // sub-pack name
-            this.putString(!entry.getEncryptionKey().isEmpty() ? entry.getPackId().toString() : "");
-            this.putBoolean(false); // scripting
-        }
-    }
-
     private void encodeResourcePacks(ResourcePack[] packs) {
         this.putLShort(packs.length);
         for (ResourcePack entry : packs) {

src/main/java/cn/nukkit/network/protocol/TransferPacket.java

@@ -20,6 +20,7 @@ public void encode() {
         this.reset();
         this.putString(address);
         this.putLShort(port);
+        this.putBoolean(false); // reloadWorld
     }
 
     @Override

src/main/java/cn/nukkit/network/protocol/UpdateAttributesPacket.java

@@ -37,6 +37,8 @@ public void encode() {
                 this.putLFloat(entry.getMinValue());
                 this.putLFloat(entry.getMaxValue());
                 this.putLFloat(entry.getValue());
+                this.putLFloat(entry.getMinValue()); // defaultMinValue
+                this.putLFloat(entry.getMaxValue()); // defaultMaxValue
                 this.putLFloat(entry.getDefaultValue());
                 this.putString(entry.getName());
                 this.putUnsignedVarInt(0); // Modifiers

src/main/java/cn/nukkit/network/protocol/types/AuthInputAction.java

@@ -85,7 +85,23 @@ public enum AuthInputAction {
     /**
      * @since v685
      */
-    BLOCK_BREAKING_DELAY_ENABLED;
+    BLOCK_BREAKING_DELAY_ENABLED,
+    /**
+     * @since v729
+     */
+    HORIZONTAL_COLLISION,
+    /**
+     * @since v729
+     */
+    VERTICAL_COLLISION,
+    /**
+     * @since v729
+     */
+    DOWN_LEFT,
+    /**
+     * @since v729
+     */
+    DOWN_RIGHT;
 
     private static final AuthInputAction[] VALUES = values();
 

src/main/java/cn/nukkit/network/protocol/types/EntityLink.java

@@ -13,6 +13,7 @@ public class EntityLink {
     public boolean riderInitiated;
     public float vehicleAngularVelocity;
 
+    @Deprecated
     public EntityLink(long fromEntityUniquieId, long toEntityUniquieId, byte type, boolean immediate, boolean riderInitiated) {
         this(fromEntityUniquieId, toEntityUniquieId, type, immediate, riderInitiated, 0f);
     }