Ignore invalid data in signs

Author: kennytv

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

@@ -305,11 +305,11 @@ private void updateSignMessages(final UserConnection connection, final CompoundT
         }
 
         final ListTag<StringTag> messages = tag.getListTag("messages", StringTag.class);
-        tag.put("messages", protocol.getComponentRewriter().updateComponentList(connection, messages));
+        tag.put("messages", protocol.getComponentRewriter().updateComponentList(connection, messages, true));
 
         final ListTag<StringTag> filteredMessages = tag.getListTag("filtered_messages", StringTag.class);
         if (filteredMessages != null) {
-            tag.put("filtered_messages", protocol.getComponentRewriter().updateComponentList(connection, filteredMessages));
+            tag.put("filtered_messages", protocol.getComponentRewriter().updateComponentList(connection, filteredMessages, true));
         }
     }
 

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

@@ -248,15 +248,22 @@ private void updateUglyJson(final CompoundTag componentsTag, final UserConnectio
         final String loreKey = TagUtil.getNamespacedTagKey(componentsTag, "lore");
         final ListTag<StringTag> lore = componentsTag.getListTag(loreKey, StringTag.class);
         if (lore != null) {
-            componentsTag.put(loreKey, updateComponentList(connection, lore));
+            componentsTag.put(loreKey, updateComponentList(connection, lore, false));
         }
     }
 
-    public ListTag<CompoundTag> updateComponentList(final UserConnection connection, final ListTag<StringTag> messages) {
+    public ListTag<CompoundTag> updateComponentList(final UserConnection connection, final ListTag<StringTag> messages, final boolean skipInvalid) {
         final ListTag<CompoundTag> updatedMessages = new ListTag<>(CompoundTag.class);
         for (final StringTag message : messages) {
             // Convert and make sure they're all of the same type
-            final Tag output = uglyJsonToTag(connection, message.getValue());
+            final Tag output;
+            try {
+                output = skipInvalid ? uglyJsonToTagUncaught(connection, message.getValue()) : uglyJsonToTag(connection, message.getValue());
+            } catch (final Exception e) {
+                // Signs ignore invalid data...
+                continue;
+            }
+
             final CompoundTag wrappedComponent = new CompoundTag();
             wrappedComponent.putString("text", "");
             wrappedComponent.put("extra", new ListTag<>(List.of(output)));
@@ -300,20 +307,22 @@ private void updateShowEntityHover(final UserConnection connection, final Compou
         }
     }
 
-    public Tag uglyJsonToTag(final UserConnection connection, final String value) {
+    public Tag uglyJsonToTagUncaught(final UserConnection connection, final String value) {
         // Use the same version for deserializing and serializing, as we handle the remaining changes ourselves
-        final Tag contents;
+        final Tag contents = SerializerVersion.V1_21_4.toTag(SerializerVersion.V1_21_4.toComponent(value));
+        processTag(connection, contents);
+        return contents;
+    }
+
+    public Tag uglyJsonToTag(final UserConnection connection, final String value) {
         try {
-            contents = SerializerVersion.V1_21_4.toTag(SerializerVersion.V1_21_4.toComponent(value));
+            return uglyJsonToTagUncaught(connection, value);
         } catch (final Exception e) {
             if (!Via.getConfig().isSuppressConversionWarnings()) {
                 Via.getPlatform().getLogger().log(Level.SEVERE, "Error converting json text component: " + value, e);
             }
             return new StringTag("<error>");
         }
-
-        processTag(connection, contents);
-        return contents;
     }
 
     @Override