From a4adef3cecbf0f6af5b90d0d94ebadcadd31e53f Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Mon, 22 Apr 2024 23:49:13 +0200
Subject: [PATCH] Fix attribute slot handling

---
 .../data/EquipmentSlots1_20_5.java            | 45 +++++++++++++++++++
 .../BlockItemPacketRewriter1_20_5.java        | 10 ++++-
 .../rewriter/ComponentRewriter1_20_5.java     |  8 ++--
 .../rewriter/StructuredDataConverter.java     |  5 ++-
 4 files changed, 62 insertions(+), 6 deletions(-)
 create mode 100644 common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/EquipmentSlots1_20_5.java

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/EquipmentSlots1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/EquipmentSlots1_20_5.java
new file mode 100644
index 000000000..add88ce27
--- /dev/null
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/EquipmentSlots1_20_5.java
@@ -0,0 +1,45 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2024 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data;
+
+import com.viaversion.viaversion.util.KeyMappings;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public final class EquipmentSlots1_20_5 {
+
+    public static final KeyMappings SLOTS = new KeyMappings(
+        "any",
+        "mainhand",
+        "offhand",
+        "hand",
+        "feet",
+        "legs",
+        "chest",
+        "head",
+        "armor",
+        "body"
+    );
+
+    public static @Nullable String idToKey(final int id) {
+        return SLOTS.idToKey(id);
+    }
+
+    public static int keyToId(final String enchantment) {
+        return SLOTS.keyToId(enchantment);
+    }
+}
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
index 4c9945ef3..f37d8ee28 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -85,6 +85,7 @@ import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Attribute
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.BannerPatterns1_20_5;
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.DyeColors;
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Enchantments1_20_3;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.EquipmentSlots1_20_5;
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Instruments1_20_3;
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.MapDecorations1_20_5;
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.PotionEffects1_20_5;
@@ -795,11 +796,16 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
             final String name = modifierTag.getString("Name");
             final NumberTag amountTag = modifierTag.getNumberTag("Amount");
             final IntArrayTag uuidTag = modifierTag.getIntArrayTag("UUID");
-            final int slotType = modifierTag.getInt("Slot");
+            final String slotType = modifierTag.getString("Slot", "any");
             if (name == null || attributeName == null || amountTag == null || uuidTag == null) {
                 continue;
             }
 
+            final int slotTypeId = EquipmentSlots1_20_5.keyToId(slotType);
+            if (slotTypeId == -1) {
+                continue;
+            }
+
             final int operationId = modifierTag.getInt("Operation");
             if (operationId < 0 || operationId > 2) {
                 continue;
@@ -818,7 +824,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
                     amountTag.asDouble(),
                     operationId
                 ),
-                slotType
+                slotTypeId
             ));
         }
         data.set(StructuredDataKey.ATTRIBUTE_MODIFIERS, new AttributeModifiers(modifiers.toArray(new AttributeModifier[0]), showInTooltip));
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java
index 74d5e914f..e4e80d859 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java
@@ -76,6 +76,7 @@ import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.Protocol1_20_5
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Attributes1_20_5;
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.DyeColors;
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Enchantments1_20_5;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.EquipmentSlots1_20_5;
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.PotionEffects1_20_5;
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Potions1_20_5;
 import com.viaversion.viaversion.rewriter.ComponentRewriter;
@@ -401,12 +402,13 @@ public class ComponentRewriter1_20_5 extends ComponentRewriter<ClientboundPacket
             if (type == null) {
                 throw new IllegalArgumentException("Unknown attribute type: " + modifier.attribute());
             }
+
             modifierTag.putString("type", type);
             convertModifierData(modifierTag, modifier.modifier());
             if (modifier.slotType() != 0) {
-                final StringTag slotTag = convertEnumEntry(modifier.slotType(), "any", "mainhand", "offhand",
-                    "hand", "feet", "legs", "chest", "head", "armor", "body");
-                modifierTag.put("slot", slotTag);
+                final String slotType = EquipmentSlots1_20_5.idToKey(modifier.slotType());
+                Preconditions.checkNotNull(slotType, "Unknown slot type %s", modifier.slotType());
+                modifierTag.putString("slot", slotType);
             }
 
             modifiers.add(modifierTag);
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java
index 63c341ef2..d43c2c3f4 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java
@@ -54,6 +54,7 @@ import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.Protocol1_20_5
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Attributes1_20_5;
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.BannerPatterns1_20_5;
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Enchantments1_20_3;
+import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.EquipmentSlots1_20_5;
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Instruments1_20_3;
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.MapDecorations1_20_5;
 import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.PotionEffects1_20_5;
@@ -137,7 +138,9 @@ public final class StructuredDataConverter {
                 modifierTag.putString("AttributeName", identifier.equals("generic.jump_strength") ? "horse.jump_strength" : identifier);
                 modifierTag.putString("Name", modifier.modifier().name());
                 modifierTag.putDouble("Amount", modifier.modifier().amount());
-                modifierTag.putInt("Slot", modifier.slotType());
+                if (modifier.slotType() != 0) {
+                    modifierTag.putString("Slot", EquipmentSlots1_20_5.idToKey(modifier.slotType()));
+                }
                 modifierTag.putInt("Operation", modifier.modifier().operation());
                 modifiers.add(modifierTag);
             }