Re-use legacy parsing logic

SpigotMC · Oct 26, 2023 · aaaae41 · aaaae41
1 parent 9df914c
commit aaaae41
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/chat/src/main/java/net/md_5/bungee/api/chat/TextComponent.java b/chat/src/main/java/net/md_5/bungee/api/chat/TextComponent.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import lombok.AllArgsConstructor;
@@ -44,15 +45,9 @@ public static BaseComponent fromLegacy(String message)
      */
     public static BaseComponent fromLegacy(String message, ChatColor defaultColor)
     {
-        TextComponent component = new TextComponent();
-
-        BaseComponent[] components = fromLegacyText( message, defaultColor );
-        if ( components.length > 0 )
-        {
-            component.setExtra( Arrays.asList( components ) );
-        }
-
-        return component;
+        ComponentBuilder componentBuilder = new ComponentBuilder();
+        populateComponentStructure( message, defaultColor, componentBuilder::append );
+        return componentBuilder.build();
     }
 
     /**
@@ -91,6 +86,12 @@ public static BaseComponent[] fromLegacyText(String message)
     public static BaseComponent[] fromLegacyText(String message, ChatColor defaultColor)
     {
         ArrayList<BaseComponent> components = new ArrayList<>();
+        populateComponentStructure( message, defaultColor, components::add );
+        return components.toArray( new BaseComponent[ 0 ] );
+    }
+
+    private static void populateComponentStructure(String message, ChatColor defaultColor, Consumer<BaseComponent> appender)
+    {
         StringBuilder builder = new StringBuilder();
         TextComponent component = new TextComponent();
         Matcher matcher = url.matcher( message );
@@ -140,7 +141,7 @@ public static BaseComponent[] fromLegacyText(String message, ChatColor defaultCo
                     component = new TextComponent( old );
                     old.setText( builder.toString() );
                     builder = new StringBuilder();
-                    components.add( old );
+                    appender.accept( old );
                 }
                 if ( format == ChatColor.BOLD )
                 {
@@ -183,7 +184,7 @@ public static BaseComponent[] fromLegacyText(String message, ChatColor defaultCo
                     component = new TextComponent( old );
                     old.setText( builder.toString() );
                     builder = new StringBuilder();
-                    components.add( old );
+                    appender.accept( old );
                 }
 
                 TextComponent old = component;
@@ -192,7 +193,7 @@ public static BaseComponent[] fromLegacyText(String message, ChatColor defaultCo
                 component.setText( urlString );
                 component.setClickEvent( new ClickEvent( ClickEvent.Action.OPEN_URL,
                         urlString.startsWith( "http" ) ? urlString : "http://" + urlString ) );
-                components.add( component );
+                appender.accept( component );
                 i += pos - i - 1;
                 component = old;
                 continue;
@@ -201,9 +202,7 @@ public static BaseComponent[] fromLegacyText(String message, ChatColor defaultCo
         }
 
         component.setText( builder.toString() );
-        components.add( component );
-
-        return components.toArray( new BaseComponent[ 0 ] );
+        appender.accept( component );
     }
 
     /**