Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #77 Add option to disable console hex color support

Browse Source
This commit is contained in:
BillyGalbreath
2020-11-16 13:00:21 -06:00
parent b3b4a11b6c
commit f7d6be9998
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0127-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] PaperPR - Add hex color code support for console logging
diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
index 685deaa0e..af8bf0fe2 100644 index 685deaa0e..2a0ada490 100644
--- a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java --- a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
+++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
@@ -1,17 +1,52 @@ @@ -1,17 +1,52 @@
@@ -41,7 +41,7 @@ index 685deaa0e..af8bf0fe2 100644
+ private static String hexMagicToAnsi(String input) { + private static String hexMagicToAnsi(String input) {
+ // If formatting should be kept, just leave the input as-is + // If formatting should be kept, just leave the input as-is
+ if (keepFormatting) + if (keepFormatting || !net.pl3x.purpur.PurpurConfig.useHexColorsInConsole) // Purpur
+ return input; + return input;
+ +
+ // If Ansi is not supported, just strip out any hex coloring + // If Ansi is not supported, just strip out any hex coloring
@@ -62,3 +62,19 @@ index 685deaa0e..af8bf0fe2 100644
+ return buffer.toString() + ANSI_RESET; + return buffer.toString() + ANSI_RESET;
+ } + }
} }
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d33d24af6..9f68a9d64 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -221,9 +221,11 @@ public class PurpurConfig {
public static boolean loggerSuppressInitLegacyMaterialError = false;
public static boolean loggerSuppressIgnoredAdvancementWarnings = false;
+ public static boolean useHexColorsInConsole = true;
private static void loggerSettings() {
loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError);
loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
+ useHexColorsInConsole = getBoolean("settings.logger.hex-color-support-in-console", useHexColorsInConsole);
}
public static boolean tpsCatchup = true;