Updates (#2253)

- Added more blocks and items from 1.21 and below
- Added bottle fill dispenser behavior
- Added debug shapes
- Added zombie/skeleton held items API
- Added new records & custom records compatibility
- Added some debug messages
- Added breeze drops
- Added pointed dripstone custom fall damage
- Fixed boats on 1.21.130
- Fixed player eating splash potions
- Fixed snow layer silk touch and creative pickup
- Fixed some deepslate and copper blocks blast resistance
- Fixed flower placement on mud
- Fixed typo in smooth red sandstone stairs name
- Fixed spiders invisibility
- Fixed async code during plugin load possibly causing issues with class loader
- Patched resource pack traffic amplification
- Increased config writer buffer size
- Optimized chunk section light compression
- Updated recipes, now loading vanilla format
- Updated log4j to latest

Author: PetteriM1

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 junit = "5.9.2"
-log4j = "2.25.2"
+log4j = "2.25.3"
 jline = "3.30.6"
 fastutilmaps = "8.5.15-SNAPSHOT"
 

src/main/java/cn/nukkit/Player.java

@@ -71,7 +71,6 @@
 import com.google.common.base.Strings;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-import io.netty.util.internal.PlatformDependent;
 import it.unimi.dsi.fastutil.bytes.ByteOpenHashSet;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
@@ -171,7 +170,7 @@ public class Player extends EntityHuman implements CommandSender, InventoryHolde
     protected Vector3 newPosition;
     protected Vector3 sleeping;
     private BlockVector3 lastRightClickPos;
-    private final Queue<Vector3> clientMovements = PlatformDependent.newMpscQueue(4);
+    private Queue<Vector3> clientMovements = new ArrayDeque<>();
 
     protected boolean connected = true;
     protected final InetSocketAddress socketAddress;
@@ -254,6 +253,10 @@ public class Player extends EntityHuman implements CommandSender, InventoryHolde
     protected Map<Integer, FormWindow> serverSettings = new Int2ObjectOpenHashMap<>();
 
     protected Map<Long, DummyBossBar> dummyBossBars = new Long2ObjectLinkedOpenHashMap<>();
+    /**
+     * Requested resource pack chunks
+     */
+    private Map<UUID, IntOpenHashSet> resourceChunksRequested = new HashMap<>();
 
     private AsyncTask preLoginEventTask;
     protected boolean shouldLogin;
@@ -872,7 +875,9 @@ public String getDisplayName() {
     public void setDisplayName(String displayName) {
         if (displayName == null) {
             displayName = "";
-            server.getLogger().debug("Warning: setDisplayName: argument is null", new Throwable(""));
+            if (Nukkit.DEBUG > 1) {
+                server.getLogger().debug("Warning: setDisplayName: argument is null", new Throwable(""));
+            }
         }
         this.displayName = displayName;
         updatePlayerListData(true);
@@ -995,7 +1000,9 @@ public String getButtonText() {
     public void setButtonText(String text) {
         if (text == null) {
             text = "";
-            server.getLogger().debug("Warning: setButtonText: argument is null", new Throwable(""));
+            if (Nukkit.DEBUG > 1) {
+                server.getLogger().debug("Warning: setButtonText: argument is null", new Throwable(""));
+            }
         }
         if (!text.equals(buttonText)) {
             this.buttonText = text;
@@ -2419,9 +2426,29 @@ public boolean onUpdate(int currentTick) {
                     Math.cos(Math.toRadians(this.yaw)) * Math.cos(Math.toRadians(this.pitch)) * multiplier));
         }
 
-        if (this.age % 5 == 0 && this.isBreakingBlock() && !this.isCreative()) {
-            //this.level.addLevelSoundEvent(this.breakingBlock, LevelSoundEventPacket.SOUND_HIT, blockRuntimeId);
-            this.level.addParticle(new PunchBlockParticle(this.breakingBlock, this.breakingBlock, this.breakingBlockFace));
+        if (this.age % 5 == 0) {
+            if (this.isBreakingBlock() && !this.isCreative()) {
+                /*if (this.protocol >= ProtocolInfo.v1_20_0_23) {
+                    this.level.addLevelSoundEvent(this.breakingBlock, LevelSoundEventPacket.SOUND_HIT, blockRuntimeId);
+                }*/
+                this.level.addParticle(new PunchBlockParticle(this.breakingBlock, this.breakingBlock, this.breakingBlockFace));
+            }
+
+            if (this.isUsingItem()) {
+                Item food = this.getInventory().getItemInHandFast();
+
+                if (food instanceof ItemEdible) {
+                    EntityEventPacket pk = new EntityEventPacket();
+                    pk.eid = this.id;
+                    pk.event = EntityEventPacket.EATING_ITEM;
+                    pk.data = food.getNetworkId() << 16;
+                    this.dataPacket(pk);
+
+                    for (Player p : this.getViewers().values()) {
+                        p.dataPacket(pk);
+                    }
+                }
+            }
         }
 
         this.checkTeleportPosition();
@@ -3089,12 +3116,21 @@ public void onCompletion(Server server) {
                 ResourcePackClientResponsePacket responsePacket = (ResourcePackClientResponsePacket) packet;
                 switch (responsePacket.responseStatus) {
                     case ResourcePackClientResponsePacket.STATUS_REFUSED:
+                        server.getLogger().debug(username + ": got ResourcePackClientResponse STATUS_REFUSED");
                         this.close("", "disconnectionScreen.noReason");
                         return;
                     case ResourcePackClientResponsePacket.STATUS_SEND_PACKS:
+                        Set<UUID> sent = new HashSet<>();
                         for (ResourcePackClientResponsePacket.Entry entry : responsePacket.packEntries) {
                             ResourcePack resourcePack = this.server.getResourcePackManager().getPackById(entry.uuid);
                             if (resourcePack == null) {
+                                server.getLogger().debug(username + ": resource pack not found with uuid " + entry.uuid);
+                                this.close("", "disconnectionScreen.resourcePack");
+                                return;
+                            }
+
+                            if (!sent.add(entry.uuid)) {
+                                server.getLogger().debug(username + ": duplicate resource pack found with uuid " + entry.uuid);
                                 this.close("", "disconnectionScreen.resourcePack");
                                 return;
                             }
@@ -3127,6 +3163,13 @@ public void onCompletion(Server server) {
                 ResourcePackChunkRequestPacket requestPacket = (ResourcePackChunkRequestPacket) packet;
                 ResourcePack resourcePack = this.server.getResourcePackManager().getPackById(requestPacket.packId);
                 if (resourcePack == null) {
+                    server.getLogger().debug(username + ": resource pack chunk not found with uuid " + requestPacket.packId);
+                    this.close("", "disconnectionScreen.resourcePack");
+                    return;
+                }
+
+                if (!resourceChunksRequested.computeIfAbsent(requestPacket.packId, k -> new IntOpenHashSet()).add(requestPacket.chunkIndex)) {
+                    server.getLogger().debug(username + ": duplicate request for resource chunk " + requestPacket.packId + "/" + requestPacket.chunkIndex);
                     this.close("", "disconnectionScreen.resourcePack");
                     return;
                 }
@@ -3214,12 +3257,6 @@ public void onCompletion(Server server) {
                     if (inputX >= -1.001 && inputX <= 1.001 && inputY >= -1.001 && inputY <= 1.001) {
                         ((EntityControllable) riding).onPlayerInput(this, inputX, inputY);
                     }
-                } else if (this.riding instanceof EntityBoat && authPacket.getInputData().contains(AuthInputAction.IN_CLIENT_PREDICTED_IN_VEHICLE)) {
-                    if (this.riding.getId() == authPacket.getPredictedVehicle() && this.riding.isControlling(this)) {
-                        if (this.temporalVector.setComponents(authPacket.getPosition().getX(), authPacket.getPosition().getY(), authPacket.getPosition().getZ()).distanceSquared(this.riding) < 16) {
-                            ((EntityBoat) this.riding).onInput(authPacket.getPosition().getX(), authPacket.getPosition().getY(), authPacket.getPosition().getZ(), authPacket.getHeadYaw());
-                        }
-                    }
                 }
 
                 if (!this.isSpectator() && authPacket.getInputData().contains(AuthInputAction.MISSED_SWING)) {
@@ -3730,8 +3767,7 @@ public void onCompletion(Server server) {
 
                 AnimatePacket animatePacket = (AnimatePacket) packet;
 
-                if (animatePacket.action != AnimatePacket.Action.SWING_ARM &&
-                        !(this.riding != null && (animatePacket.action == AnimatePacket.Action.ROW_LEFT || animatePacket.action == AnimatePacket.Action.ROW_RIGHT))) {
+                if (animatePacket.action != AnimatePacket.Action.SWING_ARM) {
                     return;
                 }
 
@@ -3741,17 +3777,6 @@ public void onCompletion(Server server) {
                     return;
                 }
 
-                AnimatePacket.Action animation = animationEvent.getAnimationType();
-
-                switch (animation) {
-                    case ROW_RIGHT:
-                    case ROW_LEFT:
-                        if (this.riding instanceof EntityBoat) {
-                            ((EntityBoat) this.riding).onPaddle(animation, animatePacket.rowingTime);
-                        }
-                        break;
-                }
-
                 animatePacket = new AnimatePacket();
                 animatePacket.eid = this.getId();
                 animatePacket.action = animationEvent.getAnimationType();
@@ -3769,17 +3794,6 @@ public void onCompletion(Server server) {
                 }
 
                 switch (entityEventPacket.event) {
-                    case EntityEventPacket.EATING_ITEM:
-                        if (entityEventPacket.data == 0 || entityEventPacket.eid != this.id) {
-                            this.getServer().getLogger().debug(username + ": entity event eid mismatch");
-                            return;
-                        }
-
-                        entityEventPacket.eid = this.id;
-                        entityEventPacket.isEncoded = false;
-                        this.dataPacket(entityEventPacket);
-                        Server.broadcastPacket(this.getViewers().values(), entityEventPacket);
-                        return;
                     case EntityEventPacket.ENCHANT:
                         if (entityEventPacket.eid != this.id) {
                             this.getServer().getLogger().debug(username + ": entity event eid mismatch");
@@ -4439,7 +4453,7 @@ public void onCompletion(Server server) {
                                         if (!item.onUse(this, ticksUsed)) {
                                             this.needSendHeldItem = true;
                                         }
-                                    } else {
+                                    } else if (!(item instanceof ProjectileItem)) { // Fix newer versions showing player eating splash potions
                                         this.setUsingItem(true);
                                     }
                                 }
@@ -5424,6 +5438,8 @@ public void close(TextContainer message, String reason, boolean notify) {
 
         this.inventory = null;
         this.chunk = null;
+        this.clientMovements = null;
+        this.resourceChunksRequested = null;
 
         this.server.removePlayer(this);
 
@@ -5433,8 +5449,6 @@ public void close(TextContainer message, String reason, boolean notify) {
             this.server.removeOnlinePlayer(this);
             this.loggedIn = false;
         }
-
-        this.clientMovements.clear();
     }
 
     /**

src/main/java/cn/nukkit/Server.java

@@ -1095,7 +1095,7 @@ public void sendFullPlayerListData(Player player) {
     }
 
     public void sendRecipeList(Player player) {
-        player.dataPacket(CraftingManager.packet);
+        player.dataPacket(craftingManager.getCachedPacket());
     }
 
     private void checkTickUpdates(int currentTick) {

src/main/java/cn/nukkit/block/BlockChiseledBookshelf.java

@@ -1,9 +1,12 @@
 package cn.nukkit.block;
 
+import cn.nukkit.Player;
+import cn.nukkit.blockentity.BlockEntity;
 import cn.nukkit.item.Item;
 import cn.nukkit.item.ItemBlock;
 import cn.nukkit.item.ItemTool;
 import cn.nukkit.item.enchantment.Enchantment;
+import cn.nukkit.math.BlockFace;
 import cn.nukkit.utils.BlockColor;
 
 public class BlockChiseledBookshelf extends BlockSolidMeta {
@@ -73,4 +76,13 @@ public boolean canSilkTouch() {
     public boolean canBePushed() {
         return false; // prevent item loss issue with pistons until a working implementation
     }
+
+    @Override
+    public boolean place(Item item, Block block, Block target, BlockFace face, double fx, double fy, double fz, Player player) {
+        if (this.getLevel().setBlock(this, this, true, true)) {
+            BlockEntity.createBlockEntity(BlockEntity.CHISELED_BOOKSHELF, this.getChunk(), BlockEntity.getDefaultCompound(this, BlockEntity.CHISELED_BOOKSHELF));
+            return true;
+        }
+        return false;
+    }
 }

src/main/java/cn/nukkit/block/BlockChiseledTuffBricks.java

@@ -0,0 +1,18 @@
+package cn.nukkit.block;
+
+public class BlockChiseledTuffBricks extends BlockTuff {
+
+    public BlockChiseledTuffBricks() {
+        // Does Nothing
+    }
+
+    @Override
+    public String getName() {
+        return "Chiseled Tuff Bricks";
+    }
+
+    @Override
+    public int getId() {
+        return CHISELED_TUFF_BRICKS;
+    }
+}

src/main/java/cn/nukkit/block/BlockCopperBase.java

@@ -18,7 +18,7 @@ public double getHardness() {
 
     @Override
     public double getResistance() {
-        return 6;
+        return 30;
     }
 
     @Override

src/main/java/cn/nukkit/block/BlockCopperBulb.java

@@ -0,0 +1,52 @@
+package cn.nukkit.block;
+
+import cn.nukkit.block.properties.OxidizationLevel;
+import cn.nukkit.utils.BlockColor;
+
+
+public class BlockCopperBulb extends BlockCopperBase {
+
+    public BlockCopperBulb() {
+        // Does nothing
+    }
+
+    @Override
+    public String getName() {
+        return "Copper Bulb";
+    }
+
+    @Override
+    public int getId() {
+        return COPPER_BULB;
+    }
+
+    @Override
+    public BlockColor getColor() {
+        return BlockColor.ORANGE_BLOCK_COLOR;
+    }
+
+    @Override
+    public OxidizationLevel getOxidizationLevel() {
+        return OxidizationLevel.UNAFFECTED;
+    }
+
+    @Override
+    protected int getCopperId(boolean waxed, OxidizationLevel oxidizationLevel) {
+        if (oxidizationLevel == null) {
+            return this.getId();
+        }
+
+        switch (oxidizationLevel) {
+            case UNAFFECTED:
+                return waxed ? WAXED_COPPER_BULB : COPPER_BULB;
+            case EXPOSED:
+                return waxed ? WAXED_EXPOSED_COPPER_BULB : EXPOSED_COPPER_BULB;
+            case WEATHERED:
+                return waxed ? WAXED_WEATHERED_COPPER_BULB : WEATHERED_COPPER_BULB;
+            case OXIDIZED:
+                return waxed ? WAXED_OXIDIZED_COPPER_BULB : OXIDIZED_COPPER_BULB;
+            default:
+                return this.getId();
+        }
+    }
+}

src/main/java/cn/nukkit/block/BlockCopperBulbExposed.java

@@ -0,0 +1,31 @@
+package cn.nukkit.block;
+
+import cn.nukkit.block.properties.OxidizationLevel;
+import cn.nukkit.utils.BlockColor;
+
+public class BlockCopperBulbExposed extends BlockCopperBulb {
+
+    public BlockCopperBulbExposed() {
+        // Does nothing
+    }
+
+    @Override
+    public String getName() {
+        return "Exposed Copper Bulb";
+    }
+
+    @Override
+    public int getId() {
+        return EXPOSED_COPPER_BULB;
+    }
+
+    @Override
+    public BlockColor getColor() {
+        return BlockColor.LIGHT_GRAY_TERRACOTA_BLOCK_COLOR;
+    }
+
+    @Override
+    public OxidizationLevel getOxidizationLevel() {
+        return OxidizationLevel.EXPOSED;
+    }
+}

src/main/java/cn/nukkit/block/BlockCopperBulbExposedWaxed.java

@@ -0,0 +1,23 @@
+package cn.nukkit.block;
+
+public class BlockCopperBulbExposedWaxed extends BlockCopperBulbExposed {
+
+    public BlockCopperBulbExposedWaxed() {
+        // Does nothing
+    }
+
+    @Override
+    public String getName() {
+        return "Waxed Exposed Copper Bulb";
+    }
+
+    @Override
+    public int getId() {
+        return WAXED_EXPOSED_COPPER_BULB;
+    }
+
+    @Override
+    public boolean isWaxed() {
+        return true;
+    }
+}