Merge pull request #867 from AJ-Ferguson/lock-nbt

Read lock data component as compound nbt
GeyserMC · Nov 7, 2024 · 88188c5 · 88188c5
2 parents d5f5ae0 + f82aa5b
commit 88188c5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/.../java/org/geysermc/mcprotocollib/protocol/data/game/item/component/DataComponentType.java b/.../java/org/geysermc/mcprotocollib/protocol/data/game/item/component/DataComponentType.java
@@ -86,7 +86,7 @@ public class DataComponentType<T> {
     public static final DataComponentType<List<ItemStack>> CONTAINER = new DataComponentType<>(listReader(ItemCodecHelper::readOptionalItemStack), listWriter(MinecraftCodecHelper::writeOptionalItemStack), ObjectDataComponent::new);
     public static final DataComponentType<BlockStateProperties> BLOCK_STATE = new DataComponentType<>(ItemCodecHelper::readBlockStateProperties, ItemCodecHelper::writeBlockStateProperties, ObjectDataComponent::new);
     public static final DataComponentType<List<BeehiveOccupant>> BEES = new DataComponentType<>(listReader(ItemCodecHelper::readBeehiveOccupant), listWriter(ItemCodecHelper::writeBeehiveOccupant), ObjectDataComponent::new);
-    public static final DataComponentType<String> LOCK = new DataComponentType<>(ItemCodecHelper::readLock, ItemCodecHelper::writeLock, ObjectDataComponent::new);
+    public static final DataComponentType<NbtMap> LOCK = new DataComponentType<>(ItemCodecHelper::readCompoundTag, ItemCodecHelper::writeAnyTag, ObjectDataComponent::new);
     public static final DataComponentType<NbtMap> CONTAINER_LOOT = new DataComponentType<>(ItemCodecHelper::readCompoundTag, ItemCodecHelper::writeAnyTag, ObjectDataComponent::new);
 
     protected final int id;

diff --git a/...in/java/org/geysermc/mcprotocollib/protocol/data/game/item/component/ItemCodecHelper.java b/...in/java/org/geysermc/mcprotocollib/protocol/data/game/item/component/ItemCodecHelper.java
@@ -637,12 +637,4 @@ public void writeBeehiveOccupant(ByteBuf buf, BeehiveOccupant occupant) {
         this.writeVarInt(buf, occupant.getTicksInHive());
         this.writeVarInt(buf, occupant.getMinTicksInHive());
     }
-
-    public String readLock(ByteBuf buf) {
-        return this.readAnyTag(buf, NbtType.STRING);
-    }
-
-    public void writeLock(ByteBuf buf, String key) {
-        this.writeAnyTag(buf, key);
-    }
 }