Add blocks to palette

mircokroon · Mar 18, 2023 · 1fb60e7 · 1fb60e7
1 parent 323895f
commit 1fb60e7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/src/main/java/game/data/chunk/palette/BlockState.java b/src/main/java/game/data/chunk/palette/BlockState.java
@@ -118,7 +118,7 @@ public String toString() {
         return "BlockState{" +
             "name='" + name + '\'' +
             ", id=" + id +
-            ", properties=" + properties +
+//            ", properties=" + properties +
             '}';
     }
 }
diff --git a/src/main/java/game/data/chunk/palette/GlobalPalette.java b/src/main/java/game/data/chunk/palette/GlobalPalette.java
@@ -84,6 +84,11 @@ public int getStateId(SpecificTag nbt) {
     }
 
     public void addBlockState(BlockState state) {
+        // skip existing states, these should be the same but might have different names
+        if (states.containsKey(state.getNumericId())) {
+            return;
+        }
+
         states.put(state.getNumericId(), state);
         nameStates.put(new BlockStateIdentifier(state.getName(), state.getProperties()), state);
     }

diff --git a/src/main/java/game/data/registries/modded/ForgeRegistryHandler.java b/src/main/java/game/data/registries/modded/ForgeRegistryHandler.java
@@ -2,6 +2,7 @@
 
 import game.data.WorldManager;
 import game.data.chunk.Chunk;
+import game.data.chunk.palette.GlobalPaletteProvider;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -80,6 +81,10 @@ private void handleRegistry(DataTypeProvider provider) {
             registry.addId(provider.readString(), provider.readVarInt());
         }
 
+        if (name.equals("minecraft:blocks")) {
+            registry.registerBlocks();
+        }
+
         int numAliases = provider.readVarInt();
         for (int i = 0; i < numAliases; i++) {
             registry.addAlias(provider.readString());
@@ -139,4 +144,13 @@ public Tag toNbt() {
 
         return tag;
     }
+
+    /**
+     * Add blocks to the global palette
+     */
+    public void registerBlocks() {
+        // since blockstates in 1.12.2 have half a byte of data at the end, we need to shift the
+        // blockstates we register to the global palette for the minimap to remain correct(ish)
+        ids.forEach(pair -> GlobalPaletteProvider.registerBlock(pair.getKey(), pair.getValue() << 4));
+    }
 }