From 34bc5b9d36f936588361a2410ecaf18778c510f9 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Tue, 23 Apr 2024 13:07:05 +0200
Subject: [PATCH] Put item name and lore through component rewriter An absolute
 classic moment where servers are putting hover events into not hoverable item
 names and lore

---
 .../Protocol1_20_5To1_20_3.java               |  6 ++++-
 .../BlockItemPacketRewriter1_20_5.java        | 22 ++++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java
index 28c4f34bb..4cefb713b 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java
@@ -68,6 +68,7 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol<ClientboundPa
     private final EntityPacketRewriter1_20_5 entityRewriter = new EntityPacketRewriter1_20_5(this);
     private final BlockItemPacketRewriter1_20_5 itemRewriter = new BlockItemPacketRewriter1_20_5(this);
     private final TagRewriter<ClientboundPacket1_20_3> tagRewriter = new TagRewriter<>(this);
+    private final ComponentRewriter<ClientboundPacket1_20_3> componentRewriter = new ComponentRewriter1_20_5(this);
 
     public Protocol1_20_5To1_20_3() {
         super(ClientboundPacket1_20_3.class, ClientboundPacket1_20_5.class, ServerboundPacket1_20_3.class, ServerboundPacket1_20_5.class);
@@ -86,7 +87,6 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol<ClientboundPa
 
         new StatisticsRewriter<>(this).register(ClientboundPackets1_20_3.STATISTICS);
 
-        final ComponentRewriter<ClientboundPacket1_20_3> componentRewriter = new ComponentRewriter1_20_5(this);
         componentRewriter.registerComponentPacket(ClientboundPackets1_20_3.SYSTEM_CHAT);
         componentRewriter.registerComponentPacket(ClientboundPackets1_20_3.DISGUISED_CHAT);
 
@@ -307,6 +307,10 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol<ClientboundPa
         return tagRewriter;
     }
 
+    public ComponentRewriter<ClientboundPacket1_20_3> getComponentRewriter() {
+        return componentRewriter;
+    }
+
     @Override
     protected PacketTypesProvider<ClientboundPacket1_20_3, ClientboundPacket1_20_5, ServerboundPacket1_20_3, ServerboundPacket1_20_5> createPacketTypesProvider() {
         return new SimplePacketTypesProvider<>(
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 f37d8ee28..8231071f9 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
@@ -389,7 +389,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
             data.set(StructuredDataKey.HIDE_ADDITIONAL_TOOLTIP);
         }
 
-        updateDisplay(data, tag.getCompoundTag("display"), hideFlagsValue);
+        updateDisplay(connection, data, tag.getCompoundTag("display"), hideFlagsValue);
 
         final NumberTag damage = tag.getNumberTag("Damage");
         if (damage != null && damage.asInt() != 0) {
@@ -483,7 +483,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
         if (old.identifier() == 1085) {
             updateWritableBookPages(data, tag);
         } else if (old.identifier() == 1086) {
-            updateWrittenBookPages(data, tag);
+            updateWrittenBookPages(connection, data, tag);
         }
 
         updatePotionTags(data, tag);
@@ -1073,7 +1073,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
         data.set(StructuredDataKey.WRITABLE_BOOK_CONTENT, pages.toArray(new FilterableString[0]));
     }
 
-    private void updateWrittenBookPages(final StructuredDataContainer data, final CompoundTag tag) {
+    private void updateWrittenBookPages(final UserConnection connection, final StructuredDataContainer data, final CompoundTag tag) {
         final ListTag<StringTag> pagesTag = tag.getListTag("pages", StringTag.class);
         final CompoundTag filteredPagesTag = tag.getCompoundTag("filtered_pages");
         if (pagesTag == null) {
@@ -1087,11 +1087,11 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
             if (filteredPagesTag != null) {
                 final StringTag filteredPage = filteredPagesTag.getStringTag(String.valueOf(i));
                 if (filteredPage != null) {
-                    filtered = ComponentUtil.jsonStringToTag(filteredPage.getValue());
+                    filtered = jsonToTag(connection, filteredPage);
                 }
             }
 
-            final Tag parsedPage = ComponentUtil.jsonStringToTag(page.getValue());
+            final Tag parsedPage = jsonToTag(connection, page);
             pages.add(new FilterableComponent(parsedPage, filtered));
         }
 
@@ -1110,6 +1110,12 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
         data.set(StructuredDataKey.WRITTEN_BOOK_CONTENT, writtenBook);
     }
 
+    private Tag jsonToTag(final UserConnection connection, final StringTag stringTag) {
+        final Tag tag = ComponentUtil.jsonStringToTag(stringTag.getValue());
+        protocol.getComponentRewriter().processTag(connection, tag);
+        return tag;
+    }
+
     private void updateItemList(final UserConnection connection, final StructuredDataContainer data, final CompoundTag tag,
                                 final String key, final StructuredDataKey<Item[]> dataKey, final boolean allowEmpty) {
         final ListTag<CompoundTag> itemsTag = tag.getListTag(key, CompoundTag.class);
@@ -1265,7 +1271,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
         data.set(StructuredDataKey.MAP_DECORATIONS, updatedDecorationsTag);
     }
 
-    private void updateDisplay(final StructuredDataContainer data, final CompoundTag displayTag, final int hideFlags) {
+    private void updateDisplay(final UserConnection connection, final StructuredDataContainer data, final CompoundTag displayTag, final int hideFlags) {
         if (displayTag == null) {
             return;
         }
@@ -1277,13 +1283,13 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
 
         final StringTag nameTag = displayTag.getStringTag("Name");
         if (nameTag != null) {
-            data.set(StructuredDataKey.CUSTOM_NAME, ComponentUtil.jsonStringToTag(nameTag.getValue()));
+            data.set(StructuredDataKey.CUSTOM_NAME, jsonToTag(connection, nameTag));
         }
 
         final ListTag<StringTag> loreTag = displayTag.getListTag("Lore", StringTag.class);
         if (loreTag != null) {
             // Apply limit as per new network codec. Some servers send these lores to do trickery with shaders
-            data.set(StructuredDataKey.LORE, loreTag.stream().limit(256).map(t -> ComponentUtil.jsonStringToTag(t.getValue())).toArray(Tag[]::new));
+            data.set(StructuredDataKey.LORE, loreTag.stream().limit(256).map(t -> jsonToTag(connection, t)).toArray(Tag[]::new));
         }
 
         final NumberTag colorTag = displayTag.getNumberTag("color");