fix: grass -> small_grass when reading

hollow-cube · Dec 19, 2023 · a2c7ebc · a2c7ebc
1 parent 9767456
commit a2c7ebc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@ metadata.format.version = "1.1"
 
 [versions]
 minestom = "9f3ee89506"
-minestomSnapshot = "1_20_2-909719b369"
+minestomSnapshot = "1_20_4-2e8a2863a3"
 zstd = "1.5.5-3"
 fastutil = "8.5.12"
 

diff --git a/src/main/java/net/hollowcube/polar/PolarReader.java b/src/main/java/net/hollowcube/polar/PolarReader.java
@@ -2,6 +2,7 @@
 
 import com.github.luben.zstd.Zstd;
 import net.minestom.server.network.NetworkBuffer;
+import net.minestom.server.utils.NamespaceID;
 import net.minestom.server.utils.chunk.ChunkUtils;
 import net.minestom.server.utils.validate.Check;
 import org.jetbrains.annotations.Contract;
@@ -89,6 +90,12 @@ private PolarReader() {}
         if (buffer.read(BOOLEAN)) return new PolarSection();
 
         var blockPalette = buffer.readCollection(STRING).toArray(String[]::new);
+        if (version <= PolarWorld.VERSION_SHORT_GRASS) {
+            for (int i = 0; i < blockPalette.length; i++) {
+                if (NamespaceID.from(blockPalette[i]).path().equals("grass"))
+                    blockPalette[i] = "short_grass";
+            }
+        }
         int[] blockData = null;
         if (blockPalette.length > 1) {
             blockData = new int[PolarSection.BLOCK_PALETTE_SIZE];

diff --git a/src/main/java/net/hollowcube/polar/PolarWorld.java b/src/main/java/net/hollowcube/polar/PolarWorld.java
@@ -21,6 +21,7 @@ public class PolarWorld {
     static final short VERSION_USERDATA_OPT_BLOCK_ENT_NBT = 2;
     static final short VERSION_MINESTOM_NBT_READ_BREAK = 3;
     static final short VERSION_WORLD_USERDATA = 4;
+    static final short VERSION_SHORT_GRASS = 5; // >:(
 
     public static CompressionType DEFAULT_COMPRESSION = CompressionType.ZSTD;