mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-18 11:22:15 +01:00
Fix Log4J converter not parsing hex without named colors (#5228)
This commit is contained in:
parent
30fd8a86d9
commit
cd60d3a8f9
1 changed files with 12 additions and 6 deletions
|
@ -13,6 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
@@ -0,0 +0,0 @@
|
@@ -0,0 +0,0 @@
|
||||||
+package io.papermc.paper.console;
|
+package io.papermc.paper.console;
|
||||||
+
|
+
|
||||||
|
+import net.kyori.adventure.text.format.TextColor;
|
||||||
+import net.minecrell.terminalconsole.TerminalConsoleAppender;
|
+import net.minecrell.terminalconsole.TerminalConsoleAppender;
|
||||||
+import org.apache.logging.log4j.core.LogEvent;
|
+import org.apache.logging.log4j.core.LogEvent;
|
||||||
+import org.apache.logging.log4j.core.config.Configuration;
|
+import org.apache.logging.log4j.core.config.Configuration;
|
||||||
|
@ -22,7 +23,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+import org.apache.logging.log4j.util.PerformanceSensitive;
|
+import org.apache.logging.log4j.util.PerformanceSensitive;
|
||||||
+import org.apache.logging.log4j.util.PropertiesUtil;
|
+import org.apache.logging.log4j.util.PropertiesUtil;
|
||||||
+
|
+
|
||||||
+import java.awt.*;
|
|
||||||
+import java.util.List;
|
+import java.util.List;
|
||||||
+import java.util.regex.Matcher;
|
+import java.util.regex.Matcher;
|
||||||
+import java.util.regex.Pattern;
|
+import java.util.regex.Pattern;
|
||||||
|
@ -102,7 +102,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ boolean useAnsi = ansi && TerminalConsoleAppender.isAnsiSupported();
|
+ boolean useAnsi = ansi && TerminalConsoleAppender.isAnsiSupported();
|
||||||
+ String content = useAnsi ? convertRGBColors(toAppendTo.substring(start)) : stripRGBColors(toAppendTo.substring(start));
|
+ String content = toAppendTo.substring(start);
|
||||||
|
+ content = useAnsi ? convertRGBColors(content) : stripRGBColors(content);
|
||||||
+ format(content, toAppendTo, start, useAnsi);
|
+ format(content, toAppendTo, start, useAnsi);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
|
@ -111,10 +112,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+ StringBuffer buffer = new StringBuffer();
|
+ StringBuffer buffer = new StringBuffer();
|
||||||
+ while (matcher.find()) {
|
+ while (matcher.find()) {
|
||||||
+ String s = matcher.group().replace(String.valueOf(COLOR_CHAR), "").replace('x', '#');
|
+ String s = matcher.group().replace(String.valueOf(COLOR_CHAR), "").replace('x', '#');
|
||||||
+ Color color = Color.decode(s);
|
+ TextColor color = TextColor.fromHexString(s);
|
||||||
+ int red = color.getRed();
|
+ int red = color.red();
|
||||||
+ int blue = color.getBlue();
|
+ int blue = color.blue();
|
||||||
+ int green = color.getGreen();
|
+ int green = color.green();
|
||||||
+ String replacement = String.format(RGB_ANSI, red, green, blue);
|
+ String replacement = String.format(RGB_ANSI, red, green, blue);
|
||||||
+ matcher.appendReplacement(buffer, replacement);
|
+ matcher.appendReplacement(buffer, replacement);
|
||||||
+ }
|
+ }
|
||||||
|
@ -136,6 +137,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+ int next = s.indexOf(COLOR_CHAR);
|
+ int next = s.indexOf(COLOR_CHAR);
|
||||||
+ int last = s.length() - 1;
|
+ int last = s.length() - 1;
|
||||||
+ if (next == -1 || next == last) {
|
+ if (next == -1 || next == last) {
|
||||||
|
+ result.setLength(start);
|
||||||
|
+ result.append(s);
|
||||||
|
+ if (ansi) {
|
||||||
|
+ result.append(ANSI_RESET);
|
||||||
|
+ }
|
||||||
+ return;
|
+ return;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
|
|
Loading…
Add table
Reference in a new issue