fix: block palette & item palette

Author: Reider745

src/main/java/com/reider745/api/CustomManager.java

@@ -9,11 +9,13 @@ public class CustomManager {
     public int id;
     public Class<?> clazz;
     public String type;
+    public String textId;
 
-    public CustomManager(int id, Class<?> clazz, String type) {
+    public CustomManager(int id, Class<?> clazz, String type, String textId) {
         this.id = id;
         this.clazz = clazz;
         this.type = type;
+        this.textId = textId;
     }
 
     @SuppressWarnings("unchecked")

src/main/java/com/reider745/block/CustomBlock.java

@@ -143,7 +143,7 @@ public static ArrayList<String> getVariants(CustomManager manager) {
     public static HashMap<String, Integer> customBlocks = new HashMap<>();
 
     public static CustomManager registerBlock(String textId, int id, String name, Class<?> item) {
-        CustomManager manager = new CustomManager(id, item, "block");
+        CustomManager manager = new CustomManager(id, item, "block", textId);
         manager.put("name", name);
         manager.put("states", BlockMethods.getStatesForId(id));
 

src/main/java/com/reider745/hooks/block/BlockPalette.java

@@ -4,6 +4,7 @@
 import cn.nukkit.block.Block;
 import cn.nukkit.block.BlockDoor;
 import cn.nukkit.block.BlockID;
+import cn.nukkit.level.format.leveldb.BlockStateMapping;
 import cn.nukkit.level.format.leveldb.LevelDBConstants;
 import cn.nukkit.nbt.tag.CompoundTag;
 import cn.nukkit.network.protocol.ProtocolInfo;
@@ -18,10 +19,12 @@
 import com.reider745.block.wall.BlockWall;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import org.cloudburstmc.nbt.NbtMap;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 @Hooks(className = "cn.nukkit.level.GlobalBlockPalette")
 public class BlockPalette {
@@ -79,7 +82,7 @@ public static int getIdByName(String name) {
         return stateIdByName.get(name);
     }
 
-    private record BlockDescription(int id, int newId, JSONObject states, int data) {
+    private record BlockDescription(int id, int newId, JSONObject states, int data, String identifier) {
     }
 
     private static JSONObject cloneJSON(JSONObject json) {
@@ -121,7 +124,7 @@ private static void variantGenerations(List<Integer> states, List<JSONObject> va
         }
     }
 
-    private static List<JSONObject> variantGenerations(List<Integer> states) {
+    public static List<JSONObject> variantGenerations(List<Integer> states) {
         final JSONObject temp = new JSONObject();
         for(int state : states) {
             temp.put(getNameForId(state), 0);
@@ -158,16 +161,30 @@ public static void init() {
                 if(!doors.contains(newId) && e.getString("nameId").contains("_door"))
                     doors.add(newId);
 
-                sortStates.add(new BlockDescription(e.getInt("oldId"), newId, states, legacyData));
+                sortStates.add(new BlockDescription(e.getInt("oldId"), newId, states, legacyData, "minecraft:" + e.getString("nameId")));
             }
 
             // custom runtime block
+
+            AtomicReference<Integer> RUNTIME_ID = new AtomicReference<>(Integer.MAX_VALUE);
             CustomBlock.blocks.forEach((id, manager) -> {
-                //final ArrayList<String> variants = CustomBlock.getVariants(manager);
                 final List<JSONObject> states = variantGenerations(CustomBlock.getStates(manager));
 
                 for (int data = 0; data < states.size(); data++) {
-                    sortStates.add(new BlockDescription(id, id, states.get(data), data));
+                    var state = states.get(data);
+                    sortStates.add(new BlockDescription(id, id, state, data, manager.textId));
+
+                    int runtimeId = RUNTIME_ID.getAndSet(RUNTIME_ID.get() - 1);
+                    blockPalette.registerState(id, data, runtimeId, null);
+                    var builder = NbtMap.builder();
+
+                    state.keySet().forEach((name) -> {
+                        builder.putInt(name, state.getInt(name));
+                    });
+                    builder.putString("name", manager.textId);
+                    var nbt = builder.build();
+                    nbt.hashCode();
+                    BlockStateMapping.get().registerState(runtimeId, nbt);
                 }
             });
 

src/main/java/com/reider745/hooks/item/RuntimeItemsHooks.java

@@ -11,10 +11,12 @@
 import com.reider745.api.hooks.annotation.Inject;
 import com.reider745.block.CustomBlock;
 import com.reider745.block.wall.BlockWall;
+import com.reider745.hooks.block.BlockPalette;
 import com.reider745.item.CustomItem;
 import com.reider745.item.ItemMethod;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import org.json.JSONObject;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -66,8 +68,10 @@ public static void register(int protocolId) {
             legacyString2LegacyInt.put(name, id);
         });
 
-        CustomBlock.customBlocks.forEach((name, _id) -> {
-            for (int id = _id, data = 0; data < 16; data++) {
+        CustomBlock.blocks.forEach((id, manager) -> {
+            final String name = manager.textId;
+            final List<JSONObject> variants = BlockPalette.variantGenerations(CustomBlock.getStates(manager));
+            for (int data = 0; data < variants.size(); data++) {
                 runtimeId2Name.put(id, name);
                 name2RuntimeId.put(name, id);
 
@@ -80,9 +84,9 @@ public static void register(int protocolId) {
                 identifier2Legacy.put(name, legacyEntry);
             }
 
-            legacyString2LegacyInt.put(name, _id);
+            legacyString2LegacyInt.put(name, id);
 
-            Item item = Item.get(_id, 0);
+            Item item = Item.get(id, 0);
             if (item.getId() != 0) {
                 Item.NAMESPACED_ID_ITEM.put(name, () -> item);
             }

src/main/java/com/reider745/item/CustomItem.java

@@ -102,7 +102,7 @@ public static String getTextIdForNumber(int id) {
     }
 
     public static CustomManager registerItem(String textId, int id, String name, Class<?> item) {
-        CustomManager manager = new CustomManager(id, item, "item");
+        CustomManager manager = new CustomManager(id, item, "item", textId);
         manager.put(PropertiesNames.NAME, name);
         manager.put(PropertiesNames.MAX_DAMAGE, 0);
         manager.put(PropertiesNames.MAX_STACK, 64);