From 6cda7c2202716525f525dff7f8efa00b5e0949ea Mon Sep 17 00:00:00 2001
From: YHDiamond <47502993+YHDiamond@users.noreply.github.com>
Date: Sun, 16 Jun 2024 15:01:21 -0400
Subject: [PATCH] Partially implement handling of "hide_tooltip" and fix
 attribute modifiers in "Armor" category not showing (#4731)

* Skip lore creation if hide tooltips exists

* Fix not showing attributes for "Armor" category

* Minor refactor

---------

Co-authored-by: chris <github@onechris.mozmail.com>
---
 .../org/geysermc/geyser/item/type/Item.java   |  2 +-
 .../translator/item/ItemTranslator.java       | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/item/type/Item.java b/core/src/main/java/org/geysermc/geyser/item/type/Item.java
index 0b2521a3e..362b760c7 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/Item.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/Item.java
@@ -125,7 +125,7 @@ public class Item {
      */
     public void translateComponentsToBedrock(@NonNull GeyserSession session, @NonNull DataComponents components, @NonNull BedrockItemBuilder builder) {
         List<Component> loreComponents = components.get(DataComponentType.LORE);
-        if (loreComponents != null) {
+        if (loreComponents != null && components.get(DataComponentType.HIDE_TOOLTIP) == null) {
             List<String> lore = builder.getOrCreateLore();
             for (Component loreComponent : loreComponents) {
                 lore.add(MessageTranslator.convertMessage(loreComponent, session.locale()));
diff --git a/core/src/main/java/org/geysermc/geyser/translator/item/ItemTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/item/ItemTranslator.java
index 672d2d7a5..7572f5e61 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/item/ItemTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/item/ItemTranslator.java
@@ -65,6 +65,12 @@ public final class ItemTranslator {
      * The order of these slots is their display order on Java Edition clients
      */
     private static final EnumMap<ItemAttributeModifiers.EquipmentSlotGroup, String> SLOT_NAMES;
+    private static final ItemAttributeModifiers.EquipmentSlotGroup[] ARMOR_SLOT_NAMES = new ItemAttributeModifiers.EquipmentSlotGroup[] {
+        ItemAttributeModifiers.EquipmentSlotGroup.HEAD,
+        ItemAttributeModifiers.EquipmentSlotGroup.CHEST,
+        ItemAttributeModifiers.EquipmentSlotGroup.LEGS,
+        ItemAttributeModifiers.EquipmentSlotGroup.FEET
+    };
     private static final DecimalFormat ATTRIBUTE_FORMAT = new DecimalFormat("0.#####");
 
     static {
@@ -132,8 +138,10 @@ public final class ItemTranslator {
     private 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;
         }
 
         String customName = getCustomName(session, components, bedrockItem);
@@ -143,13 +151,13 @@ public final class ItemTranslator {
 
         if (components != null) {
             ItemAttributeModifiers attributeModifiers = components.get(DataComponentType.ATTRIBUTE_MODIFIERS);
-            if (attributeModifiers != null && attributeModifiers.isShowInTooltip()) {
+            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()) {
+        if (session.isAdvancedTooltips() && !hideTooltips) {
             addAdvancedTooltips(components, nbtBuilder, javaItem, session.locale());
         }
 
@@ -207,7 +215,12 @@ public final class ItemTranslator {
             }
 
             ItemAttributeModifiers.EquipmentSlotGroup slotGroup = entry.getSlot();
-            if (slotGroup == ItemAttributeModifiers.EquipmentSlotGroup.ANY) {
+            if (slotGroup == ItemAttributeModifiers.EquipmentSlotGroup.ARMOR) {
+                // modifier applies to all armor slots
+                for (ItemAttributeModifiers.EquipmentSlotGroup slot : ARMOR_SLOT_NAMES) {
+                    slotsToModifiers.computeIfAbsent(slot, s -> new ArrayList<>()).add(loreEntry);
+                }
+            } else if (slotGroup == ItemAttributeModifiers.EquipmentSlotGroup.ANY) {
                 // modifier applies to all slots implicitly
                 for (var slot : SLOT_NAMES.keySet()) {
                     slotsToModifiers.computeIfAbsent(slot, s -> new ArrayList<>()).add(loreEntry);