25w07a

Author: basaigh

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

@@ -218,8 +218,8 @@
 
 public class MinecraftCodec {
     public static final PacketCodec CODEC = PacketCodec.builder()
-            .protocolVersion((1 << 30) | 233)
-            .minecraftVersion("25w06a")
+            .protocolVersion((1 << 30) | 234)
+            .minecraftVersion("25w07a")
             .state(ProtocolState.HANDSHAKE, MinecraftPacketRegistry.builder()
                     .registerServerboundPacket(ClientIntentionPacket.class, ClientIntentionPacket::new)
             )

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/HeightmapTypes.java

@@ -0,0 +1,16 @@
+package org.geysermc.mcprotocollib.protocol.data.game.level;
+
+public enum HeightmapTypes {
+    WORLD_SURFACE_WG,
+    WORLD_SURFACE,
+    OCEAN_FLOOR_WG,
+    OCEAN_FLOOR,
+    MOTION_BLOCKING,
+    MOTION_BLOCKING_NO_LEAVES;
+
+    private static final HeightmapTypes[] VALUES = values();
+
+    public static HeightmapTypes from(int id) {
+        return VALUES[id];
+    }
+}

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundLevelChunkWithLightPacket.java

@@ -8,25 +8,35 @@
 import org.cloudburstmc.nbt.NbtMap;
 import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import org.geysermc.mcprotocollib.protocol.codec.MinecraftTypes;
+import org.geysermc.mcprotocollib.protocol.data.game.level.HeightmapTypes;
 import org.geysermc.mcprotocollib.protocol.data.game.level.LightUpdateData;
 import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockEntityInfo;
 import org.geysermc.mcprotocollib.protocol.data.game.level.block.BlockEntityType;
 
+import java.util.EnumMap;
+import java.util.Map;
+
 @Data
 @With
 @AllArgsConstructor
 public class ClientboundLevelChunkWithLightPacket implements MinecraftPacket {
     private final int x;
     private final int z;
     private final byte @NonNull [] chunkData;
-    private final @NonNull NbtMap heightMaps;
+    private final @NonNull Map<HeightmapTypes, long[]> heightMaps;
     private final @NonNull BlockEntityInfo @NonNull [] blockEntities;
     private final @NonNull LightUpdateData lightData;
 
     public ClientboundLevelChunkWithLightPacket(ByteBuf in) {
         this.x = in.readInt();
         this.z = in.readInt();
-        this.heightMaps = MinecraftTypes.readCompoundTagOrThrow(in);
+
+        this.heightMaps = new EnumMap<>(HeightmapTypes.class);
+        int length = MinecraftTypes.readVarInt(in);
+        for (int i = 0; i < length; i++) {
+            this.heightMaps.put(HeightmapTypes.from(MinecraftTypes.readVarInt(in)), MinecraftTypes.readLongArray(in));
+        }
+
         this.chunkData = MinecraftTypes.readByteArray(in);
 
         this.blockEntities = new BlockEntityInfo[MinecraftTypes.readVarInt(in)];
@@ -47,7 +57,13 @@ public ClientboundLevelChunkWithLightPacket(ByteBuf in) {
     public void serialize(ByteBuf out) {
         out.writeInt(this.x);
         out.writeInt(this.z);
-        MinecraftTypes.writeAnyTag(out, this.heightMaps);
+
+        MinecraftTypes.writeVarInt(out, this.heightMaps.size());
+        for (Map.Entry<HeightmapTypes, long[]> entry : this.heightMaps.entrySet()) {
+            MinecraftTypes.writeVarInt(out, entry.getKey().ordinal());
+            MinecraftTypes.writeLongArray(out, entry.getValue());
+        }
+
         MinecraftTypes.writeVarInt(out, this.chunkData.length);
         out.writeBytes(this.chunkData);