Block state unit test now works correct

Author: SupremeMortal

pom.xml

@@ -252,7 +252,7 @@
         <dependency>
             <groupId>com.nukkitx</groupId>
             <artifactId>block-state-updater</artifactId>
-            <version>1.16.0.2</version>
+            <version>1.16.0.4</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.nukkitx</groupId>

src/main/java/org/cloudburstmc/server/block/BlockPalette.java

@@ -1,15 +1,14 @@
 package org.cloudburstmc.server.block;
 
 import com.google.common.collect.ImmutableMap;
+import com.nukkitx.blockstateupdater.BlockStateUpdaters;
 import com.nukkitx.nbt.NbtMap;
 import com.nukkitx.nbt.NbtMapBuilder;
 import it.unimi.dsi.fastutil.ints.Int2ReferenceMap;
 import it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap;
 import it.unimi.dsi.fastutil.objects.*;
 import lombok.extern.log4j.Log4j2;
 import org.cloudburstmc.server.block.serializer.BlockSerializer;
-import org.cloudburstmc.server.block.serializer.BlockSerializers;
-import org.cloudburstmc.server.block.serializer.NoopBlockSerializer;
 import org.cloudburstmc.server.block.trait.BlockTrait;
 import org.cloudburstmc.server.utils.Identifier;
 
@@ -51,7 +50,7 @@ public void addBlock(Identifier identifier, BlockSerializer serializer, BlockTra
             this.runtimeStateMap.put(runtimeId, state);
 
             NbtMapBuilder tagBuilder = NbtMap.builder();
-            BlockSerializers.serializeCommon(tagBuilder, identifier);
+            BlockStateUpdaters.serializeCommon(tagBuilder, identifier.toString());
 
             NbtMapBuilder statesBuilder = NbtMap.builder();
             serializer.serialize(statesBuilder, state);

src/main/java/org/cloudburstmc/server/block/serializer/BlockSerializers.java

@@ -79,7 +79,7 @@ public static BlockRegistry get() {
     }
 
     public synchronized void register(Identifier id, BlockBehavior behavior) throws RegistryException {
-        registerVanilla(id, behavior, null);
+        registerVanilla(id, behavior);
 
         // generate legacy ID (Not sure why we need to but it's a requirement)
         int legacyId = this.customIdAllocator.getAndIncrement();

src/main/java/org/cloudburstmc/server/registry/BlockRegistry.java

@@ -1,5 +1,6 @@
 package org.cloudburstmc.server.registry;
 
+import com.nukkitx.blockstateupdater.BlockStateUpdaters;
 import com.nukkitx.nbt.NBTInputStream;
 import com.nukkitx.nbt.NbtList;
 import com.nukkitx.nbt.NbtMap;
@@ -10,14 +11,19 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 public class BlockRegistryTest {
 
     @DisplayName("Block Palette Test")
     @Test
-    public void blockPaletteTest() {
+    public void blockPaletteTest() throws IOException {
         Set<NbtMap> vanillaPalette;
         InputStream stream = BlockRegistryTest.class.getClassLoader().getResourceAsStream("runtime_block_states.dat");
         try (NBTInputStream nbtStream = NbtUtils.createNetworkReader(stream)) {
@@ -27,21 +33,37 @@ public void blockPaletteTest() {
             throw new AssertionError("Unable to load block palette");
         }
 
+        int version = BlockStateUpdaters.getLatestVersion();
+        int major = (version >> 24) & 0xFF;
+        int minor = (version >> 16) & 0xFF;
+        int patch = (version >> 8) & 0xFF;
+        int build = version & 0xFF;
+        System.out.printf("Latest block state version: %d.%d.%d.%d%n", major, minor, patch, build);
+
         NbtList<NbtMap> serverPalette = BlockRegistry.get().getPaletteTag(); // init
 
-        boolean failed = false;
+        List<String> invalidStates = new ArrayList<>();
+        int invalid = 0;
         for (NbtMap state : serverPalette) {
             if (!vanillaPalette.remove(state)) {
-                System.out.println("State does not exist in vanilla palette:\n" + state.toString());
-                failed = true;
+                invalidStates.add(state.toString());
+                invalid++;
             }
         }
 
+        System.out.println("Found " + invalid + " invalid block states");
+        Files.write(Paths.get("invalid_states.log"), invalidStates, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE);
+
+        List<String> missingStates = new ArrayList<>();
+        int missing = 0;
         for (NbtMap state : vanillaPalette) {
-            System.out.println("State does not exist in Cloudburst:\n" + state.toString());
-            failed = true;
+            missing++;
+            missingStates.add(state.toString());
         }
 
-        Assertions.assertFalse(failed, "One or more block states did not match the vanilla palette");
+        System.out.println("Found " + missing + " missing block states");
+        Files.write(Paths.get("missing_states.log"), missingStates, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE);
+
+        Assertions.assertFalse(missing > 0 | invalid > 0, "One or more block states did not match the vanilla palette");
     }
 }