Keep chugging away

core/src/main/java/org/geysermc/geyser/item/DyeableLeatherItem.java

@@ -25,20 +25,21 @@
 
 package org.geysermc.geyser.item;
 
+import com.github.steveice10.mc.protocol.data.game.item.component.DataComponentType;
+import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents;
+import com.github.steveice10.mc.protocol.data.game.item.component.DyedItemColor;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.IntTag;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 
 public interface DyeableLeatherItem {
 
-    static void translateNbtToBedrock(CompoundTag tag) {
+    static void translateComponentsToBedrock(DataComponents components, BedrockItemBuilder builder) {
-        CompoundTag displayTag = tag.get("display");
+        DyedItemColor dyedItemColor = components.get(DataComponentType.DYED_COLOR);
-        if (displayTag == null) {
+        if (dyedItemColor == null) {
             return;
         }
-        IntTag color = displayTag.remove("color");
+        builder.putInt("customColor", dyedItemColor.getRgb());
-        if (color != null) {
-            tag.put(new IntTag("customColor", color.getValue()));
-        }
     }
 
     static void translateNbtToJava(CompoundTag tag) {

core/src/main/java/org/geysermc/geyser/item/type/ArmorItem.java

@@ -25,14 +25,18 @@
 
 package org.geysermc.geyser.item.type;
 
+import com.github.steveice10.mc.protocol.data.game.item.component.ArmorTrim;
+import com.github.steveice10.mc.protocol.data.game.item.component.DataComponentType;
 import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.item.ArmorMaterial;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 
 public class ArmorItem extends Item {
     private final ArmorMaterial material;
@@ -43,23 +47,26 @@ public class ArmorItem extends Item {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
-        if (tag.get("Trim") instanceof CompoundTag trim) {
+        ArmorTrim trim = components.get(DataComponentType.TRIM);
-            StringTag material = trim.remove("material");
+        if (trim != null) {
-            StringTag pattern = trim.remove("pattern");
+            // TODO material IDs
+            String material = trim.getMaterial().getAssetName();
+            String pattern = trim.getPattern().getAssetId();
 
             // discard custom trim patterns/materials to prevent visual glitches on bedrock
-            if (!material.getValue().startsWith("minecraft:")
+            if (!material.startsWith("minecraft:")
-                    || !pattern.getValue().startsWith("minecraft:")) {
+                    || !pattern.startsWith("minecraft:")) {
-                tag.remove("Trim");
                 return;
             }
 
+            NbtMapBuilder trimBuilder = NbtMap.builder();
             // bedrock has an uppercase first letter key, and the value is not namespaced
-            trim.put(new StringTag("Material", stripNamespace(material.getValue())));
+            trimBuilder.put("Material", stripNamespace(material));
-            trim.put(new StringTag("Pattern", stripNamespace(pattern.getValue())));
+            trimBuilder.put("Pattern", stripNamespace(pattern));
+            builder.putCompound("Trim", trimBuilder.build());
         }
     }
 

core/src/main/java/org/geysermc/geyser/item/type/AxolotlBucketItem.java

@@ -26,12 +26,10 @@
 package org.geysermc.geyser.item.type;
 
 import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents;
-import com.github.steveice10.opennbt.tag.builtin.ByteTag;
-import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.text.MinecraftLocale;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 
 public class AxolotlBucketItem extends Item {
     public AxolotlBucketItem(String javaIdentifier, Builder builder) {
@@ -39,15 +37,15 @@ public class AxolotlBucketItem extends Item {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
         // Bedrock Edition displays the properties of the axolotl. Java does not.
         // To work around this, set the custom name to the Axolotl translation and it's displayed correctly
-        tag.put(new ByteTag("AppendCustomName", (byte) 1));
+        builder.putByte("AppendCustomName", 1);
-        tag.put(new StringTag("CustomName", MinecraftLocale.getLocaleString("entity.minecraft.axolotl", session.locale())));
+        builder.putString("CustomName", MinecraftLocale.getLocaleString("entity.minecraft.axolotl", session.locale()));
         // Boilerplate required so the nametag does not appear as "Bucket of "
-        tag.put(new StringTag("ColorID", ""));
+        builder.putString("ColorID", "");
-        tag.put(new StringTag("BodyID", ""));
+        builder.putString("BodyID", "");
     }
 }

core/src/main/java/org/geysermc/geyser/item/type/BannerItem.java

@@ -25,6 +25,8 @@
 
 package org.geysermc.geyser.item.type;
 
+import com.github.steveice10.mc.protocol.data.game.item.component.BannerPatternLayer;
+import com.github.steveice10.mc.protocol.data.game.item.component.DataComponentType;
 import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.IntTag;
@@ -33,16 +35,14 @@ import com.github.steveice10.opennbt.tag.builtin.Tag;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.cloudburstmc.nbt.NbtList;
 import org.cloudburstmc.nbt.NbtMap;
-import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.cloudburstmc.nbt.NbtType;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.geysermc.erosion.util.BannerUtils.getJavaPatternTag;
-
 public class BannerItem extends BlockItem {
     /**
      * Holds what a Java ominous banner pattern looks like.
@@ -51,19 +51,20 @@ public class BannerItem extends BlockItem {
      * ominous banners that we set instead. This variable is used to detect Java ominous banner patterns, and apply
      * the correct ominous banner pattern if Bedrock pulls the item from creative.
      */
-    public static final ListTag OMINOUS_BANNER_PATTERN;
+    public static final List<BannerPatternLayer> OMINOUS_BANNER_PATTERN;
 
     static {
-        OMINOUS_BANNER_PATTERN = new ListTag("Patterns");
         // Construct what an ominous banner is supposed to look like
-        OMINOUS_BANNER_PATTERN.add(getJavaPatternTag("mr", 9));
+        OMINOUS_BANNER_PATTERN = List.of(
-        OMINOUS_BANNER_PATTERN.add(getJavaPatternTag("bs", 8));
+                new BannerPatternLayer("mr", 9),
-        OMINOUS_BANNER_PATTERN.add(getJavaPatternTag("cs", 7));
+                new BannerPatternLayer("bs", 8),
-        OMINOUS_BANNER_PATTERN.add(getJavaPatternTag("bo", 8));
+                new BannerPatternLayer("cs", 7),
-        OMINOUS_BANNER_PATTERN.add(getJavaPatternTag("ms", 15));
+                new BannerPatternLayer("bo", 8),
-        OMINOUS_BANNER_PATTERN.add(getJavaPatternTag("hh", 8));
+                new BannerPatternLayer("ms", 15),
-        OMINOUS_BANNER_PATTERN.add(getJavaPatternTag("mc", 8));
+                new BannerPatternLayer("hh", 8),
-        OMINOUS_BANNER_PATTERN.add(getJavaPatternTag("bo", 15));
+                new BannerPatternLayer("mc", 8),
+                new BannerPatternLayer("bo", 15)
+        );
     }
 
     /**
@@ -102,7 +103,7 @@ public class BannerItem extends BlockItem {
      * @return The Java edition format pattern nbt
      */
     public static CompoundTag getJavaBannerPattern(NbtMap pattern) {
-        return getJavaPatternTag(pattern.getString("Pattern"), 15 - pattern.getInt("Color"));
+        return new BannerPatternLayer(pattern.getString("Pattern"), 15 - pattern.getInt("Color"));
     }
 
     /**
@@ -122,14 +123,14 @@ public class BannerItem extends BlockItem {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
-        CompoundTag blockEntityTag = tag.remove("BlockEntityTag");
+        List<BannerPatternLayer> patterns = components.get(DataComponentType.BANNER_PATTERNS);
-        if (blockEntityTag != null && blockEntityTag.get("Patterns") instanceof ListTag patterns) {
+        if (patterns != null) {
             if (patterns.equals(OMINOUS_BANNER_PATTERN)) {
                 // Remove the current patterns and set the ominous banner type
-                tag.put(new IntTag("Type", 1));
+                builder.putInt("Type", 1);
             } else {
                 invertBannerColors(patterns);
                 tag.put(patterns);

core/src/main/java/org/geysermc/geyser/item/type/ChestItem.java

@@ -27,9 +27,10 @@ package org.geysermc.geyser.item.type;
 
 import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 
+@Deprecated
 public class ChestItem extends BlockItem {
 
     public ChestItem(String javaIdentifier, Builder builder) {
@@ -37,18 +38,7 @@ public class ChestItem extends BlockItem {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
-
-        // Strip the BlockEntityTag from the chests contents
-        // sent to the client. The client does not parse this
-        // or use it for anything, as this tag is fully
-        // server-side, so we remove it to reduce bandwidth and
-        // solve potential issues with very large tags.
-
-        // There was a problem in the past where this would strip
-        // NBT data in creative mode, however with the new server
-        // authoritative inventories, this is no longer a concern.
-        tag.remove("BlockEntityTag");
     }
 }

core/src/main/java/org/geysermc/geyser/item/type/CompassItem.java

@@ -26,17 +26,16 @@
 package org.geysermc.geyser.item.type;
 
 import com.github.steveice10.mc.protocol.data.game.item.ItemStack;
+import com.github.steveice10.mc.protocol.data.game.item.component.DataComponentType;
 import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents;
-import com.github.steveice10.opennbt.tag.builtin.ByteTag;
+import com.github.steveice10.mc.protocol.data.game.item.component.LodestoneTracker;
-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.github.steveice10.opennbt.tag.builtin.IntTag;
-import com.github.steveice10.opennbt.tag.builtin.Tag;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.cloudburstmc.nbt.NbtMapBuilder;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.registry.type.ItemMappings;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 
 public class CompassItem extends Item {
     public CompassItem(String javaIdentifier, Builder builder) {
@@ -45,36 +44,35 @@ public class CompassItem extends Item {
 
     @Override
     public ItemData.Builder translateToBedrock(ItemStack itemStack, ItemMapping mapping, ItemMappings mappings) {
-        if (isLodestoneCompass(itemStack.getNbt())) {
+        if (isLodestoneCompass(itemStack.getDataComponents())) {
             return super.translateToBedrock(itemStack, mappings.getLodestoneCompass(), mappings);
         }
         return super.translateToBedrock(itemStack, mapping, mappings);
     }
 
     @Override
-    public ItemMapping toBedrockDefinition(CompoundTag nbt, ItemMappings mappings) {
+    public ItemMapping toBedrockDefinition(DataComponents components, ItemMappings mappings) {
-        if (isLodestoneCompass(nbt)) {
+        if (isLodestoneCompass(components)) {
             return mappings.getLodestoneCompass();
         }
-        return super.toBedrockDefinition(nbt, mappings);
+        return super.toBedrockDefinition(components, mappings);
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
-        Tag lodestoneTag = tag.get("LodestoneTracked");
+        LodestoneTracker tracker = components.get(DataComponentType.LODESTONE_TRACKER);
-        if (lodestoneTag instanceof ByteTag) {
+        if (tracker != null) {
-            int trackId = session.getLodestoneCache().store(tag);
+            int trackId = session.getLodestoneCache().store(tracker);
             // Set the bedrock tracking id - will return 0 if invalid
-            tag.put(new IntTag("trackingHandle", trackId));
+            builder.putInt("trackingHandle", trackId);
         }
     }
 
-    private boolean isLodestoneCompass(CompoundTag nbt) {
+    private boolean isLodestoneCompass(@Nullable DataComponents components) {
-        if (nbt != null) {
+        if (components != null) {
-            Tag lodestoneTag = nbt.get("LodestoneTracked");
+            return components.getDataComponents().containsKey(DataComponentType.LODESTONE_TRACKER);
-            return lodestoneTag instanceof ByteTag;
         }
         return false;
     }

core/src/main/java/org/geysermc/geyser/item/type/CrossbowItem.java

@@ -26,44 +26,41 @@
 package org.geysermc.geyser.item.type;
 
 import com.github.steveice10.mc.protocol.data.game.item.ItemStack;
+import com.github.steveice10.mc.protocol.data.game.item.component.DataComponentType;
 import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents;
-import com.github.steveice10.opennbt.tag.builtin.*;
+import com.github.steveice10.opennbt.tag.builtin.ByteTag;
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.ListTag;
+import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 import org.geysermc.geyser.translator.item.ItemTranslator;
 
+import java.util.List;
+
 public class CrossbowItem extends Item {
     public CrossbowItem(String javaIdentifier, Builder builder) {
         super(javaIdentifier, builder);
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
-        ListTag chargedProjectiles = tag.get("ChargedProjectiles");
+        List<ItemStack> chargedProjectiles = components.get(DataComponentType.CHARGED_PROJECTILES);
-        if (chargedProjectiles != null) {
+        if (chargedProjectiles != null && !chargedProjectiles.isEmpty()) {
-            if (!chargedProjectiles.getValue().isEmpty()) {
+            ItemStack javaProjectile = chargedProjectiles.get(0);
-                CompoundTag javaProjectileAsNbt = (CompoundTag) chargedProjectiles.getValue().get(0);
 
-                ItemMapping projectileMapping = session.getItemMappings().getMapping((String) javaProjectileAsNbt.get("id").getValue());
+            ItemMapping projectileMapping = session.getItemMappings().getMapping(javaProjectile.getId());
-                if (projectileMapping == null) return;
+            ItemData itemData = ItemTranslator.translateToBedrock(session, javaProjectile);
-                @Nullable CompoundTag projectileTag = javaProjectileAsNbt.get("tag");
-                ItemStack itemStack = new ItemStack(projectileMapping.getJavaItem().javaId(), (byte) javaProjectileAsNbt.get("Count").getValue(), projectileTag);
-                ItemData itemData = ItemTranslator.translateToBedrock(session, itemStack);
 
-                CompoundTag newProjectile = new CompoundTag("chargedItem");
+            NbtMapBuilder newProjectile = BedrockItemBuilder.createItemNbt(projectileMapping, itemData.getCount(), itemData.getDamage());
-                newProjectile.put(new ByteTag("Count", (byte) itemData.getCount()));
-                newProjectile.put(new StringTag("Name", projectileMapping.getBedrockIdentifier()));
 
-                newProjectile.put(new ShortTag("Damage", (short) itemData.getDamage()));
+            builder.putCompound("chargedItem", newProjectile.build());
-
-                tag.put(newProjectile);
-            }
         }
     }
 

core/src/main/java/org/geysermc/geyser/item/type/DecoratedPotItem.java

@@ -25,12 +25,11 @@
 
 package org.geysermc.geyser.item.type;
 
+import com.github.steveice10.mc.protocol.data.game.item.component.DataComponentType;
 import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents;
-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
-import com.github.steveice10.opennbt.tag.builtin.ListTag;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 
 public class DecoratedPotItem extends BlockItem {
 
@@ -39,14 +38,15 @@ public class DecoratedPotItem extends BlockItem {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
-        if (tag.remove("BlockEntityTag") instanceof CompoundTag blockEntityTag) {
+        components.get(DataComponentType.POT_DECORATIONS); // TODO
-            if (blockEntityTag.remove("sherds") instanceof ListTag sherds) {
+//        if (tag.remove("BlockEntityTag") instanceof CompoundTag blockEntityTag) {
-                // bedrock wants it on the root level
+//            if (blockEntityTag.remove("sherds") instanceof ListTag sherds) {
-                tag.put(sherds);
+//                // bedrock wants it on the root level
-            }
+//                tag.put(sherds);
-        }
+//            }
+//        }
     }
 }

core/src/main/java/org/geysermc/geyser/item/type/DyeableArmorItem.java

@@ -28,11 +28,11 @@ package org.geysermc.geyser.item.type;
 import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.item.ArmorMaterial;
 import org.geysermc.geyser.item.DyeableLeatherItem;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 
 public class DyeableArmorItem extends ArmorItem implements DyeableLeatherItem {
     public DyeableArmorItem(String javaIdentifier, ArmorMaterial material, Builder builder) {
@@ -40,10 +40,10 @@ public class DyeableArmorItem extends ArmorItem implements DyeableLeatherItem {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
-        DyeableLeatherItem.translateNbtToBedrock(tag);
+        DyeableLeatherItem.translateComponentsToBedrock(components, builder);
     }
 
     @Override

core/src/main/java/org/geysermc/geyser/item/type/DyeableHorseArmorItem.java

@@ -28,10 +28,10 @@ package org.geysermc.geyser.item.type;
 import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.item.DyeableLeatherItem;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 
 public class DyeableHorseArmorItem extends Item implements DyeableLeatherItem {
     public DyeableHorseArmorItem(String javaIdentifier, Builder builder) {
@@ -39,10 +39,10 @@ public class DyeableHorseArmorItem extends Item implements DyeableLeatherItem {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
-        DyeableLeatherItem.translateNbtToBedrock(tag);
+        DyeableLeatherItem.translateComponentsToBedrock(components, builder);
     }
 
     @Override

core/src/main/java/org/geysermc/geyser/item/type/EnchantedBookItem.java

@@ -30,8 +30,8 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.ListTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,7 +42,7 @@ public class EnchantedBookItem extends Item {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
         List<Tag> newTags = new ArrayList<>();

core/src/main/java/org/geysermc/geyser/item/type/FilledMapItem.java

@@ -26,8 +26,8 @@
 package org.geysermc.geyser.item.type;
 
 import com.github.steveice10.mc.protocol.data.game.item.ItemStack;
-import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.mc.protocol.data.game.item.component.DataComponentType;
-import com.github.steveice10.opennbt.tag.builtin.Tag;
+import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents;
 import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
 import org.geysermc.geyser.registry.type.ItemMapping;
@@ -41,16 +41,16 @@ public class FilledMapItem extends MapItem {
     @Override
     public ItemData.Builder translateToBedrock(ItemStack itemStack, ItemMapping mapping, ItemMappings mappings) {
         ItemData.Builder builder = super.translateToBedrock(itemStack, mapping, mappings);
-        CompoundTag nbt = itemStack.getNbt();
+        DataComponents components = itemStack.getDataComponents();
-        if (nbt == null) {
+        if (components == null) {
             // This is a fallback for maps with no nbt (Change added back in June 2020; is it needed in 2023?)
             return builder.tag(NbtMap.builder().putInt("map", 0).build());
-        } else if (nbt.get("display") instanceof CompoundTag display) {
+        } else {
-            // Note: damage 5 treasure map, 6 ???
+            Integer mapColor = components.get(DataComponentType.MAP_COLOR);
-            Tag mapColor = display.get("MapColor");
+            if (mapColor != null) {
-            if (mapColor != null && mapColor.getValue() instanceof Number color) {
+                // Note: damage 5 treasure map, 6 ???
                 // Java Edition allows any color; Bedrock only allows some. So let's take what colors we can get
-                switch (color.intValue()) {
+                switch (mapColor) {
                     case 3830373 -> builder.damage(3); // Ocean Monument
                     case 5393476 -> builder.damage(4); // Woodland explorer
                 }

core/src/main/java/org/geysermc/geyser/item/type/FireworkRocketItem.java

@@ -25,44 +25,47 @@
 
 package org.geysermc.geyser.item.type;
 
+import com.github.steveice10.mc.protocol.data.game.item.component.DataComponentType;
 import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents;
+import com.github.steveice10.mc.protocol.data.game.item.component.Fireworks;
 import com.github.steveice10.opennbt.tag.builtin.*;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.level.FireworkColor;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 import org.geysermc.geyser.util.MathUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class FireworkRocketItem extends Item {
     public FireworkRocketItem(String javaIdentifier, Builder builder) {
         super(javaIdentifier, builder);
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
-        CompoundTag fireworks = tag.get("Fireworks");
+        Fireworks fireworks = components.get(DataComponentType.FIREWORKS);
         if (fireworks == null) {
             return;
         }
+        NbtMapBuilder fireworksNbt = NbtMap.builder();
+        fireworksNbt.putByte("Flight", (byte) fireworks.getFlightDuration());
 
-        if (fireworks.get("Flight") != null) {
+        List<Fireworks.FireworkExplosion> explosions = fireworks.getExplosions();
-            fireworks.put(new ByteTag("Flight", MathUtils.getNbtByte(fireworks.get("Flight").getValue())));
+        if (explosions.isEmpty()) {
-        }
-
-        ListTag explosions = fireworks.get("Explosions");
-        if (explosions == null) {
             return;
         }
-        for (Tag effect : explosions.getValue()) {
+        List<NbtMap> explosionNbt = new ArrayList<>();
-            CompoundTag effectData = (CompoundTag) effect;
+        for (Fireworks.FireworkExplosion explosion : explosions) {
-            CompoundTag newEffectData = translateExplosionToBedrock(effectData, "");
+            explosionNbt.add(translateExplosionToBedrock(explosion, ""));
-
-            explosions.remove(effectData);
-            explosions.add(newEffectData);
         }
+
     }
 
     @Override
@@ -70,13 +73,15 @@ public class FireworkRocketItem extends Item {
         super.translateNbtToJava(tag, mapping);
     }
 
-    static CompoundTag translateExplosionToBedrock(CompoundTag explosion, String newName) {
+    static NbtMap translateExplosionToBedrock(Fireworks.FireworkExplosion explosion, String newName) {
-        CompoundTag newExplosionData = new CompoundTag(newName);
+        NbtMapBuilder newExplosionData = NbtMap.builder();
 
         if (explosion.get("Type") != null) {
             newExplosionData.put(new ByteTag("FireworkType", MathUtils.getNbtByte(explosion.get("Type").getValue())));
         }
+        //newExplosionData.putByte("FireworkType", explosion.get) //TODO???
 
+        // TODO do we need length checks
         if (explosion.get("Colors") != null) {
             int[] oldColors = (int[]) explosion.get("Colors").getValue();
             byte[] colors = new byte[oldColors.length];
@@ -101,15 +106,10 @@ public class FireworkRocketItem extends Item {
             newExplosionData.put(new ByteArrayTag("FireworkFade", colors));
         }
 
-        if (explosion.get("Trail") != null) {
+        newExplosionData.putBoolean("FireworkTrail", explosion.isHasTrail());
-            newExplosionData.put(new ByteTag("FireworkTrail", MathUtils.getNbtByte(explosion.get("Trail").getValue())));
+        newExplosionData.putBoolean("FireworkFlicker", explosion.isHasTwinkle()); // TODO verify
-        }
 
-        if (explosion.get("Flicker") != null) {
+        return newExplosionData.build();
-            newExplosionData.put(new ByteTag("FireworkFlicker", MathUtils.getNbtByte(explosion.get("Flicker").getValue())));
-        }
-
-        return newExplosionData;
     }
 
     static CompoundTag translateExplosionToJava(CompoundTag explosion, String newName) {

core/src/main/java/org/geysermc/geyser/item/type/FireworkStarItem.java

@@ -31,9 +31,9 @@ import com.github.steveice10.opennbt.tag.builtin.IntArrayTag;
 import com.github.steveice10.opennbt.tag.builtin.IntTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 
 public class FireworkStarItem extends Item {
     public FireworkStarItem(String javaIdentifier, Builder builder) {
@@ -41,7 +41,7 @@ public class FireworkStarItem extends Item {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
         Tag explosion = tag.remove("Explosion");

core/src/main/java/org/geysermc/geyser/item/type/FishingRodItem.java

@@ -29,8 +29,8 @@ import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents
 import com.github.steveice10.opennbt.tag.builtin.IntTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 
 public class FishingRodItem extends Item {
     public FishingRodItem(String javaIdentifier, Builder builder) {
@@ -38,7 +38,7 @@ public class FishingRodItem extends Item {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
         // Fix damage inconsistency

core/src/main/java/org/geysermc/geyser/item/type/Item.java

@@ -34,10 +34,8 @@ import com.github.steveice10.opennbt.tag.builtin.*;
 import net.kyori.adventure.text.Component;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import org.cloudburstmc.nbt.NbtList;
 import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.nbt.NbtMapBuilder;
-import org.cloudburstmc.nbt.NbtType;
 import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
 import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.inventory.item.Enchantment;
@@ -46,6 +44,7 @@ import org.geysermc.geyser.registry.type.ItemMappings;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.text.ChatColor;
 import org.geysermc.geyser.text.MinecraftLocale;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 import org.geysermc.geyser.translator.item.ItemTranslator;
 import org.geysermc.geyser.translator.text.MessageTranslator;
 import org.geysermc.geyser.util.InventoryUtils;
@@ -120,29 +119,20 @@ public class Item {
         return new ItemStack(javaId, itemData.getCount(), ItemTranslator.translateToJavaNBT("", itemData.getTag()));
     }
 
-    public ItemMapping toBedrockDefinition(CompoundTag nbt, ItemMappings mappings) {
+    public ItemMapping toBedrockDefinition(DataComponents components, ItemMappings mappings) {
         return mappings.getMapping(javaId);
     }
 
     /**
      * Takes components from Java Edition and map them into Bedrock.
      */
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
-//        // Basing off of ItemStack#getHoverName as of 1.20.5. VERIFY??
-//        Component customName = components.get(DataComponentType.CUSTOM_NAME);
-//        if (customName == null) {
-//            customName = components.get(DataComponentType.ITEM_NAME);
-//        }
-//        if (customName != null) {
-//
-//        }
         List<Component> loreComponents = components.get(DataComponentType.LORE);
         if (loreComponents != null) {
-            List<String> lore = new ArrayList<>();
+            List<String> lore = builder.getOrCreateLore();
             for (Component loreComponent : loreComponents) {
                 lore.add(MessageTranslator.convertMessage(loreComponent, session.locale()));
             }
-            builder.putList("Lore", NbtType.STRING, lore);
         }
 
         List<Tag> newTags = new ArrayList<>();

core/src/main/java/org/geysermc/geyser/item/type/MapItem.java

@@ -28,9 +28,9 @@ package org.geysermc.geyser.item.type;
 import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents;
 import com.github.steveice10.opennbt.tag.builtin.*;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 
 public class MapItem extends Item {
     public MapItem(String javaIdentifier, Builder builder) {
@@ -38,7 +38,7 @@ public class MapItem extends Item {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
         Tag mapId = tag.remove("map");

core/src/main/java/org/geysermc/geyser/item/type/PlayerHeadItem.java

@@ -30,10 +30,10 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.text.ChatColor;
 import org.geysermc.geyser.text.MinecraftLocale;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 import org.geysermc.geyser.translator.text.MessageTranslator;
 
 public class PlayerHeadItem extends Item {
@@ -42,7 +42,7 @@ public class PlayerHeadItem extends Item {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
         CompoundTag displayTag;

core/src/main/java/org/geysermc/geyser/item/type/ShieldItem.java

@@ -31,9 +31,9 @@ import com.github.steveice10.opennbt.tag.builtin.IntTag;
 import com.github.steveice10.opennbt.tag.builtin.ListTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.item.components.ToolTier;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 
 public class ShieldItem extends Item {
     public ShieldItem(String javaIdentifier, Builder builder) {
@@ -41,7 +41,7 @@ public class ShieldItem extends Item {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
         if (tag.remove("BlockEntityTag") instanceof CompoundTag blockEntityTag) {

core/src/main/java/org/geysermc/geyser/item/type/ShulkerBoxItem.java

@@ -36,6 +36,7 @@ import org.cloudburstmc.nbt.NbtType;
 import org.geysermc.geyser.item.Items;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 import org.geysermc.geyser.translator.item.ItemTranslator;
 
 import java.util.ArrayList;
@@ -47,7 +48,7 @@ public class ShulkerBoxItem extends BlockItem {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
         List<ItemStack> contents = components.get(DataComponentType.CONTAINER);
@@ -61,15 +62,12 @@ public class ShulkerBoxItem extends BlockItem {
             if (item.getId() == Items.AIR_ID) {
                 continue;
             }
-            NbtMapBuilder boxItemNbt = NbtMap.builder(); // Final item tag to add to the list
-            boxItemNbt.putByte("Slot", (byte) slot);
-            boxItemNbt.putByte("WasPickedUp", (byte) 0); // ???
-
             ItemMapping boxMapping = session.getItemMappings().getMapping(item.getId());
 
-            boxItemNbt.putString("Name", boxMapping.getBedrockIdentifier());
+            NbtMapBuilder boxItemNbt = BedrockItemBuilder.createItemNbt(boxMapping, item.getAmount(), boxMapping.getBedrockData()); // Final item tag to add to the list
-            boxItemNbt.putShort("Damage", (short) boxMapping.getBedrockData());
+            boxItemNbt.putByte("Slot", (byte) slot);
-            boxItemNbt.putByte("Count", (byte) item.getAmount());
+            boxItemNbt.putByte("WasPickedUp", (byte) 0); // ??? TODO might not be needed
+
             // Only the display name is what we have interest in, so just translate that if relevant
             DataComponents boxComponents = item.getDataComponents();
             if (boxComponents != null) {
@@ -85,7 +83,7 @@ public class ShulkerBoxItem extends BlockItem {
 
             itemsList.add(boxItemNbt.build());
         }
-        builder.putList("Items", NbtType.COMPOUND, itemsList);
+        builder.getOrCreateNbt().putList("Items", NbtType.COMPOUND, itemsList);
     }
 
     @Override

core/src/main/java/org/geysermc/geyser/item/type/TropicalFishBucketItem.java

@@ -32,10 +32,10 @@ import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextDecoration;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.entity.type.living.animal.TropicalFishEntity;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.text.MinecraftLocale;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 import org.geysermc.geyser.translator.text.MessageTranslator;
 
 import java.util.ArrayList;
@@ -49,7 +49,7 @@ public class TropicalFishBucketItem extends Item {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
         // Prevent name from appearing as "Bucket of"

core/src/main/java/org/geysermc/geyser/item/type/WritableBookItem.java

@@ -31,9 +31,9 @@ import com.github.steveice10.opennbt.tag.builtin.ListTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 import org.geysermc.geyser.translator.text.MessageTranslator;
 
 import java.util.ArrayList;
@@ -45,7 +45,7 @@ public class WritableBookItem extends Item {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         super.translateComponentsToBedrock(session, components, builder);
 
         ListTag pagesTag = tag.remove("pages");

core/src/main/java/org/geysermc/geyser/item/type/WrittenBookItem.java

@@ -33,8 +33,8 @@ import com.github.steveice10.opennbt.tag.builtin.Tag;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.geysermc.geyser.session.GeyserSession;
+import org.geysermc.geyser.translator.item.BedrockItemBuilder;
 import org.geysermc.geyser.translator.text.MessageTranslator;
 
 import java.util.List;
@@ -50,7 +50,7 @@ public class WrittenBookItem extends WritableBookItem {
     }
 
     @Override
-    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull NbtMapBuilder builder) {
+    public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         boolean isValid = isValidWrittenBook(tag);
         if (!isValid) {
             tag.remove("pages");

core/src/main/java/org/geysermc/geyser/session/cache/LodestoneCache.java

@@ -25,6 +25,7 @@
 
 package org.geysermc.geyser.session.cache;
 
+import com.github.steveice10.mc.protocol.data.game.item.component.LodestoneTracker;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.IntTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
@@ -88,7 +89,7 @@ public final class LodestoneCache {
         this.activeLodestones.put(itemStack, new LodestonePos(id++, x, y, z, dim));
     }
 
-    public int store(CompoundTag tag) {
+    public int store(LodestoneTracker tracker) {
         CompoundTag lodestonePos = tag.get("LodestonePos");
         if (lodestonePos == null) {
             // invalid

core/src/main/java/org/geysermc/geyser/translator/item/BedrockItemBuilder.java

@@ -30,6 +30,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.nbt.NbtMapBuilder;
 import org.cloudburstmc.nbt.NbtType;
+import org.geysermc.geyser.registry.type.ItemMapping;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -70,6 +71,28 @@ public final class BedrockItemBuilder {
         return builder;
     }
 
+    // NBT convenience methods. Returns NbtMapBuilder since that's what's used the most
+
+    public NbtMapBuilder putByte(String name, byte value) {
+        return getOrCreateNbt().putByte(name, value);
+    }
+
+    public NbtMapBuilder putByte(String name, int value) {
+        return getOrCreateNbt().putByte(name, (byte) value);
+    }
+
+    public NbtMapBuilder putInt(String name, int value) {
+        return getOrCreateNbt().putInt(name, value);
+    }
+
+    public NbtMapBuilder putString(String name, String value) {
+        return getOrCreateNbt().putString(name, value);
+    }
+
+    public NbtMapBuilder putCompound(String name, NbtMap value) {
+        return getOrCreateNbt().putCompound(name, value);
+    }
+
     /**
      * @return null if no NBT is needed on this item.
      */
@@ -90,4 +113,16 @@ public final class BedrockItemBuilder {
         }
         return builder.build();
     }
+
+    /**
+     * Creates item NBT with count, name, and damage set.
+     */
+    public static NbtMapBuilder createItemNbt(ItemMapping mapping, int count, int damage) {
+        NbtMapBuilder builder = NbtMap.builder();
+        builder.putByte("Count", (byte) count);
+        builder.putString("Name", mapping.getBedrockIdentifier());
+
+        builder.putShort("Damage", (short) damage);
+        return builder;
+    }
 }

core/src/main/java/org/geysermc/geyser/translator/item/ItemTranslator.java

@@ -141,7 +141,7 @@ public final class ItemTranslator {
         BedrockItemBuilder nbtBuilder = new BedrockItemBuilder();
 
         if (components != null) {
-            javaItem.translateComponentsToBedrock(session, components, nbtBuilder.getOrCreateNbt());
+            javaItem.translateComponentsToBedrock(session, components, nbtBuilder);
         }
 
         String customName = getCustomName(session, components, bedrockItem);