From 9f8bc9db99f82513c37c007a4b48a2b4b7e0b53b Mon Sep 17 00:00:00 2001
From: Eclipse <eclipse@eclipseisoffline.xyz>
Date: Mon, 15 Sep 2025 21:01:23 +0000
Subject: [PATCH] Bump MCPL for data palette fixes (#5818)

* Update chunk loading for MCPL changes

* Adjust for renames in MCPL

* Bump MCPL

* Rename this just because I can
---
 .../org/geysermc/geyser/level/physics/Direction.java   |  4 ++--
 .../org/geysermc/geyser/session/cache/ChunkCache.java  |  5 ++---
 .../geyser/session/cache/registry/JavaRegistry.java    |  5 +++++
 .../session/cache/registry/SimpleJavaRegistry.java     |  5 +++++
 .../java/level/JavaLevelChunkWithLightTranslator.java  | 10 ++++++----
 gradle/libs.versions.toml                              |  2 +-
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/level/physics/Direction.java b/core/src/main/java/org/geysermc/geyser/level/physics/Direction.java
index 22326645e..d4e304f76 100644
--- a/core/src/main/java/org/geysermc/geyser/level/physics/Direction.java
+++ b/core/src/main/java/org/geysermc/geyser/level/physics/Direction.java
@@ -72,9 +72,9 @@ public enum Direction {
         return axis == Axis.X || axis == Axis.Z;
     }
 
-    public static @NonNull Direction fromMCPL(org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction pistonValue) {
+    public static @NonNull Direction fromMCPL(org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction mcpl) {
         for (Direction direction : VALUES) {
-            if (direction.mcpl == pistonValue) {
+            if (direction.mcpl == mcpl) {
                 return direction;
             }
         }
diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/ChunkCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/ChunkCache.java
index fd9ec7ea8..464b99383 100644
--- a/core/src/main/java/org/geysermc/geyser/session/cache/ChunkCache.java
+++ b/core/src/main/java/org/geysermc/geyser/session/cache/ChunkCache.java
@@ -31,6 +31,7 @@ import lombok.Setter;
 import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.level.block.type.Block;
 import org.geysermc.geyser.level.chunk.GeyserChunk;
+import org.geysermc.geyser.registry.BlockRegistries;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.util.MathUtils;
 import org.geysermc.mcprotocollib.protocol.data.game.chunk.DataPalette;
@@ -89,9 +90,7 @@ public class ChunkCache {
                 previouslyEmpty = true;
                 if (block != Block.JAVA_AIR_ID) {
                     // A previously empty chunk, which is no longer empty as a block has been added to it
-                    palette = DataPalette.createForChunk();
-                    // Fixes the chunk assuming that all blocks is the `block` variable we are updating. /shrug
-                    palette.getPalette().stateToId(Block.JAVA_AIR_ID);
+                    palette = DataPalette.createForBlockState(Block.JAVA_AIR_ID, BlockRegistries.BLOCK_STATES.get().size());
                     chunk.sections()[(y - minY) >> 4] = palette;
                 } else {
                     // Nothing to update
diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/registry/JavaRegistry.java b/core/src/main/java/org/geysermc/geyser/session/cache/registry/JavaRegistry.java
index 8a0c4c4df..fc9c7d884 100644
--- a/core/src/main/java/org/geysermc/geyser/session/cache/registry/JavaRegistry.java
+++ b/core/src/main/java/org/geysermc/geyser/session/cache/registry/JavaRegistry.java
@@ -80,4 +80,9 @@ public interface JavaRegistry<T> {
      * All values of this registry, as a list.
      */
     List<T> values();
+
+    /**
+     * The amount of values registered in this registry.
+     */
+    int size();
 }
diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/registry/SimpleJavaRegistry.java b/core/src/main/java/org/geysermc/geyser/session/cache/registry/SimpleJavaRegistry.java
index 853579813..f6c7769ca 100644
--- a/core/src/main/java/org/geysermc/geyser/session/cache/registry/SimpleJavaRegistry.java
+++ b/core/src/main/java/org/geysermc/geyser/session/cache/registry/SimpleJavaRegistry.java
@@ -108,6 +108,11 @@ public class SimpleJavaRegistry<T> implements JavaRegistry<T> {
         return this.values.stream().map(RegistryEntryData::data).toList();
     }
 
+    @Override
+    public int size() {
+        return values.size();
+    }
+
     @Override
     public String toString() {
         return this.values.toString();
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelChunkWithLightTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelChunkWithLightTranslator.java
index 065b0ad36..46278e3c5 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelChunkWithLightTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelChunkWithLightTranslator.java
@@ -53,6 +53,7 @@ import org.geysermc.geyser.level.chunk.bitarray.BitArrayVersion;
 import org.geysermc.geyser.level.chunk.bitarray.SingletonBitArray;
 import org.geysermc.geyser.registry.BlockRegistries;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.session.cache.registry.JavaRegistries;
 import org.geysermc.geyser.translator.level.BiomeTranslator;
 import org.geysermc.geyser.translator.level.block.entity.BedrockChunkWantsBlockEntityTag;
 import org.geysermc.geyser.translator.level.block.entity.BlockEntityTranslator;
@@ -120,8 +121,9 @@ public class JavaLevelChunkWithLightTranslator extends PacketTranslator<Clientbo
             ByteBuf in = Unpooled.wrappedBuffer(packet.getChunkData());
             boolean extendedCollisionNextSection = false;
             for (int sectionY = 0; sectionY < chunkSize; sectionY++) {
-                ChunkSection javaSection = MinecraftTypes.readChunkSection(in);
-                javaChunks[sectionY] = javaSection.getChunkData();
+                ChunkSection javaSection = MinecraftTypes.readChunkSection(in, BlockRegistries.BLOCK_STATES.get().size(),
+                    session.getRegistryCache().registry(JavaRegistries.BIOME).size());
+                javaChunks[sectionY] = javaSection.getBlockData();
                 javaBiomes[sectionY] = javaSection.getBiomeData();
                 boolean extendedCollision = extendedCollisionNextSection;
                 boolean thisExtendedCollisionNextSection = false;
@@ -163,8 +165,8 @@ public class JavaLevelChunkWithLightTranslator extends PacketTranslator<Clientbo
                     continue;
                 }
 
-                Palette javaPalette = javaSection.getChunkData().getPalette();
-                BitStorage javaData = javaSection.getChunkData().getStorage();
+                Palette javaPalette = javaSection.getBlockData().getPalette();
+                BitStorage javaData = javaSection.getBlockData().getStorage();
 
                 if (javaPalette instanceof GlobalPalette) {
                     // As this is the global palette, simply iterate through the whole chunk section once
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2a651a8df..ca197434f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ protocol-common = "3.0.0.Beta7-20250812.232642-18"
 protocol-codec = "3.0.0.Beta7-20250812.232642-18"
 raknet = "1.0.0.CR3-20250811.214335-20"
 minecraftauth = "4.1.1"
-mcprotocollib = "1.21.7-20250911.173407-5"
+mcprotocollib = "1.21.7-20250915.111046-6"
 adventure = "4.24.0"
 adventure-platform = "4.3.0"
 junit = "5.9.2"