Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@94ef34c Fix incorrect ansi code being used for bold (#8000)
PaperMC/Paper@2dcfb2b Nameable Banner API (#7711)
This commit is contained in:
BillyGalbreath 2022-06-15 23:16:50 -05:00
parent 00603687b3
commit a92a8df112
No known key found for this signature in database
GPG Key ID: 1968A5C4D57BB3FA
3 changed files with 2 additions and 30 deletions

View File

@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19-R0.1-SNAPSHOT
paperCommit = 17c1c6c3e71c4fbef3a86ca6a0e64d2a46910669
paperCommit = 2dcfb2b11fb0ef9807d01c81e891d90b74ba4750
org.gradle.caching = true
org.gradle.parallel = true

View File

@ -18,7 +18,7 @@ index 05bda808496f38d10416c3702b1f97fe18247769..99c8b4957194868c36f9ea214c7f77a2
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index bcb386d4cbd37ed41cf27808c7104d2780ce2558..6dd8cc13d32138c5cb7aa9c950f80c8881861fe1 100644
index 3d96a49cca34f0a3f3b37de839e476c2a4c1f1d6..fecfe935e09ff52a6ec582e6f2e09611adb1106f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -417,11 +417,13 @@ public class PurpurConfig {

View File

@ -1,28 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Sat, 11 Jun 2022 02:54:53 -0500
Subject: [PATCH] Fix bold text 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 489dc33154bebd70b31480807f104e15e97f4f2c..be741daa4df009375d9d6e8ed51abb36722bb5ae 100644
--- a/src/main/java/io/papermc/paper/console/HexFormattingConverter.java
+++ b/src/main/java/io/papermc/paper/console/HexFormattingConverter.java
@@ -70,7 +70,7 @@ public final class HexFormattingConverter extends LogEventPatternConverter {
formatHexAnsi(NamedTextColor.YELLOW), // Yellow §e
formatHexAnsi(NamedTextColor.WHITE), // White §f
"\u001B[5m", // Obfuscated §k
- "\u001B[21m", // Bold §l
+ "\u001B[1m", // Bold §l // Purpur
"\u001B[9m", // Strikethrough §m
"\u001B[4m", // Underline §n
"\u001B[3m", // Italic §o
@@ -94,7 +94,7 @@ public final class HexFormattingConverter extends LogEventPatternConverter {
"\u001B[0;33;1m", // Yellow §e
"\u001B[0;37;1m", // White §f
"\u001B[5m", // Obfuscated §k
- "\u001B[21m", // Bold §l
+ "\u001B[1m", // Bold §l // Purpur
"\u001B[9m", // Strikethrough §m
"\u001B[4m", // Underline §n
"\u001B[3m", // Italic §o