Fix AttackPacket registration order and chunk section reading

Author: basaigh

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodec.java

@@ -431,8 +431,8 @@ public class MinecraftCodec {
                     .registerClientboundPacket(ClientboundTrackedWaypointPacket.class, ClientboundTrackedWaypointPacket::new)
                     .registerClientboundPacket(ClientboundClearDialogPacket.class, ClientboundClearDialogPacket::new)
                     .registerClientboundPacket(ClientboundShowDialogGamePacket.class, ClientboundShowDialogGamePacket::new)
-                    .registerServerboundPacket(ServerboundAttackPacket.class, ServerboundAttackPacket::new)
                     .registerServerboundPacket(ServerboundAcceptTeleportationPacket.class, ServerboundAcceptTeleportationPacket::new)
+                    .registerServerboundPacket(ServerboundAttackPacket.class, ServerboundAttackPacket::new)
                     .registerServerboundPacket(ServerboundBlockEntityTagQueryPacket.class, ServerboundBlockEntityTagQueryPacket::new)
                     .registerServerboundPacket(ServerboundSelectBundleItemPacket.class, ServerboundSelectBundleItemPacket::new)
                     .registerServerboundPacket(ServerboundChangeDifficultyPacket.class, ServerboundChangeDifficultyPacket::new)

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftTypes.java

@@ -1777,14 +1777,16 @@ private static Palette readPalette(ByteBuf buf, PaletteType paletteType, int bit
 
     public static ChunkSection readChunkSection(ByteBuf buf, int blockStateRegistrySize, int biomeRegistrySize) {
         int blockCount = buf.readShort();
+        int fluidCount = buf.readShort();
 
         DataPalette blockStatePalette = MinecraftTypes.readDataPalette(buf, PaletteType.BLOCK_STATE, blockStateRegistrySize);
         DataPalette biomePalette = MinecraftTypes.readDataPalette(buf, PaletteType.BIOME, biomeRegistrySize);
-        return new ChunkSection(blockCount, blockStatePalette, biomePalette);
+        return new ChunkSection(blockCount, fluidCount, blockStatePalette, biomePalette);
     }
 
     public static void writeChunkSection(ByteBuf buf, ChunkSection section) {
         buf.writeShort(section.getBlockCount());
+        buf.writeShort(section.getFluidCount());
         MinecraftTypes.writeDataPalette(buf, section.getBlockData());
         MinecraftTypes.writeDataPalette(buf, section.getBiomeData());
     }

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/chunk/ChunkSection.java

@@ -17,16 +17,17 @@ public class ChunkSection {
     private static final int AIR = 0;
 
     private int blockCount;
+    private int fluidCount;
     private @NonNull DataPalette blockData;
     @Getter
     private @NonNull DataPalette biomeData;
 
     public ChunkSection(int initialBlockState, int blockStateRegistrySize, int initialBiome, int biomeRegistrySize) {
-        this(0, DataPalette.createForBlockState(initialBlockState, blockStateRegistrySize), DataPalette.createForBiome(initialBiome, biomeRegistrySize));
+        this(0, 0, DataPalette.createForBlockState(initialBlockState, blockStateRegistrySize), DataPalette.createForBiome(initialBiome, biomeRegistrySize));
     }
 
     public ChunkSection(ChunkSection original) {
-        this(original.blockCount, new DataPalette(original.blockData), new DataPalette(original.biomeData));
+        this(original.blockCount, original.fluidCount, new DataPalette(original.blockData), new DataPalette(original.biomeData));
     }
 
     public int getBlock(int x, int y, int z) {

protocol/src/test/java/org/geysermc/mcprotocollib/protocol/data/ChunkTest.java

@@ -37,7 +37,7 @@ public void setup() {
         SingletonPalette singletonPalette = new SingletonPalette(20);
         DataPalette blockPalette = DataPalette.create(singletonPalette, null, PaletteType.BLOCK_STATE, BLOCK_STATE_REGISTRY_SIZE);
         DataPalette biomePalette = DataPalette.create(singletonPalette, null, PaletteType.BIOME, BIOME_REGISTRY_SIZE);
-        section = new ChunkSection(4096, blockPalette, biomePalette);
+        section = new ChunkSection(4096, 3, blockPalette, biomePalette);
         chunkSectionsToTest.add(section);
     }