Skip to content

Commit

Permalink
Updated Upstream (Paper)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@8796175 Handle legacy quirk in the console formatter (#8434)
PaperMC/Paper@54daefa Fix whitespace error in recent patch
  • Loading branch information
BillyGalbreath committed Nov 30, 2022
1 parent afd4044 commit 42b7e81
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19.2-R0.1-SNAPSHOT

paperCommit = 309133e2e14502e3734e5be8aec4068549abf3f8
paperCommit = 54daefa0ca8c89df0046cddb41a11983d305a584

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
10 changes: 5 additions & 5 deletions patches/server/0265-Fix-legacy-colors-in-console.patch
Expand Up @@ -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 b4d0b7ecd56ab952319946854168c1299cb0b1be..8054b8da82ca455d23b26a53cc568160b14e04ce 100644
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 {
Expand All @@ -16,16 +16,16 @@ index b4d0b7ecd56ab952319946854168c1299cb0b1be..8054b8da82ca455d23b26a53cc568160
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";
@@ -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
@@ -133,7 +136,21 @@ public final class HexFormattingConverter extends LogEventPatternConverter {
@@ -134,7 +137,21 @@ public final class HexFormattingConverter extends LogEventPatternConverter {
}

private static String convertRGBColors(final String input) {
Expand All @@ -48,7 +48,7 @@ index b4d0b7ecd56ab952319946854168c1299cb0b1be..8054b8da82ca455d23b26a53cc568160
final int hex = Integer.decode(result.group().substring(1));
return formatHexAnsi(hex);
});
@@ -151,10 +168,11 @@ public final class HexFormattingConverter extends LogEventPatternConverter {
@@ -152,10 +169,11 @@ public final class HexFormattingConverter extends LogEventPatternConverter {
}

private static String stripRGBColors(final String input) {
Expand Down

0 comments on commit 42b7e81

Please sign in to comment.