Fix item componets usage, fixes eating some items (#2213)

CloudburstMC · Feb 12, 2025 · 23dca34 · 23dca34
1 parent d68de40
commit 23dca34
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/src/main/java/cn/nukkit/item/RuntimeItemMapping.java b/src/main/java/cn/nukkit/item/RuntimeItemMapping.java
@@ -57,10 +57,7 @@ public RuntimeItemMapping(Map<String, MappingEntry> mappings) {
 
             int version = entry.get("version").getAsInt();
             boolean componentBased = entry.get("componentBased").getAsBoolean();
-            CompoundTag components = null;
-            if (componentBased) {
-                components = new CompoundTag().putCompound("components", (CompoundTag) itemComponents.get(identifier));
-            }
+            CompoundTag components = (CompoundTag) itemComponents.get(identifier);
             this.vanillaItems.put(identifier, new ItemComponentPacket.ItemDefinition(identifier, runtimeId, componentBased, version, components));
 
             boolean hasDamage = false;

diff --git a/src/main/java/cn/nukkit/item/custom/CustomItemManager.java b/src/main/java/cn/nukkit/item/custom/CustomItemManager.java
@@ -123,12 +123,10 @@ public boolean closeRegistry() {
 
         this.closed = true;
 
-        boolean hasItems = this.hasCustomItems();
+        this.getCachedPacket(); // Cache compressed packet
 
-        if (hasItems) {
-            this.getCachedPacket();
-        }
+        RuntimeItems.getMapping().getVanillaItemDefinitions().clear(); // Free up memory
 
-        return hasItems;
+        return this.hasCustomItems();
     }
 }
diff --git a/src/main/java/cn/nukkit/network/protocol/ItemComponentPacket.java b/src/main/java/cn/nukkit/network/protocol/ItemComponentPacket.java
@@ -46,7 +46,7 @@ public void encode() {
             this.putBoolean(definition.isComponentBased);
             this.putVarInt(definition.getVersion);
 
-            if (definition.isComponentBased) {
+            if (definition.getNetworkData != null) {
                 try {
                     this.put(NBTIO.write(definition.getNetworkData, ByteOrder.LITTLE_ENDIAN, true));
                 } catch (IOException e) {

diff --git a/src/main/resources/item_components.nbt b/src/main/resources/item_components.nbt