OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-04 22:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

#655: Added support for the VM tag jansi.passthrough when processing messages sent to a ColouredConsoleSender.

Browse source
This commit is contained in:
Martoph 2020-04-23 11:06:13 +10:00 committed by md_5
parent e0cfb34742
commit ef706b064e
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
View file

@ -14,10 +14,12 @@ public class ColouredConsoleSender extends CraftConsoleCommandSender {
private final Terminal terminal; private final Terminal terminal;
private final Map<ChatColor, String> replacements = new EnumMap<ChatColor, String>(ChatColor.class); private final Map<ChatColor, String> replacements = new EnumMap<ChatColor, String>(ChatColor.class);
private final ChatColor[] colors = ChatColor.values(); private final ChatColor[] colors = ChatColor.values();
private final boolean jansiPassthrough;
protected ColouredConsoleSender() { protected ColouredConsoleSender() {
super(); super();
this.terminal = ((CraftServer) getServer()).getReader().getTerminal(); this.terminal = ((CraftServer) getServer()).getReader().getTerminal();
this.jansiPassthrough = Boolean.getBoolean("jansi.passthrough");
replacements.put(ChatColor.BLACK, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.BLACK).boldOff().toString()); replacements.put(ChatColor.BLACK, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.BLACK).boldOff().toString());
replacements.put(ChatColor.DARK_BLUE, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.BLUE).boldOff().toString()); replacements.put(ChatColor.DARK_BLUE, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.BLUE).boldOff().toString());
@ -45,7 +47,8 @@ public class ColouredConsoleSender extends CraftConsoleCommandSender {
@Override @Override
public void sendMessage(String message) { public void sendMessage(String message) {
if (terminal.isAnsiSupported()) { // support jansi passthrough VM option when jansi doesn't detect an ANSI supported terminal
if (jansiPassthrough || terminal.isAnsiSupported()) {
if (!conversationTracker.isConversingModaly()) { if (!conversationTracker.isConversingModaly()) {
String result = message; String result = message;
for (ChatColor color : colors) { for (ChatColor color : colors) {