Expand ItemDefinition so it can be used with ItemComponentPacket

Author: Alemiz112

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v419/serializer/ItemComponentSerializer_v419.java

@@ -6,7 +6,7 @@
 import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.protocol.bedrock.codec.BedrockCodecHelper;
 import org.cloudburstmc.protocol.bedrock.codec.BedrockPacketSerializer;
-import org.cloudburstmc.protocol.bedrock.data.inventory.ComponentItemData;
+import org.cloudburstmc.protocol.bedrock.data.definitions.SimpleItemDefinition;
 import org.cloudburstmc.protocol.bedrock.packet.ItemComponentPacket;
 
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -17,8 +17,8 @@ public class ItemComponentSerializer_v419 implements BedrockPacketSerializer<Ite
     @Override
     public void serialize(ByteBuf buffer, BedrockCodecHelper helper, ItemComponentPacket packet) {
         helper.writeArray(buffer, packet.getItems(), (buf, packetHelper, item) -> {
-            packetHelper.writeString(buf, item.getName());
-            packetHelper.writeTag(buf, item.getData());
+            packetHelper.writeString(buf, item.getIdentifier());
+            packetHelper.writeTag(buf, item.getComponentData());
         });
     }
 
@@ -27,7 +27,7 @@ public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, ItemComponent
         helper.readArray(buffer, packet.getItems(), (buf, packetHelper) -> {
             String name = packetHelper.readString(buf);
             NbtMap data = packetHelper.readTag(buf, NbtMap.class);
-            return ComponentItemData.fromLegacyItem(name, data);
+            return new SimpleItemDefinition(name, 0, 0, true, data);
         });
     }
 }

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v419/serializer/StartGameSerializer_v419.java

@@ -193,7 +193,7 @@ protected void readItemDefinitions(ByteBuf buffer, BedrockCodecHelper helper, Li
             String identifier = packetHelper.readString(buf);
             short id = buf.readShortLE();
             boolean componentBased = buf.readBoolean();
-            return new SimpleItemDefinition(identifier, id, componentBased);
+            return new SimpleItemDefinition(identifier, id, 0, componentBased, componentBased ? NbtMap.EMPTY : null);
         });
     }
 }

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/codec/v776/serializer/ItemComponentSerializer_v776.java

@@ -6,7 +6,7 @@
 import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.protocol.bedrock.codec.BedrockCodecHelper;
 import org.cloudburstmc.protocol.bedrock.codec.BedrockPacketSerializer;
-import org.cloudburstmc.protocol.bedrock.data.inventory.ComponentItemData;
+import org.cloudburstmc.protocol.bedrock.data.definitions.SimpleItemDefinition;
 import org.cloudburstmc.protocol.bedrock.packet.ItemComponentPacket;
 import org.cloudburstmc.protocol.common.util.VarInts;
 
@@ -17,11 +17,15 @@ public class ItemComponentSerializer_v776 implements BedrockPacketSerializer<Ite
     @Override
     public void serialize(ByteBuf buffer, BedrockCodecHelper helper, ItemComponentPacket packet) {
         helper.writeArray(buffer, packet.getItems(), (buf, packetHelper, item) -> {
-            packetHelper.writeString(buf, item.getName());
-            buf.writeShortLE(item.getItemId());
+            packetHelper.writeString(buf, item.getIdentifier());
+            buf.writeShortLE(item.getRuntimeId());
             buf.writeBoolean(item.isComponentBased());
             VarInts.writeInt(buffer, item.getVersion());
-            packetHelper.writeTag(buf, item.getData());
+            if (item.isComponentBased()) {
+                packetHelper.writeTag(buf, item.getComponentData());
+            } else {
+                packetHelper.writeTag(buf, NbtMap.EMPTY);
+            }
         });
     }
 
@@ -33,7 +37,7 @@ public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, ItemComponent
             boolean componentBased = buf.readBoolean();
             int version = VarInts.readInt(buffer);
             NbtMap data = packetHelper.readTag(buf, NbtMap.class);
-            return new ComponentItemData(name, data, itemId, componentBased, version);
+            return new SimpleItemDefinition(name, itemId, version, componentBased, data);
         });
     }
 }

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/data/definitions/ItemDefinition.java

@@ -1,10 +1,27 @@
 package org.cloudburstmc.protocol.bedrock.data.definitions;
 
+import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.protocol.common.NamedDefinition;
 
 public interface ItemDefinition extends NamedDefinition {
     ItemDefinition AIR = new SimpleItemDefinition("minecraft:air", 0, false);
     ItemDefinition LEGACY_FIREWORK = new SimpleItemDefinition("minecraft:fireworks_rocket", 401, false);
 
+    /**
+     * Whether this item is data driven.
+     * @return true if this item is data driven, false if it is not.
+     */
     boolean isComponentBased();
+
+    /**
+     * Get the component data NBT for this item.
+     * @return the component data NBT, or null if this item is not data driven.
+     */
+    default NbtMap getComponentData() {
+        return null;
+    }
+
+    default int getVersion() {
+        return 0;
+    }
 }

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/data/definitions/SimpleItemDefinition.java

@@ -1,12 +1,26 @@
 package org.cloudburstmc.protocol.bedrock.data.definitions;
 
+import lombok.AllArgsConstructor;
 import lombok.Value;
 import lombok.experimental.NonFinal;
+import org.cloudburstmc.nbt.NbtMap;
 
 @Value
 @NonFinal
+@AllArgsConstructor
 public class SimpleItemDefinition implements ItemDefinition {
     String identifier;
     int runtimeId;
+    int version;
     boolean componentBased;
+    NbtMap componentData;
+
+    // Backwards compatibility constructor
+    public SimpleItemDefinition(String identifier, int runtimeId, boolean componentBased) {
+        this.identifier = identifier;
+        this.runtimeId = runtimeId;
+        this.componentBased = componentBased;
+        this.version = 0;
+        this.componentData = null;
+    }
 }

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/data/inventory/ComponentItemData.java

@@ -5,7 +5,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import org.cloudburstmc.protocol.bedrock.data.inventory.ComponentItemData;
+import org.cloudburstmc.protocol.bedrock.data.definitions.ItemDefinition;
 import org.cloudburstmc.protocol.common.PacketSignal;
 
 import java.util.List;
@@ -18,7 +18,7 @@
 @ToString(doNotUseGetters = true)
 public class ItemComponentPacket implements BedrockPacket {
 
-    private final List<ComponentItemData> items = new ObjectArrayList<>();
+    private final List<ItemDefinition> items = new ObjectArrayList<>();
 
     @Override
     public PacketSignal handle(BedrockPacketHandler handler) {

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/packet/ItemComponentPacket.java

@@ -104,7 +104,7 @@ public class StartGamePacket implements BedrockPacket {
     private NbtList<NbtMap> blockPalette;
     private final List<BlockPropertyData> blockProperties = new ObjectArrayList<>();
     /**
-     * @deprecated since v776
+     * @deprecated since v776. Use ItemComponentPacket instead.
      */
     private List<ItemDefinition> itemDefinitions = new ObjectArrayList<>();
     private String multiplayerCorrelationId;