From 4e255496828d60299e77c4da77f6489bca138951 Mon Sep 17 00:00:00 2001
From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com>
Date: Sat, 13 Apr 2024 21:01:34 +0200
Subject: [PATCH] Handle legacy item hover events

Co-authored-by: RaphiMC <50594595+raphimc@users.noreply.github.com>
---
 .../rewriter/ComponentRewriter1_20_5.java           | 13 +++++++++++++
 .../viaversion/viaversion/util/ComponentUtil.java   |  4 ++++
 2 files changed, 17 insertions(+)

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 3919d8212..4a9d09da0 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
@@ -78,6 +78,7 @@ import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Enchantme
 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;
+import com.viaversion.viaversion.util.ComponentUtil;
 import com.viaversion.viaversion.util.Either;
 import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.SerializerVersion;
@@ -163,6 +164,18 @@ public class ComponentRewriter1_20_5 extends ComponentRewriter<ClientboundPacket
             return;
         }
 
+        final Tag valueTag = hoverEventTag.remove("value");
+        if (valueTag != null) { // Convert legacy hover event to new format for rewriting
+            final CompoundTag tag = ComponentUtil.deserializeShowItem(valueTag, SerializerVersion.V1_20_3);
+            final CompoundTag contentsTag = new CompoundTag();
+            contentsTag.put("id", tag.getStringTag("id"));
+            contentsTag.put("count", new IntTag(tag.getByte("Count")));
+            if (tag.get("tag") instanceof CompoundTag) {
+                contentsTag.put("tag", new StringTag(SerializerVersion.V1_20_3.toSNBT(tag.getCompoundTag("tag"))));
+            }
+            hoverEventTag.put("contents", contentsTag);
+        }
+
         final CompoundTag contentsTag = hoverEventTag.getCompoundTag("contents");
         if (contentsTag == null) {
             return;
diff --git a/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java b/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java
index dddfb0083..2f25798d7 100644
--- a/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java
+++ b/common/src/main/java/com/viaversion/viaversion/util/ComponentUtil.java
@@ -163,4 +163,8 @@ public final class ComponentUtil {
     public static CompoundTag deserializeLegacyShowItem(final JsonElement element, final SerializerVersion version) {
         return (CompoundTag) version.toTag(version.toComponent(element).asUnformattedString());
     }
+
+    public static CompoundTag deserializeShowItem(final Tag value, final SerializerVersion version) {
+        return (CompoundTag) version.toTag(version.toComponent(value).asUnformattedString());
+    }
 }