mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57:43 +01:00
35 lines
2.0 KiB
Diff
35 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <blake.galbreath@gmail.com>
|
|
Date: Sun, 13 Mar 2022 21:00:02 -0500
|
|
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
|
|
--- 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 {
|
|
private static final String ANSI_RESET = "\u001B[m";
|
|
|
|
private static final char COLOR_CHAR = 0x7f;
|
|
+ private static final char LEGACY_CHAR = 0xa7; // Purpur
|
|
public static final LegacyComponentSerializer SERIALIZER = LegacyComponentSerializer.builder()
|
|
.hexColors()
|
|
.flattener(PaperAdventure.FLATTENER)
|
|
@@ -48,6 +49,7 @@ 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_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 {
|
|
}
|
|
|
|
static void format(String content, StringBuilder result, int start, boolean ansi) {
|
|
+ content = LEGACY_PATTERN.matcher(content).replaceAll(COLOR_CHAR + "$1"); // Purpur
|
|
int next = content.indexOf(COLOR_CHAR);
|
|
int last = content.length() - 1;
|
|
if (next == -1 || next == last) {
|