More work on 1.21.4 changes

Author: onebeastchris

core/src/main/java/org/geysermc/geyser/inventory/updater/AnvilInventoryUpdater.java

@@ -52,7 +52,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.stream.IntStream;
 
 public class AnvilInventoryUpdater extends InventoryUpdater {
     public static final AnvilInventoryUpdater INSTANCE = new AnvilInventoryUpdater();
@@ -266,14 +265,14 @@ public int calcLevelCost(GeyserSession session, AnvilContainer anvilContainer, b
      */
     private int calcRepairLevelCost(GeyserItemStack input, GeyserItemStack material) {
         int newDamage = getDamage(input);
-        int unitRepair = Math.min(newDamage, input.asItem().maxDamage() / 4);
+        int unitRepair = Math.min(newDamage, input.asItem().defaultMaxDamage() / 4);
         if (unitRepair <= 0) {
             // No damage to repair
             return -1;
         }
         for (int i = 0; i < material.getAmount(); i++) {
             newDamage -= unitRepair;
-            unitRepair = Math.min(newDamage, input.asItem().maxDamage() / 4);
+            unitRepair = Math.min(newDamage, input.asItem().defaultMaxDamage() / 4);
             if (unitRepair <= 0) {
                 return i + 1;
             }
@@ -290,7 +289,7 @@ private int calcRepairLevelCost(GeyserItemStack input, GeyserItemStack material)
      */
     private int calcMergeRepairCost(GeyserItemStack input, GeyserItemStack material) {
         // If the material item is damaged 112% or more, then the input item will not be repaired
-        if (getDamage(input) > 0 && getDamage(material) < (material.asItem().maxDamage() * 112 / 100)) {
+        if (getDamage(input) > 0 && getDamage(material) < (material.asItem().defaultMaxDamage() * 112 / 100)) {
             return 2;
         }
         return 0;
@@ -419,7 +418,7 @@ private int getRepairCost(GeyserItemStack itemStack) {
     }
 
     private boolean hasDurability(GeyserItemStack itemStack) {
-        if (itemStack.asItem().maxDamage() > 0) {
+        if (itemStack.asItem().defaultMaxDamage() > 0) {
             return itemStack.getComponent(DataComponentType.UNBREAKABLE, false);
         }
         return false;

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

@@ -25,12 +25,6 @@
 
 package org.geysermc.geyser.item.type;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
-import org.geysermc.geyser.session.GeyserSession;
-import org.geysermc.geyser.translator.item.BedrockItemBuilder;
-import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponents;
-
+// Whether this item should have its NBT data kept in the recipe book.
 public interface BedrockRequiresTagItem {
-
-    void addRequiredNbt(GeyserSession session, @Nullable DataComponents components, BedrockItemBuilder builder);
 }

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

@@ -27,7 +27,6 @@
 
 import it.unimi.dsi.fastutil.ints.IntArrays;
 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;
@@ -142,20 +141,4 @@ static Fireworks.FireworkExplosion translateExplosionToJava(NbtMap explosion) {
             return null;
         }
     }
-
-    @Override
-    public void addRequiredNbt(GeyserSession session, @Nullable DataComponents components, BedrockItemBuilder builder) {
-        if (components != null) {
-            Fireworks fireworks = components.get(DataComponentType.FIREWORKS);
-            if (fireworks != null) {
-                // Already translated
-                return;
-            }
-        }
-
-        NbtMapBuilder fireworksNbt = NbtMap.builder();
-        fireworksNbt.putByte("Flight", (byte) 1);
-        fireworksNbt.put("Explosions", NbtList.EMPTY);
-        builder.putCompound("Fireworks", fireworksNbt.build());
-    }
 }

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

@@ -62,23 +62,16 @@ public class Item {
     private static final Map<Block, Item> BLOCK_TO_ITEM = new HashMap<>();
     protected final Key javaIdentifier;
     private int javaId = -1;
-
-    // TODO remove these
-    private final int stackSize;
     private final int attackDamage;
-    private final int maxDamage;
-    private final Rarity rarity;
-    private final boolean glint;
+    private final DataComponents baseComponents;
 
-    private DataComponents dataComponents;
+    private final List<Item> enchantmentGlintPresent = List.of(Items.ENCHANTED_GOLDEN_APPLE, Items.EXPERIENCE_BOTTLE, Items.WRITTEN_BOOK,
+        Items.NETHER_STAR, Items.ENCHANTED_BOOK, Items.END_CRYSTAL);
 
     public Item(String javaIdentifier, Builder builder) {
         this.javaIdentifier = MinecraftKey.key(javaIdentifier);
-        this.stackSize = builder.stackSize;
-        this.maxDamage = builder.maxDamage;
+        this.baseComponents = builder.components;
         this.attackDamage = builder.attackDamage;
-        this.rarity = builder.rarity;
-        this.glint = builder.glint;
     }
 
     public String javaIdentifier() {
@@ -89,24 +82,28 @@ public int javaId() {
         return javaId;
     }
 
-    public int maxDamage() {
-        return dataComponents.getOrDefault(DataComponentType.MAX_DAMAGE, 0);
+    public int defaultMaxDamage() {
+        return baseComponents.getOrDefault(DataComponentType.MAX_DAMAGE, 0);
     }
 
-    public int attackDamage() {
+    public int defaultAttackDamage() {
         return attackDamage;
     }
 
-    public int maxStackSize() {
-        return dataComponents.getOrDefault(DataComponentType.MAX_STACK_SIZE, 1);
+    public int defaultMaxStackSize() {
+        return baseComponents.getOrDefault(DataComponentType.MAX_STACK_SIZE, 1);
     }
 
-    public Rarity rarity() {
-        return rarity;
+    public Rarity defaultRarity() {
+        return Rarity.fromId(baseComponents.getOrDefault(DataComponentType.RARITY, 0));
     }
 
-    public boolean glint() {
-        return glint;
+    public DataComponents gatherComponents(DataComponents others) {
+        if (others == null) return baseComponents.clone();
+
+        DataComponents components = baseComponents.clone();
+        components.getDataComponents().putAll(others.getDataComponents());
+        return components;
     }
 
     public boolean isValidRepairItem(Item other) {
@@ -295,32 +292,28 @@ protected static void registerBlock(Block block, Item item) {
     }
 
     public static Builder builder() {
-        return new Builder();
+        return new Builder().components(new DataComponents(new HashMap<>())); // TODO actually set components here
     }
 
     public static final class Builder {
-        private int stackSize = 64;
-        private int maxDamage;
+        private DataComponents components;
         private int attackDamage;
-        private Rarity rarity = Rarity.COMMON;
-        private boolean glint = false;
-
-        public Builder stackSize(int stackSize) {
-            this.stackSize = stackSize;
-            return this;
-        }
 
         public Builder attackDamage(double attackDamage) {
-            // TODO properly store/send a double value once Bedrock supports it.. pls
+            // Bedrock edition does not support attack damage being a double
             this.attackDamage = (int) attackDamage;
             return this;
         }
 
-        public Builder maxDamage(int maxDamage) {
-            this.maxDamage = maxDamage;
+        public Builder components(DataComponents components) {
+            this.components = components;
             return this;
         }
 
+        public DataComponents components() {
+            return this.components;
+        }
+
         private Builder() {
         }
     }

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

@@ -48,6 +48,8 @@
 import org.geysermc.geyser.registry.type.GeyserMappingItem;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.registry.type.NonVanillaItemRegistration;
+import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentType;
+import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponents;
 
 import java.util.*;
 
@@ -129,10 +131,11 @@ public static NonVanillaItemRegistration registerCustomItem(NonVanillaCustomItem
 
         Set<String> repairMaterials = customItemData.repairMaterials();
 
-        Item.Builder itemBuilder = Item.builder()
-                .stackSize(customItemData.stackSize())
-                .maxDamage(customItemData.maxDamage());
-        Item item = new Item(customIdentifier, itemBuilder) {
+        DataComponents components = new DataComponents(new HashMap<>());
+        components.put(DataComponentType.MAX_STACK_SIZE, customItemData.stackSize());
+        components.put(DataComponentType.MAX_DAMAGE, customItemData.maxDamage());
+
+        Item item = new Item(customIdentifier, Item.builder().components(components)) {
             @Override
             public boolean isValidRepairItem(Item other) {
                 return repairMaterials != null && repairMaterials.contains(other.javaIdentifier());
@@ -167,11 +170,11 @@ private static NbtMapBuilder createComponentNbt(CustomItemData customItemData, I
         NbtMapBuilder itemProperties = NbtMap.builder();
         NbtMapBuilder componentBuilder = NbtMap.builder();
 
-        setupBasicItemInfo(javaItem.maxDamage(), javaItem.maxStackSize(), mapping.getToolType() != null || customItemData.displayHandheld(), customItemData, itemProperties, componentBuilder, protocolVersion);
+        setupBasicItemInfo(javaItem.defaultMaxDamage(), javaItem.defaultMaxStackSize(), mapping.getToolType() != null || customItemData.displayHandheld(), customItemData, itemProperties, componentBuilder, protocolVersion);
 
         boolean canDestroyInCreative = true;
         if (mapping.getToolType() != null) { // This is not using the isTool boolean because it is not just a render type here.
-            canDestroyInCreative = computeToolProperties(mapping.getToolType(), itemProperties, componentBuilder, javaItem.attackDamage());
+            canDestroyInCreative = computeToolProperties(mapping.getToolType(), itemProperties, componentBuilder, javaItem.defaultAttackDamage());
         }
         itemProperties.putBoolean("can_destroy_in_creative", canDestroyInCreative);
 

core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator.java

@@ -447,7 +447,7 @@ public static void populate() {
                     }
                 }
 
-                if (javaOnlyItems.contains(javaItem) || javaItem.rarity() != Rarity.COMMON) {
+                if (javaOnlyItems.contains(javaItem) || javaItem.defaultRarity() != Rarity.COMMON) {
                     // These items don't exist on Bedrock, so set up a variable that indicates they should have custom names
                     // Or, ensure that we are translating these at all times to account for rarity colouring
                     mappingBuilder = mappingBuilder.translationString((javaItem instanceof BlockItem ? "block." : "item.") + entry.getKey().replace(":", "."));

core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java

@@ -62,7 +62,7 @@ public static ItemDefinition getCustomItem(DataComponents components, ItemMappin
             }
         }
 
-        boolean checkDamage = mapping.getJavaItem().maxDamage() > 0;
+        boolean checkDamage = mapping.getJavaItem().defaultMaxDamage() > 0;
         int damage = !checkDamage ? 0 : components.getOrDefault(DataComponentType.DAMAGE, 0);
         boolean unbreakable = checkDamage && !isDamaged(components, damage);
 

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

@@ -40,7 +40,6 @@
 import org.geysermc.geyser.inventory.GeyserItemStack;
 import org.geysermc.geyser.item.Items;
 import org.geysermc.geyser.item.components.Rarity;
-import org.geysermc.geyser.item.type.BedrockRequiresTagItem;
 import org.geysermc.geyser.item.type.Item;
 import org.geysermc.geyser.level.block.type.Block;
 import org.geysermc.geyser.registry.BlockRegistries;
@@ -150,50 +149,32 @@ public static ItemData translateToBedrock(GeyserSession session, ItemStack stack
     public static ItemData.@NonNull Builder translateToBedrock(GeyserSession session, Item javaItem, ItemMapping bedrockItem, int count, @Nullable DataComponents components) {
         BedrockItemBuilder nbtBuilder = new BedrockItemBuilder();
 
-        boolean hideTooltips = false;
-        if (components != null) {
-            javaItem.translateComponentsToBedrock(session, components, nbtBuilder);
-            if (components.get(DataComponentType.HIDE_TOOLTIP) != null) hideTooltips = true;
-        }
-
-        // Fixes fireworks crafting recipe: they always contain a tag
-        // TODO remove once all items have their default components
-        if (javaItem instanceof BedrockRequiresTagItem requiresTagItem) {
-            requiresTagItem.addRequiredNbt(session, components, nbtBuilder);
-        }
+        // Populates default components that aren't sent over the network
+        components = javaItem.gatherComponents(components);
 
-        Rarity rarity = javaItem.rarity();
-        boolean enchantmentGlint = javaItem.glint();
-        if (components != null) {
-            Integer rarityIndex = components.get(DataComponentType.RARITY);
-            if (rarityIndex != null) {
-                rarity = Rarity.fromId(rarityIndex);
-            }
-            Boolean enchantmentGlintOverride = components.get(DataComponentType.ENCHANTMENT_GLINT_OVERRIDE);
-            if (enchantmentGlintOverride != null) {
-                enchantmentGlint = enchantmentGlintOverride;
-            }
-        }
+        // Translate item-specific components
+        javaItem.translateComponentsToBedrock(session, components, nbtBuilder);
 
+        Rarity rarity = Rarity.fromId(components.getOrDefault(DataComponentType.RARITY, 0));
         String customName = getCustomName(session, components, bedrockItem, rarity.getColor());
         if (customName != null) {
             nbtBuilder.setCustomName(customName);
         }
 
-        if (components != null) {
-            ItemAttributeModifiers attributeModifiers = components.get(DataComponentType.ATTRIBUTE_MODIFIERS);
-            if (attributeModifiers != null && attributeModifiers.isShowInTooltip() && !hideTooltips) {
-                // only add if attribute modifiers do not indicate to hide them
-                addAttributeLore(attributeModifiers, nbtBuilder, session.locale());
-            }
+        boolean hideTooltips = components.get(DataComponentType.HIDE_TOOLTIP) != null;
+
+        ItemAttributeModifiers attributeModifiers = components.get(DataComponentType.ATTRIBUTE_MODIFIERS);
+        if (attributeModifiers != null && attributeModifiers.isShowInTooltip() && !hideTooltips) {
+            // only add if attribute modifiers do not indicate to hide them
+            addAttributeLore(attributeModifiers, nbtBuilder, session.locale());
         }
 
         if (session.isAdvancedTooltips() && !hideTooltips) {
             addAdvancedTooltips(components, nbtBuilder, javaItem, session.locale());
         }
 
         // Add enchantment override. We can't remove it - enchantments would stop showing - but we can add it.
-        if (enchantmentGlint) {
+        if (components.getOrDefault(DataComponentType.ENCHANTMENT_GLINT_OVERRIDE, false)) {
             NbtMapBuilder nbtMapBuilder = nbtBuilder.getOrCreateNbt();
             nbtMapBuilder.putIfAbsent("ench", NbtList.EMPTY);
         }
@@ -217,18 +198,16 @@ public static ItemData translateToBedrock(GeyserSession session, ItemStack stack
 
         translateCustomItem(components, builder, bedrockItem);
 
-        if (components != null) {
-            // Translate the canDestroy and canPlaceOn Java components
-            AdventureModePredicate canDestroy = components.get(DataComponentType.CAN_BREAK);
-            AdventureModePredicate canPlaceOn = components.get(DataComponentType.CAN_PLACE_ON);
-            String[] canBreak = getCanModify(session, canDestroy);
-            String[] canPlace = getCanModify(session, canPlaceOn);
-            if (canBreak != null) {
-                builder.canBreak(canBreak);
-            }
-            if (canPlace != null) {
-                builder.canPlace(canPlace);
-            }
+        // Translate the canDestroy and canPlaceOn Java components
+        AdventureModePredicate canDestroy = components.get(DataComponentType.CAN_BREAK);
+        AdventureModePredicate canPlaceOn = components.get(DataComponentType.CAN_PLACE_ON);
+        String[] canBreak = getCanModify(session, canDestroy);
+        String[] canPlace = getCanModify(session, canPlaceOn);
+        if (canBreak != null) {
+            builder.canBreak(canBreak);
+        }
+        if (canPlace != null) {
+            builder.canPlace(canPlace);
         }
 
         return builder;
@@ -325,7 +304,7 @@ private static String attributeToLore(int attribute, ItemAttributeModifiers.Attr
     }
 
     private static void addAdvancedTooltips(@Nullable DataComponents components, BedrockItemBuilder builder, Item item, String language) {
-        int maxDurability = item.maxDamage();
+        int maxDurability = item.defaultMaxDamage();
 
         if (maxDurability != 0 && components != null) {
             Integer durabilityComponent = components.get(DataComponentType.DAMAGE);