mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
fe3250cfec
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@c1bca9a Add exploded block state to BlockExplodeEvent (#6818) PaperMC/Paper@94373f0 Fix OfflinePlayer#getPlayerProfile returning deprecated type (#8543) PaperMC/Paper@7b52db5 Fix buffer-joins-to-world patch PaperMC/Paper@048ee58 Fix OfflinePlayer getPlayerProfile return type (#8710) PaperMC/Paper@e05ba98 Avoid to spam the transform event for hoglin->zoglin conversion (#8712) PaperMC/Paper@8e83c3c Deprecate ProjectileCollideEvent (#8678) PaperMC/Paper@c59922d Expose signed message in chat events (#8694) PaperMC/Paper@5717b84 Add config option for spider worldborder climbing (#6448) PaperMC/Paper@e6f61f7 fix ArmorStandMeta not applying false flags (#8632) PaperMC/Paper@47abd1c Add EntityPushedByEntityEvent (#7704) PaperMC/Paper@f26e9cc Tadpole lock API (#8297) PaperMC/Paper@3331501 Use team display name for quit message (#7127) PaperMC/Paper@1975fbe Respect SpigotConfig logCommands & fix stopDancing() NPE (#8715) PaperMC/Paper@78a91df Fix (again) Player#getPlayerProfile no such method error (#8722) PaperMC/Paper@52718db Updated Upstream (Bukkit/CraftBukkit) (#8714) PaperMC/Paper@2040c1e Player Flying Fall Damage API (#5357)
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 b9922b07cb105618390187d98acdf89e728e1f5a..6a1eda942aa33fc0802066416f8bc64f5f15d011 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)
|
|
@@ -49,6 +50,8 @@ public final class HexFormattingConverter extends LogEventPatternConverter {
|
|
private static final String RESET_RGB_ANSI = ANSI_RESET + RGB_ANSI;
|
|
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
|
|
@@ -134,7 +137,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);
|
|
});
|
|
@@ -152,10 +169,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) {
|