add alt names for colors/styles

Author: dags-

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 group "me.dags"
-version "0.3.5"
+version "0.3.6"
 def spongeAPI = "7.1.0"
 description = "A markup syntax for Sponge"
 

src/main/java/me/dags/text/Property.java

@@ -34,6 +34,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -124,27 +125,54 @@ static Property parseURL(String in, Predicate predicate) throws IOException {
     }
 
     static <T> Optional<T> match(String in, Map<String, T> map) {
-        T t = map.get(in);
-        if (t != null) {
-            return Optional.of(t);
-        }
-        String match = "";
-        for (String key : map.keySet()) {
-            if (key.startsWith(in)) {
-                if (match.isEmpty()) {
-                    match = key;
-                } else {
-                    return Optional.empty();
-                }
-            }
-        }
-        return Optional.ofNullable(map.get(match));
+        return Optional.ofNullable(map.get(in));
+    }
+
+    static Map<String, String[]> altNames() {
+        Map<String, String[]> altNames = new HashMap<>();
+        // colors
+        altNames.put("aqua", new String[]{"aqua", "aq", "&b", "b"});
+        altNames.put("black", new String[]{"black", "&0", "0"});
+        altNames.put("blue", new String[]{"blue", "blu", "&9", "9"});
+        altNames.put("dark_aqua", new String[]{"dark_aqua", "*aqua", "aqua*", "*aq", "aq*", "&3", "3"});
+        altNames.put("dark_blue", new String[]{"dark_blue", "*blue", "blue*", "*blu", "blu*", "&1", "1"});
+        altNames.put("dark_gray", new String[]{"dark_gray", "*gray", "gray*", "*grey", "grey*", "*gry", "gry*", "&8", "8"});
+        altNames.put("dark_green", new String[]{"dark_green", "*green", "green*", "*grn", "grn*", "&2", "2"});
+        altNames.put("dark_purple", new String[]{"dark_purple", "*purple", "purple*", "*pur", "pur*", "&5", "5"});
+        altNames.put("dark_red", new String[]{"dark_red", "*red", "red*", "&4", "4"});
+        altNames.put("gray", new String[]{"gray", "grey", "gry", "&7", "7"});
+        altNames.put("green", new String[]{"green", "grn", "&a", "d"});
+        altNames.put("gold", new String[]{"gold", "dark_yellow", "*yellow", "yellow*", "*yel", "yel*", "&e", "e"});
+        altNames.put("light_purple", new String[]{"light_purple", "purple", "pur", "&d", "d"});
+        altNames.put("red", new String[]{"red", "&c", "c"});
+        altNames.put("white", new String[]{"white", "whi", "&f", "f"});
+        altNames.put("yellow", new String[]{"yellow", "yel", "&e", "e"});
+        // styles
+        altNames.put("bold", new String[]{"bold", "bld", "&l", "l", "*"});
+        altNames.put("italic", new String[]{"italic", "ita", "&o", "o", "_"});
+        altNames.put("obfuscated", new String[]{"obfuscated", "obfuscate", "obf", "&k", "k", "?"});
+        altNames.put("strikethrough", new String[]{"strikethrough", "strike", "&m", "m", "~"});
+        altNames.put("underline", new String[]{"underlined", "underline", "und", "&n", "n", "#"});
+        // reset
+        altNames.put("reset", new String[]{"reset", "rst", "&r", "r"});
+        return altNames;
     }
 
     static Map<String, TextColor> textColors() {
         try {
-            return Sponge.getRegistry().getAllOf(TextColor.class).stream()
-                    .collect(Collectors.toMap(c -> c.getName().toLowerCase(), c -> c));
+            Map<String, String[]> altNames = altNames();
+            Map<String, TextColor> map = new HashMap<>();
+            Sponge.getRegistry().getAllOf(TextColor.class).forEach(color -> {
+                String[] names = altNames.get(color.getName().toLowerCase());
+                if (names != null) {
+                    for (String name : names) {
+                        map.put(name, color);
+                    }
+                } else {
+                    map.put(color.getName().toLowerCase(), color);
+                }
+            });
+            return map;
         } catch (Throwable t) {
             t.printStackTrace();
             return Collections.emptyMap();
@@ -153,8 +181,19 @@ static Map<String, TextColor> textColors() {
 
     static Map<String, TextStyle> textStyles() {
         try {
-            return Sponge.getRegistry().getAllOf(TextStyle.Base.class).stream()
-                    .collect(Collectors.toMap(c -> c.getName().toLowerCase(), s -> s));
+            Map<String, String[]> altNames = altNames();
+            Map<String, TextStyle> map = new HashMap<>();
+            Sponge.getRegistry().getAllOf(TextStyle.Base.class).forEach(style -> {
+                String[] names = altNames.get(style.getName().toLowerCase());
+                if (names != null) {
+                    for (String name : names) {
+                        map.put(name, style);
+                    }
+                } else {
+                    map.put(style.getName().toLowerCase(), style);
+                }
+            });
+            return map;
         } catch (Throwable t) {
             t.printStackTrace();
             return Collections.emptyMap();

src/test/java/ParseTests.java

@@ -65,7 +65,7 @@ public void test4() {
 
     @Test
     public void test5() {
-        test("hello [world](red)", Text.builder("hello ")
+        test("hello [world](&c)", Text.builder("hello ")
                 .append(Text.builder("world").color(TestColor.RED).build())
                 .build());
     }
@@ -103,8 +103,9 @@ public void test8() {
 
     @Test
     public void test9() {
+        // * = bold, blu = blue, yel* = gold, # = underline
         test(
-                "Outer1 [inner1 [inner2 [inner3](red,bold)](blue,italic)](green,[hover text](gold,underline)) outer2",
+                "Outer1 [inner1 [inner2 [inner3](red,*)](blu,italic)](green,[hover text](yel*,#)) outer2",
                 Text.builder("Outer1 ")
                         .append(Text.builder("inner1 ")
                                 .color(TestColor.GREEN)