From 5287d4fb4f69a1bedbad7d76e34dc49d163c35bb Mon Sep 17 00:00:00 2001
From: EnZaXD <florian.michael07@gmail.com>
Date: Mon, 23 Sep 2024 19:24:46 +0200
Subject: [PATCH] Fix enchantment glint behaviour in 1.10->1.11 (#4156)

---
 .../rewriter/ItemPacketRewriter1_11.java      | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/rewriter/ItemPacketRewriter1_11.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/rewriter/ItemPacketRewriter1_11.java
index f7dcd7075..587f7f448 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/rewriter/ItemPacketRewriter1_11.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_10to1_11/rewriter/ItemPacketRewriter1_11.java
@@ -19,6 +19,7 @@ package com.viaversion.viaversion.protocols.v1_10to1_11.rewriter;
 
 import com.viaversion.nbt.tag.ByteTag;
 import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.type.Types;
@@ -55,6 +56,22 @@ public class ItemPacketRewriter1_11 extends ItemRewriter<ClientboundPackets1_9_3
             item.setAmount(1);
         }
         EntityMappings1_11.toClientItem(item);
+
+        if (item == null || item.tag() == null) {
+            return item;
+        }
+        CompoundTag tag = item.tag();
+
+        // 1.10 will display item glint if the list tag is present, 1.11+ only if at least one element is present
+        ListTag enchTag = tag.getListTag("ench");
+        if (enchTag != null && enchTag.isEmpty()) {
+            tag.putBoolean(nbtTagName("clearEnch"), true);
+
+            CompoundTag dummyTag = new CompoundTag();
+            dummyTag.putShort("id", Short.MAX_VALUE);
+
+            enchTag.add(dummyTag);
+        }
         return item;
     }
 
@@ -63,10 +80,16 @@ public class ItemPacketRewriter1_11 extends ItemRewriter<ClientboundPackets1_9_3
         if (item == null) {
             return null;
         }
-        if (item.tag() != null && item.tag().contains(nbtTagName())) {
-            item.setAmount(item.tag().<ByteTag>removeUnchecked(nbtTagName()).asByte());
-            if (item.tag().isEmpty()) {
-                item.setTag(null);
+        CompoundTag tag = item.tag();
+        if (tag != null) {
+            if (tag.contains(nbtTagName())) {
+                item.setAmount(tag.<ByteTag>removeUnchecked(nbtTagName()).asByte());
+                if (tag.isEmpty()) {
+                    item.setTag(null);
+                }
+            }
+            if (tag.remove(nbtTagName("clearEnch")) != null) {
+                tag.put("ench", new ListTag());
             }
         }
         EntityMappings1_11.toServerItem(item);
@@ -78,4 +101,4 @@ public class ItemPacketRewriter1_11 extends ItemRewriter<ClientboundPackets1_9_3
         }
         return item;
     }
-}
\ No newline at end of file
+}