mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
e973e3cbcc
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@af94364 Fix slime spawners not spawning outside slime chunks (#7741) PaperMC/Paper@6b9f7a0 Don't fire worldborder events for virtual borders (#7749) PaperMC/Paper@8bfb1d2 Pass ServerLevel for gamerule callbacks (#7668) PaperMC/Paper@c66b0f9 Add pre-unbreaking amount to PlayerItemDamageEvent (#7724) PaperMC/Paper@86fb3d2 Don't send itemmeta for books with the hide option enabled (#7734) PaperMC/Paper@c642d25 Improve update folder behavior (#7687) Pufferfish Changes: pufferfish-gg/Pufferfish@1bedb87 Updated Upstream (Paper) pufferfish-gg/Pufferfish@952b720 Add additional SIMD debug info/fix messages pufferfish-gg/Pufferfish@54099cf Put Java 18 in SIMD error messages
64 lines
3.5 KiB
Diff
64 lines
3.5 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..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 {
|
|
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,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
|
|
@@ -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) {
|
|
+ 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) {
|