color toString & simplify text formatting code

Author: JasperGeurtz

src/main/java/bwapi/Color.java

@@ -1,6 +1,8 @@
 package bwapi;
 
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -59,6 +61,22 @@ public class Color {
      */
     public final static Color Grey = new Color(74);
 
+    private final static Map<Integer, String> defaultColors = new HashMap<>();
+    static {
+        defaultColors.put(Color.Red.id, "Red");
+        defaultColors.put(Color.Blue.id, "Blue");
+        defaultColors.put(Color.Teal.id, "Teal");
+        defaultColors.put(Color.Purple.id, "Purple");
+        defaultColors.put(Color.Orange.id, "Orange");
+        defaultColors.put(Color.Brown.id, "Brown");
+        defaultColors.put(Color.White.id, "White");
+        defaultColors.put(Color.Yellow.id, "Yellow");
+        defaultColors.put(Color.Green.id, "Green");
+        defaultColors.put(Color.Cyan.id, "Cyan");
+        defaultColors.put(Color.Black.id, "Black");
+        defaultColors.put(Color.Grey.id, "Grey");
+    }
+
     private static final RGBQUAD RGBRESERVE = new RGBQUAD(0, 0, 0, 0xFF);
 
     private static final RGBQUAD[] defaultPalette = {
@@ -188,6 +206,17 @@ public int hashCode() {
         return Objects.hash(id);
     }
 
+    @Override
+    public String toString() {
+        if (defaultColors.containsKey(id)) {
+            return "Color." + defaultColors.get(id);
+        }
+        return "Color{" +
+                "red=" + red() +
+                ", green=" + green() +
+                ", blue=" + blue() + "}";
+    }
+
     /// BROODWAR COLOR IMPLEMENTATION
     private static class RGBQUAD {
         final int rgbRed;

src/main/java/bwapi/Game.java

@@ -1499,7 +1499,7 @@ public List<TilePosition> getStartLocations() {
         return startLocations;
     }
 
-    private String formatString(final String string, final Text... colors) {
+    static String formatString(final String string, final Text... colors) {
         return colors.length > 0 ? String.format(string, Arrays.stream(colors).map(c -> c.id).toArray()) : string;
     }
 

src/main/java/bwapi/Text.java

@@ -125,12 +125,7 @@ public enum Text {
      * Format text with a textcolor to display on broodwar
      */
     public static String formatText(final String text, final Text format) {
-        final byte[] data = text.getBytes();
-        final int len = text.length();
-        final byte[] formatted = new byte[len + 1];
-        formatted[0] = format.id;
-        System.arraycopy(data, 0, formatted, 1, len);
-        return new String(formatted);
+        return Game.formatString("%c" + text, format);
     }
 
     /**

src/test/java/bwapi/ColorTest.java

@@ -274,4 +274,12 @@ public void checkAllColors() {
             assertEquals(colors[id][2], c.blue());
         }
     }
+
+    @Test
+    public void toStringTest() {
+        assertEquals("Color.Black", Color.Black.toString());
+        assertEquals("Color.Black", new Color(0, 0, 0).toString());
+        assertEquals("Color.Black", new Color(Color.Black.id).toString());
+        assertEquals("Color{red=16, green=16, blue=16}", new Color(16, 16, 16).toString());
+    }
 }

src/test/java/bwapi/TextTest.java

@@ -0,0 +1,14 @@
+package bwapi;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class TextTest {
+
+    @Test
+    public void textFormattingTest() {
+        assertEquals("\u0006Red", Text.formatText("Red", Text.Red));
+        assertEquals("\u0006Red and \u000EBlue then \u0002Default", Game.formatString("%cRed and %cBlue then %cDefault", Text.Red, Text.Blue, Text.Default));
+    }
+}