Add hex colour support &#xxxxxx

CitizensDev · Nov 4, 2020 · 9d8b22b · 9d8b22b
1 parent 6075267
commit 9d8b22b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/util/Colorizer.java b/src/main/java/net/citizensnpcs/api/util/Colorizer.java
@@ -7,7 +7,9 @@
 
 public class Colorizer {
     public static String parseColors(String parsed) {
-        Matcher matcher = COLOR_MATCHER.matcher(ChatColor.translateAlternateColorCodes('&', parsed));
+        Matcher matcher = HEX_MATCHER.matcher(parsed);
+        parsed = matcher.replaceAll("&x&$1&$2&$3&$4&$5&$6");
+        matcher = COLOR_MATCHER.matcher(ChatColor.translateAlternateColorCodes('&', parsed));
         return matcher.replaceAll(GROUP);
     }
 
@@ -18,11 +20,14 @@ public static String stripColors(String parsed) {
 
     private static Pattern COLOR_MATCHER;
     private static String GROUP = ChatColor.COLOR_CHAR + "$1";
+    private static Pattern HEX_MATCHER = Pattern
+            .compile("&#([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])", Pattern.CASE_INSENSITIVE);
 
     static {
         String colors = "";
-        for (ChatColor color : ChatColor.values())
+        for (ChatColor color : ChatColor.values()) {
             colors += color.getChar();
+        }
         COLOR_MATCHER = Pattern.compile("\\<([COLORS])\\>".replace("COLORS", colors), Pattern.CASE_INSENSITIVE);
     }
 }