Fix legacy color processing

Author: Rollczi

build.gradle.kts

@@ -43,6 +43,7 @@ dependencies {
 
     // test
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
+    testImplementation("org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
 }
 

src/main/java/com/eternalcode/formatter/ChatController.java

@@ -7,7 +7,6 @@
 import net.kyori.adventure.identity.Identity;
 import net.kyori.adventure.platform.AudienceProvider;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -63,16 +62,15 @@ void onChat(AsyncPlayerChatEvent event) {
         String withFormat = this.placeholderRegistry.format(withTemplates, player);
         String withMessage = String.format(withFormat, player.getDisplayName(), event.getMessage());
 
-        TextComponent withLegacyColors = Legacy.LEGACY_SERIALIZER.deserialize(withMessage);
-        String withAmpersands = Legacy.LEGACY_AMPERSAND_SERIALIZER.serialize(withLegacyColors);
-
-        Component component = miniMessage.deserialize(withAmpersands);
+        String decolor = Legacy.decolor(withMessage);
+        Component component = miniMessage.deserialize(decolor);
 
         for (Player recipient : event.getRecipients()) {
             Audience recipientAudience = audienceProvider.player(recipient.getUniqueId());
 
             recipientAudience.sendMessage(identity, component);
         }
+
     }
 
 }

src/main/java/com/eternalcode/formatter/legacy/Legacy.java

@@ -1,21 +1,34 @@
 package com.eternalcode.formatter.legacy;
 
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import net.md_5.bungee.api.ChatColor;
+
+import java.util.regex.Matcher;
 
 public final class Legacy {
 
+    private static final String AMPERSAND = "&";
+
     private Legacy() {
     }
 
-    public final static LegacyComponentSerializer LEGACY_SERIALIZER = LegacyComponentSerializer.builder()
-        .hexColors()
-        .useUnusualXRepeatedCharacterHexFormat()
-        .build();
-
     public final static LegacyComponentSerializer LEGACY_AMPERSAND_SERIALIZER = LegacyComponentSerializer.builder()
         .character('&')
         .hexColors()
         .useUnusualXRepeatedCharacterHexFormat()
         .build();
 
+    public static String decolor(String text) {
+        Matcher matcher = ChatColor.STRIP_COLOR_PATTERN.matcher(text);
+        StringBuilder builder = new StringBuilder(text);
+
+        while (matcher.find()) {
+            String color = matcher.group(0);
+
+            builder.replace(matcher.start(), matcher.end(), AMPERSAND + color.charAt(1));
+        }
+
+        return builder.toString();
+    }
+
 }

src/main/java/com/eternalcode/formatter/legacy/LegacyProcessor.java

@@ -1,13 +1,46 @@
 package com.eternalcode.formatter.legacy;
 
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentLike;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.TextReplacementConfig;
 
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
+import java.util.regex.MatchResult;
 import java.util.regex.Pattern;
 
-public class LegacyProcessor implements UnaryOperator<Component> {
+public final class LegacyProcessor implements UnaryOperator<Component> {
+
+    private final static Replacer REPLACER = new Replacer();
+
     @Override
     public Component apply(Component component) {
-        return component.replaceText(builder -> builder.match(Pattern.compile(".*")).replacement((matchResult, builder1) -> Legacy.LEGACY_AMPERSAND_SERIALIZER.deserialize(matchResult.group())));
+        return component.replaceText(REPLACER);
+    }
+
+    private final static class Replacer implements Consumer<TextReplacementConfig.Builder> {
+
+        private final static Pattern ALL = Pattern.compile(".*");
+        private final static Replacement REPLACEMENT = new Replacement();
+
+        @Override
+        public void accept(TextReplacementConfig.Builder builder) {
+            builder
+                .match(ALL)
+                .replacement(REPLACEMENT);
+        }
+
+    }
+
+    private final static class Replacement implements BiFunction<MatchResult, TextComponent.Builder, ComponentLike> {
+
+        @Override
+        public ComponentLike apply(MatchResult matchResult, TextComponent.Builder builder) {
+            return Legacy.LEGACY_AMPERSAND_SERIALIZER.deserialize(matchResult.group());
+        }
+
     }
+
 }

src/test/java/com/eternalcode/formatter/legacy/LegacyTest.java

@@ -0,0 +1,16 @@
+package com.eternalcode.formatter.legacy;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class LegacyTest {
+
+    @Test
+    void test() {
+        String text = Legacy.decolor("§c SIEMA § test§a!");
+
+        assertEquals("&c SIEMA § test&a!", text);
+    }
+
+}