From d8c6f067185d711fab5639a7e3508c10060dd2e7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 13 Mar 2022 23:28:54 -0500 Subject: [PATCH] Fix legacy hex colors in console, too --- .../0271-Fix-legacy-colors-in-console.patch | 35 +++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/patches/server/0271-Fix-legacy-colors-in-console.patch b/patches/server/0271-Fix-legacy-colors-in-console.patch index 7b4efdb96..a36c5c519 100644 --- a/patches/server/0271-Fix-legacy-colors-in-console.patch +++ b/patches/server/0271-Fix-legacy-colors-in-console.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix legacy colors in console diff --git a/src/main/java/io/papermc/paper/console/HexFormattingConverter.java b/src/main/java/io/papermc/paper/console/HexFormattingConverter.java -index ea83ee8762c126c449993a7497257b0bd8663452..a994fc41efc7e27f1a231b15aaf31628352fbf08 100644 +index ea83ee8762c126c449993a7497257b0bd8663452..ecd3da582fe9f77f39f920029f5121c6d8099525 100644 --- a/src/main/java/io/papermc/paper/console/HexFormattingConverter.java +++ b/src/main/java/io/papermc/paper/console/HexFormattingConverter.java @@ -38,6 +38,7 @@ public final class HexFormattingConverter extends LogEventPatternConverter { @@ -16,15 +16,44 @@ index ea83ee8762c126c449993a7497257b0bd8663452..a994fc41efc7e27f1a231b15aaf31628 public static final LegacyComponentSerializer SERIALIZER = LegacyComponentSerializer.builder() .hexColors() .flattener(PaperAdventure.FLATTENER) -@@ -48,6 +49,7 @@ public final class HexFormattingConverter extends LogEventPatternConverter { +@@ -48,6 +49,8 @@ public final class HexFormattingConverter extends LogEventPatternConverter { private static final String RGB_ANSI = "\u001B[38;2;%d;%d;%dm"; private static final Pattern NAMED_PATTERN = Pattern.compile(COLOR_CHAR + "[0-9a-fk-orA-FK-OR]"); private static final Pattern RGB_PATTERN = Pattern.compile(COLOR_CHAR + "#([0-9a-fA-F]){6}"); ++ private static final Pattern LEGACY_RGB_PATTERN = Pattern.compile(LEGACY_CHAR + "x((" + LEGACY_CHAR + "[0-9a-fA-F]){6})"); // Purpur + private static final Pattern LEGACY_PATTERN = Pattern.compile(LEGACY_CHAR + "([0-9a-fk-orxA-FK-ORX])"); // Purpur private static final String[] RGB_ANSI_CODES = new String[]{ formatHexAnsi(NamedTextColor.BLACK), // Black ยง0 -@@ -155,6 +157,7 @@ public final class HexFormattingConverter extends LogEventPatternConverter { +@@ -133,7 +136,21 @@ public final class HexFormattingConverter extends LogEventPatternConverter { + } + + private static String convertRGBColors(final String input) { +- return RGB_PATTERN.matcher(input).replaceAll(result -> { ++ // Purpur start - lets just shove this back in place ++ Matcher matcher = LEGACY_RGB_PATTERN.matcher(input); ++ StringBuilder buffer = new StringBuilder(); ++ while (matcher.find()) { ++ String s = matcher.group().replace(String.valueOf(LEGACY_CHAR), "").replace('x', '#'); ++ int hex = Integer.decode(s); ++ int red = (hex >> 16) & 0xFF; ++ int green = (hex >> 8) & 0xFF; ++ int blue = hex & 0xFF; ++ String replacement = String.format(RGB_ANSI, red, green, blue); ++ matcher.appendReplacement(buffer, replacement); ++ } ++ matcher.appendTail(buffer); ++ return RGB_PATTERN.matcher(buffer.toString()).replaceAll(result -> { ++ // Purpur end + final int hex = Integer.decode(result.group().substring(1)); + return formatHexAnsi(hex); + }); +@@ -151,10 +168,11 @@ public final class HexFormattingConverter extends LogEventPatternConverter { + } + + private static String stripRGBColors(final String input) { +- return RGB_PATTERN.matcher(input).replaceAll(""); ++ return LEGACY_RGB_PATTERN.matcher(RGB_PATTERN.matcher(input).replaceAll("")).replaceAll(""); // Purpur } static void format(String content, StringBuilder result, int start, boolean ansi) {