TheCreeperCow / CraftBukkit / 74b6982b034

Commits

Narimm authored and md_5 committed 74b6982b034 27 Aug 2020

#711: Add Full RGB support to the console

This is a fairly hacky way to do this - primarily because the Ansi library doesnt support RGB - however the VT100 codes here are the standard for RGB terminals.

src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java

Modified

-1
+package org.bukkit.craftbukkit.command;
-2
-+
+import java.awt.Color;
-4
+import java.util.EnumMap;
-5
+import java.util.Map;
-+
+import java.util.regex.Matcher;
-+
+import java.util.regex.Pattern;
-8
+import jline.Terminal;
-9
+import org.bukkit.Bukkit;
-10
+import org.bukkit.ChatColor;
-11
+import org.bukkit.command.ConsoleCommandSender;
-12
+import org.bukkit.craftbukkit.CraftServer;
-13
+import org.fusesource.jansi.Ansi;
-14
+import org.fusesource.jansi.Ansi.Attribute;
-15
-16
+public class ColouredConsoleSender extends CraftConsoleCommandSender {
-17
+    private final Terminal terminal;
-18
+    private final Map<ChatColor, String> replacements = new EnumMap<ChatColor, String>(ChatColor.class);
-19
+    private final ChatColor[] colors = ChatColor.values();
-20
+    private final boolean jansiPassthrough;
-+
+    private static final char ANSI_ESC_CHAR = '\u001B';
-+
+    private static final String RGB_STRING = String.valueOf(ANSI_ESC_CHAR) + "[38;2;%d;%d;%dm";
-+
+    private static final Pattern RBG_TRANSLATE = Pattern.compile(String.valueOf(ChatColor.COLOR_CHAR) + "x(" + String.valueOf(ChatColor.COLOR_CHAR) + "[A-F0-9]){6}", Pattern.CASE_INSENSITIVE);
-24
-25
+    protected ColouredConsoleSender() {
-26
+        super();
-27
+        this.terminal = ((CraftServer) getServer()).getReader().getTerminal();
-28
+        this.jansiPassthrough = Boolean.getBoolean("jansi.passthrough");
-29
-30
+        replacements.put(ChatColor.BLACK, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.BLACK).boldOff().toString());
-31
+        replacements.put(ChatColor.DARK_BLUE, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.BLUE).boldOff().toString());
-32
+        replacements.put(ChatColor.DARK_GREEN, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.GREEN).boldOff().toString());
-33
+        replacements.put(ChatColor.DARK_AQUA, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.CYAN).boldOff().toString());
-49
+        replacements.put(ChatColor.UNDERLINE, Ansi.ansi().a(Attribute.UNDERLINE).toString());
-50
+        replacements.put(ChatColor.ITALIC, Ansi.ansi().a(Attribute.ITALIC).toString());
-51
+        replacements.put(ChatColor.RESET, Ansi.ansi().a(Attribute.RESET).toString());
-52
+    }
-53
-54
+    @Override
-55
+    public void sendMessage(String message) {
-56
+        // support jansi passthrough VM option when jansi doesn't detect an ANSI supported terminal
-57
+        if (jansiPassthrough || terminal.isAnsiSupported()) {
-58
+            if (!conversationTracker.isConversingModaly()) {
--
+                String result = message.replaceAll("(?i)" + ChatColor.COLOR_CHAR + "x(" + ChatColor.COLOR_CHAR + "[0-9a-f]){6}", ""); // Hex is not supported by ANSI console
-+
+                String result = convertRGBColors(message);
-60
+                for (ChatColor color : colors) {
-61
+                    if (replacements.containsKey(color)) {
-62
+                        result = result.replaceAll("(?i)" + color.toString(), replacements.get(color));
-63
+                    } else {
-64
+                        result = result.replaceAll("(?i)" + color.toString(), "");
-65
+                    }
-66
+                }
-67
+                System.out.println(result + Ansi.ansi().reset().toString());
-68
+            }
-69
+        } else {
-70
+            super.sendMessage(message);
-71
+        }
-72
+    }
-73
-+
+    private static String convertRGBColors(String input) {
-+
+        Matcher matcher = RBG_TRANSLATE.matcher(input);
-+
+        StringBuffer buffer = new StringBuffer();
-+
+        while (matcher.find()) {
-+
+            String s = matcher.group().replace("§", "").replace('x', '#');
-+
+            Color color = Color.decode(s);
-+
+            int red = color.getRed();
-+
+            int blue = color.getBlue();
-+
+            int green = color.getGreen();
-+
+            String replacement = String.format(RGB_STRING, red, green, blue);
-+
+            matcher.appendReplacement(buffer, replacement);
-+
+        }
-+
+        matcher.appendTail(buffer);
-+
+        return buffer.toString();
-+
+    }
-+
-90
+    public static ConsoleCommandSender getInstance() {
-91
+        if (Bukkit.getConsoleSender() != null) {
-92
+            return Bukkit.getConsoleSender();
-93
+        } else {
-94
+            return new ColouredConsoleSender();
-95
+        }
-96
+    }
-97
+}

CraftBukkit

Commits

Jira Issues

Add shortcut