Fix issue with better chat and clientside messages

Co-authored-by: RacoonDog <[email protected]>

Author: Wide-Cat

src/main/java/meteordevelopment/meteorclient/systems/modules/misc/BetterChat.java

@@ -23,23 +23,22 @@
 import meteordevelopment.meteorclient.utils.Utils;
 import meteordevelopment.meteorclient.utils.misc.MeteorIdentifier;
 import meteordevelopment.meteorclient.utils.misc.text.MeteorClickEvent;
+import meteordevelopment.meteorclient.utils.misc.text.TextVisitor;
 import meteordevelopment.meteorclient.utils.player.ChatUtils;
 import meteordevelopment.meteorclient.utils.render.color.Color;
 import meteordevelopment.orbit.EventHandler;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.ChatHudLine;
 import net.minecraft.client.network.PlayerListEntry;
-import net.minecraft.text.ClickEvent;
-import net.minecraft.text.HoverEvent;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
+import net.minecraft.text.*;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -226,7 +225,7 @@ public class BetterChat extends Module {
     );
 
     private static final Pattern antiSpamRegex = Pattern.compile(" \\(([0-9]+)\\)$");
-    private static final Pattern antiClearRegex = Pattern.compile("\\\\n(\\\\n|\\s)*\\\\n");
+    private static final Pattern antiClearRegex = Pattern.compile("\\\\n(\\\\n|\\s)+\\\\n");
     private static final Pattern timestampRegex = Pattern.compile("^(<[0-9]{2}:[0-9]{2}>\\s)");
     private static final Pattern usernameRegex = Pattern.compile("^(?:<[0-9]{2}:[0-9]{2}>\\s)?<(.*?)>.*");
 
@@ -258,13 +257,22 @@ private void onMessageReceive(ReceiveMessageEvent event) {
         }
 
         if (antiClear.get()) {
-            // more than two \n behind each other will be reduced to only two \n
-            String jsonString = Text.Serialization.toJsonString(message, mc.player.getRegistryManager());
-
-            Matcher antiClearMatcher = antiClearRegex.matcher(jsonString);
-            String replacedString = antiClearMatcher.replaceAll("\n\n");
-
-            message = (Text) Text.Serialization.fromJson(replacedString, mc.player.getRegistryManager());
+            String messageString = message.getString();
+            if (antiClearRegex.matcher(messageString).matches()) {
+                MutableText newMessage = Text.empty();
+                TextVisitor.visit(message, (text, style, string) -> {
+                    Matcher antiClearMatcher = antiClearRegex.matcher(string);
+                    if (antiClearMatcher.matches()) {
+                        // assume literal text content
+                        newMessage.append(Text.literal(antiClearMatcher.replaceAll("\n\n")).setStyle(style));
+                    } else {
+                        newMessage.append(text.copyContentOnly().setStyle(style));
+                    }
+
+                    return Optional.empty();
+                }, Style.EMPTY);
+                message = newMessage;
+            }
         }
 
         if (antiSpam.get()) {

src/main/java/meteordevelopment/meteorclient/utils/misc/text/TextVisitor.java

@@ -0,0 +1,46 @@
+/*
+ * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
+ * Copyright (c) Meteor Development.
+ */
+
+package meteordevelopment.meteorclient.utils.misc.text;
+
+import net.minecraft.text.Style;
+import net.minecraft.text.Text;
+
+import java.util.ArrayDeque;
+import java.util.Optional;
+import java.util.Queue;
+
+/**
+ * An extension of {@link net.minecraft.text.StringVisitable.StyledVisitor} with access to the underlying {@link Text} objects.
+ * @param <T> the optional short circuit return type, to match the semantics of {@link net.minecraft.text.StringVisitable.Visitor} and {@link net.minecraft.text.StringVisitable.StyledVisitor}.
+ * @author Crosby
+ */
+@FunctionalInterface
+public interface TextVisitor<T> {
+    Optional<T> accept(Text text, Style style, String string);
+
+    static <T> Optional<T> visit(Text text, TextVisitor<T> visitor, Style baseStyle) {
+        Queue<Text> queue = collectSiblings(text);
+        return text.visit((style, string) -> visitor.accept(queue.remove(), style, string), baseStyle);
+    }
+
+    /**
+     * Collapses the tree of {@link Text} siblings into a one dimensional LIFO {@link Queue}
+     * @param text the text
+     * @return the text and its siblings in the order they appear when rendered.
+     */
+    static Queue<Text> collectSiblings(Text text) {
+        Queue<Text> queue = new ArrayDeque<>();
+        collectSiblings(text, queue);
+        return queue;
+    }
+
+    private static void collectSiblings(Text text, Queue<Text> queue) {
+        queue.add(text);
+        for (Text sibling : text.getSiblings()) {
+            collectSiblings(sibling, queue);
+        }
+    }
+}