Adopt lombok.val, standardize List types, and centralize Android text wrapping in SystemTextBase

Desktop: use val when iterating textLines/segments for cleaner syntax. Android: remove local wrapText, call base wrapText(parseMarkupToSegments, maxWidth), switch measureLine/drawTextLine to List<ColoredSegment>, and use val in loops. Base: generalize textLines to List<List<ColoredSegment>>, unify markup handling via a single MARKUP_PATTERN, add color tag support ([color:text]) with name/hex parsing, and minor cleanup in highlightColor. This reduces duplication, standardizes collection types, and consolidates wrapping/markup logic.

Author: Mikhael-Danilov

RemixedDungeon/src/android/java/com/nyrds/platform/gfx/SystemText.java

@@ -23,10 +23,12 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import lombok.Synchronized;
+import lombok.val;
 
 public class SystemText extends SystemTextBase {
 
@@ -175,50 +177,9 @@ public void kill() {
 
     private float fontHeight;
 
-    private void wrapText() {
-        textLines.clear();
-        java.util.List<ColoredSegment> allSegments = parseMarkupToSegments(originalText);
-        hasMarkup = !allSegments.isEmpty() && allSegments.size() > 1;
+    
 
-        ArrayList<ColoredSegment> currentLine = new ArrayList<>();
-        float currentLineWidth = 0;
-
-        for (ColoredSegment segment : allSegments) {
-            String[] paragraphs = segment.text.split("\n", -1);
-
-            for (int p = 0; p < paragraphs.length; p++) {
-                String paragraph = paragraphs[p];
-                String[] words = paragraph.split("(?<=\\s)|(?=\\s)"); // Split while keeping spaces
-
-                for (String word : words) {
-                    if (word.isEmpty()) continue;
-
-                    float wordWidth = symbolWidth(word);
-
-                    if (needWidth && !currentLine.isEmpty() && currentLineWidth + wordWidth > (maxWidth / scale.x)) {
-                        textLines.add(new ArrayList<>(currentLine));  // Add a copy as ArrayList to the common List
-                        currentLine = new ArrayList<>();
-                        currentLineWidth = 0;
-                    }
-
-                    currentLine.add(new ColoredSegment(word, segment.color));
-                    currentLineWidth += wordWidth;
-                }
-
-                if (p < paragraphs.length - 1) { // This was a newline character
-                    textLines.add(new ArrayList<>(currentLine));  // Add a copy as ArrayList to the common List
-                    currentLine = new ArrayList<>();
-                    currentLineWidth = 0;
-                }
-            }
-        }
-
-        if (!currentLine.isEmpty()) {
-            textLines.add(new ArrayList<>(currentLine));  // Add a copy as ArrayList to the common List
-        }
-    }
-
-    private float measureLine(ArrayList<ColoredSegment> line) {
+    private float measureLine(List<ColoredSegment> line) {
         float lineWidth = 0;
         for(ColoredSegment seg : line) {
             lineWidth += symbolWidth(seg.text);
@@ -238,9 +199,13 @@ private void createText() {
             setWidth(0);
             setHeight(0);
 
-            wrapText();
+            // Use the base class wrapText method with appropriate max width
+            float maxWidthForWrapping = needWidth ? (maxWidth / scale.x) : Float.MAX_VALUE;
+            val wrappedLines = wrapText(parseMarkupToSegments(originalText), maxWidthForWrapping);
+            textLines.clear();
+            textLines.addAll(wrappedLines);
 
-            for (var line : textLines) {
+            for (val line : textLines) {
                 setHeight(height + fontHeight);
 
                 float lineWidth = measureLine(line);  // Convert to ArrayList for measureLine method
@@ -262,8 +227,8 @@ private void createText() {
                         bitmapCache.put(key, bitmap);
 
                         Canvas canvas = new Canvas(bitmap.bmp);
-                        drawTextLine(line, canvas, contourPaint);  // Convert to ArrayList for drawTextLine
-                        drawTextLine(line, canvas, textPaint);     // Convert to ArrayList for drawTextLine
+                        drawTextLine(line, canvas, contourPaint);
+                        drawTextLine(line, canvas, textPaint);
 
                         cacheMiss++;
                     } else {
@@ -279,7 +244,7 @@ private void createText() {
         }
     }
 
-    private void drawTextLine(ArrayList<ColoredSegment> line, Canvas canvas, TextPaint paint) {
+    private void drawTextLine(List<ColoredSegment> line, Canvas canvas, TextPaint paint) {
         float y = (fontHeight) * oversample - paint.descent();
         float x = 0.5f * oversample;
 

RemixedDungeon/src/main/java/com/watabou/noosa/SystemTextBase.java

@@ -6,16 +6,29 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public abstract class SystemTextBase extends Text {
-    // Combined markup pattern for violet highlighting (_text_) and bronze ("text")
-    protected static final Pattern MARKUP_PATTERN = Pattern.compile("_(.*?)_|\"(.*?)\"");
-    // Markup pattern for highlighting (_text_)
-    protected static final Pattern HIGHLIGHTER = Pattern.compile("_(.*?)_");
-    // Markup pattern for bronze text ("text")
-    protected static final Pattern BRONZE_HIGHLIGHTER = Pattern.compile("\"(.*?)\"");
+    // Combined markup pattern for violet highlighting (_text_), bronze ("text"), and generic color tags ([color:text])
+    protected static final Pattern MARKUP_PATTERN = Pattern.compile("_(.*?)_|\"(.*?)\"|\\[(#?[a-zA-Z0-9]+):(.*?)?\\]");
+
+    private static final Map<String, Integer> COLOR_MAP = new HashMap<>();
+    static {
+        COLOR_MAP.put("red", 0xFFFF0000);
+        COLOR_MAP.put("green", 0xFF00FF00);
+        COLOR_MAP.put("blue", 0xFF0000FF);
+        COLOR_MAP.put("yellow", 0xFFFFFF00);
+        COLOR_MAP.put("cyan", 0xFF00FFFF);
+        COLOR_MAP.put("magenta", 0xFFFF00FF);
+        COLOR_MAP.put("white", 0xFFFFFFFF);
+        COLOR_MAP.put("black", 0xFF000000);
+        COLOR_MAP.put("gray", 0xFF808080);
+        COLOR_MAP.put("orange", 0xFFFFA500);
+        COLOR_MAP.put("purple", 0xFF800080);
+    }
 
     protected static float fontScale = Float.NaN;
 
@@ -67,7 +80,7 @@ public static void updateFontScale() {
      * Subclasses can override if needed
      */
     protected void parseMarkup(String input) {
-        if (input != null && (HIGHLIGHTER.matcher(input).find() || BRONZE_HIGHLIGHTER.matcher(input).find())) {
+        if (input != null && MARKUP_PATTERN.matcher(input).find()) {
             hasMarkup = true;
         }
     }
@@ -80,15 +93,17 @@ protected void parseMarkup(String input) {
     protected String extractPlainText(String str) {
         if (str == null) return "";
 
-        // Remove both underscore markup (_text_) and quote markup ("text")
-        return str.replaceAll("_(.*?)_", "$1").replaceAll("\"(.*?)\"", "$1");
+        // Remove underscore, quote, and color tag markup
+        return str.replaceAll("_(.*?)_", "$1")
+                  .replaceAll("\"(.*?)\"", "$1")
+                  .replaceAll("\\[(#?[a-zA-Z0-9]+):(.*?)?\\]", "$2");
     }
 
     /**
      * Set the highlight color for marked text
      */
     public void highlightColor(int color) {
-        this.highlightColor = color;
+        highlightColor = color;
         if (hasMarkup) {
             dirty = true;
         }
@@ -128,6 +143,32 @@ public void text(@NotNull String str) {
         // Parse markup in the original text
         parseMarkup(str);
     }
+
+    /**
+     * Parse a color string (hex or name) into an ARGB integer.
+     * @param colorStr The color string (e.g., "#FF0000", "red")
+     * @return The integer ARGB color
+     */
+    private int parseColorString(String colorStr) {
+        if (colorStr == null || colorStr.isEmpty()) {
+            return defaultColor;
+        }
+        String lowerCaseColor = colorStr.toLowerCase();
+        if (COLOR_MAP.containsKey(lowerCaseColor)) {
+            return COLOR_MAP.get(lowerCaseColor);
+        }
+        if (colorStr.startsWith("#")) {
+            try {
+                long color = Long.parseLong(colorStr.substring(1), 16);
+                if (colorStr.length() == 7) { // #RRGGBB
+                    return (int) (0xFF000000 | color);
+                } else if (colorStr.length() == 9) { // #AARRGGBB
+                    return (int) color;
+                }
+            } catch (NumberFormatException ignored) {}
+        }
+        return defaultColor; // Fallback
+    }
 
     /**
      * Parse markup in the input string and convert to a list of colored segments.
@@ -149,6 +190,10 @@ protected List<ColoredSegment> parseMarkupToSegments(String input) {
                 segments.add(new ColoredSegment(m.group(1), highlightColor));
             } else if (m.group(2) != null) {
                 segments.add(new ColoredSegment(m.group(2), bronzeColor));
+            } else if (m.group(3) != null) {
+                String text = m.group(4) != null ? m.group(4) : "";
+                int color = parseColorString(m.group(3));
+                segments.add(new ColoredSegment(text, color));
             }
             lastEnd = m.end();
         }
@@ -216,7 +261,7 @@ protected List<List<ColoredSegment>> wrapText(List<ColoredSegment> allSegments,
     /**
      * Store the text lines after parsing and wrapping
      */
-    protected final ArrayList<ArrayList<ColoredSegment>> textLines = new ArrayList<>();
+    protected final List<List<ColoredSegment>> textLines = new ArrayList<>();
 
     /**
      * Invalidate caches - to be implemented by subclasses

RemixedDungeonDesktop/src/libgdx/java/com/nyrds/platform/gfx/SystemText.java

@@ -19,6 +19,8 @@
 import java.util.List;
 import java.util.Map;
 
+import lombok.val;
+
 public class SystemText extends SystemTextBase {
     private static FreeTypeFontGenerator pixelGenerator;
     private static FreeTypeFontGenerator fallbackGenerator;
@@ -218,9 +220,9 @@ protected void measure() {
             float totalHeight = 0;
             float maxLineWidth = 0;
 
-            for (java.util.List<com.watabou.noosa.SystemTextBase.ColoredSegment> line : textLines) {
+            for (val line : textLines) {
                 float currentLineWidth = 0;
-                for (com.watabou.noosa.SystemTextBase.ColoredSegment segment : line) {
+                for (val segment : line) {
                     pseudoGlyphLayout.setText(fontData, segment.text);
                     currentLineWidth += pseudoGlyphLayout.width;
                 }