Move show item container contents conversion to the right place

Fixes ViaVersion#4444

Author: kennytv

common/src/main/java/com/viaversion/viaversion/protocols/v1_21_4to1_21_5/rewriter/ComponentRewriter1_21_5.java

@@ -109,6 +109,19 @@ protected void handleShowItem(final UserConnection connection, final CompoundTag
         handleEnchantments(componentsTag, "enchantments");
         handleEnchantments(componentsTag, "stored_enchantments");
 
+        // Usual item handling
+        final CompoundTag useRemainder = TagUtil.getNamespacedCompoundTag(componentsTag, "use_remainder");
+        if (useRemainder != null) {
+            handleShowItem(connection, useRemainder);
+        }
+        handleContainerContents(connection, componentsTag);
+        handleItemArrayContents(connection, componentsTag, "bundle_contents");
+        handleItemArrayContents(connection, componentsTag, "charged_projectiles");
+        handleWrittenBookContents(connection, componentsTag);
+
+        // NO MORE SNBT IN TEXT COMPONENTS
+        updateUglyJson(componentsTag, connection);
+
         removeDataComponents(componentsTag, StructuredDataKey.INSTRUMENT1_21_2, StructuredDataKey.JUKEBOX_PLAYABLE1_21);
     }
 
@@ -218,22 +231,9 @@ private void updateShowItemHover(final UserConnection connection, final Compound
             final CompoundTag componentsTag = compoundContents.getCompoundTag("components");
             handleShowItem(connection, compoundContents, componentsTag);
 
-            if (componentsTag == null) {
-                return;
+            if (componentsTag != null) {
+                hoverEventTag.put("components", componentsTag);
             }
-
-            hoverEventTag.put("components", componentsTag);
-
-            final CompoundTag useRemainder = TagUtil.getNamespacedCompoundTag(componentsTag, "use_remainder");
-            if (useRemainder != null) {
-                handleShowItem(connection, useRemainder);
-            }
-            handleContainerContents(connection, componentsTag);
-            handleItemArrayContents(connection, componentsTag, "bundle_contents");
-            handleItemArrayContents(connection, componentsTag, "charged_projectiles");
-            handleWrittenBookContents(connection, componentsTag);
-
-            updateUglyJson(componentsTag, connection);
         } else if (contentsTag instanceof final StringTag inlinedContents) {
             hoverEventTag.put("id", inlinedContents);
         }
@@ -267,7 +267,7 @@ private void updateUglyJson(final CompoundTag componentsTag, final String key, f
         final String actualKey = TagUtil.getNamespacedTagKey(componentsTag, key);
         final String json = componentsTag.getString(actualKey);
         if (json == null) {
-           return;
+            return;
         }
 
         componentsTag.put(actualKey, uglyJsonToTag(connection, json));

gradle/libs.versions.toml

@@ -19,7 +19,7 @@ checkerQual = "3.49.1"
 paper = "1.20.4-R0.1-SNAPSHOT"
 legacyBukkit = "1.8.8-R0.1-SNAPSHOT"
 velocity = "3.1.1"
-viaProxy = "3.4.1-SNAPSHOT"
+viaProxy = "3.4.2-SNAPSHOT"
 
 [libraries]