Properly support RGB (Fixes #6)

Phoenix616 · Sep 22, 2020 · 880cd32 · 880cd32
1 parent b8e3c6c
commit 880cd32
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/src/main/java/de/themoep/minedown/adventure/MineDownParser.java b/src/main/java/de/themoep/minedown/adventure/MineDownParser.java
@@ -177,13 +177,13 @@ public ComponentBuilder parse(String message) throws IllegalArgumentException {
                     char c1 = message.charAt(j);
                     if (c1 == c) {
                         try {
-                            encoded = NamedTextColor.NAMES.value(colorString.toString().toLowerCase(Locale.ROOT));
+                            encoded = parse(colorString.toString(), "", lenient());
                             i = j;
                         } catch (IllegalArgumentException ignored) {
                         }
                         break;
                     }
-                    if (c1 != '_' && (c1 < 'A' || c1 > 'Z') && (c1 < 'a' || c1 > 'z')) {
+                    if (c1 != '_' && c1 != '#' && (c1 < 'A' || c1 > 'Z') && (c1 < 'a' || c1 > 'z') && (c1 < '0' || c1 > '9')) {
                         break;
                     }
                     colorString.append(c1);
@@ -584,13 +584,17 @@ public static TextFormat parse(String colorString, String prefix, boolean lenien
                 throw new IllegalArgumentException(colorString.charAt(prefix.length()) + " is not a valid " + prefix + " char!");
             }
         } else {
-            format = NamedTextColor.NAMES.value(colorString.substring(prefix.length()).toLowerCase(Locale.ROOT));
-            if (format == null) {
-                try {
-                    format = TextDecoration.valueOf(colorString.substring(prefix.length()).toUpperCase(Locale.ROOT));
-                } catch (IllegalArgumentException e2) {
-                    if (!lenient) {
-                        throw e2;
+            if (colorString.charAt(prefix.length()) == '#') {
+                format = TextColor.fromCSSHexString(colorString.substring(prefix.length()));
+            } else {
+                format = NamedTextColor.NAMES.value(colorString.substring(prefix.length()).toLowerCase(Locale.ROOT));
+                if (format == null) {
+                    try {
+                        format = TextDecoration.valueOf(colorString.substring(prefix.length()).toUpperCase(Locale.ROOT));
+                    } catch (IllegalArgumentException e2) {
+                        if (!lenient) {
+                            throw e2;
+                        }
                     }
                 }
             }

diff --git a/src/test/java/de/themoep/minedown/adventure/tests/ParserTest.java b/src/test/java/de/themoep/minedown/adventure/tests/ParserTest.java
@@ -66,6 +66,18 @@ public void testParsing() {
         );
         Assertions.assertThrows(IllegalArgumentException.class, () -> MineDown.parse("&bTest [this](color=green format=green,bold,italic https://example.com) shit!"));
     }
+
+    @Test
+    public void testParseHexColors() {
+        System.out.println("testParseHexColors");
+        Assertions.assertAll(
+                () -> parse("##&eTest## [&#593&b__this__](Text) ~~string~~!"),
+                () -> parse("##&eTest## [&#593593&b__this__](Text) ~~string~~!"),
+                () -> parse("##&eTest## [__this \\&6 \\that__](#290329 /example command hover=**Hover ??text??**) ~~string~~!"),
+                () -> parse("##&eTest## [__this \\&6 \\that__](color=#290329 /example command hover=**Hover ??text??**) ~~string~~!")
+        );
+        Assertions.assertThrows(IllegalArgumentException.class, () -> MineDown.parse("&bTest [this](color=green format=green,bold,italic https://example.com) shit!"));
+    }
 
     @Test
     public void testReplacing() {