aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2023-06-15 09:24:01 -0700
committerGitHub <[email protected]>2023-06-15 09:24:01 -0700
commit8bc0574fb8c5a6c57aa5ef6868488bdb44a8113b (patch)
tree053b0be3870651b094024d446ec0e1204f6c92e7
parentbae6096aa28a1810ec24215cdbae52c255ad736a (diff)
downloadPaper-8bc0574fb8c5a6c57aa5ef6868488bdb44a8113b.tar.gz
Paper-8bc0574fb8c5a6c57aa5ef6868488bdb44a8113b.zip
Bump kyori's ansi to fix color bleed (#9346)
-rw-r--r--patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch5
-rw-r--r--patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch4
-rw-r--r--patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch4
-rw-r--r--patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch6
-rw-r--r--patches/server/0393-Implement-Mob-Goal-API.patch4
-rw-r--r--patches/server/0710-Use-Velocity-compression-and-cipher-natives.patch4
-rw-r--r--patches/server/0827-Add-support-for-Proxy-Protocol.patch4
7 files changed, 16 insertions, 15 deletions
diff --git a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
index 87d2eb89d0..74f5c4fe0f 100644
--- a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -25,10 +25,10 @@ Other changes:
Co-Authored-By: Emilia Kond <[email protected]>
diff --git a/build.gradle.kts b/build.gradle.kts
-index 9ab4d3e462c02e4d23b45adb46965eb75eb2178e..3a72c4b2f5f2404518bb606c148a431d98f0b5f4 100644
+index 9ab4d3e462c02e4d23b45adb46965eb75eb2178e..a651a41b33cb671e0d0bd7b2f990b2a727d6b15c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
-@@ -8,7 +8,19 @@ plugins {
+@@ -8,7 +8,20 @@ plugins {
dependencies {
implementation(project(":paper-api"))
@@ -37,6 +37,7 @@ index 9ab4d3e462c02e4d23b45adb46965eb75eb2178e..3a72c4b2f5f2404518bb606c148a431d
+ implementation("org.jline:jline-terminal-jansi:3.21.0")
+ implementation("net.minecrell:terminalconsoleappender:1.3.0")
+ implementation("net.kyori:adventure-text-serializer-ansi:4.14.0") // Keep in sync with adventureVersion from Paper-API build file
++ implementation("net.kyori:ansi:1.0.1") // Manually bump beyond above transitive dep
+ /*
+ Required to add the missing Log4j2Plugins.dat file from log4j-core
+ which has been removed by Mojang. Without it, log4j has to classload
diff --git a/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
index ed8fc4f190..422c8eb939 100644
--- a/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -15,10 +15,10 @@ This may cause additional prefixes to be disabled for plugins bypassing
the plugin logger.
diff --git a/build.gradle.kts b/build.gradle.kts
-index 3a72c4b2f5f2404518bb606c148a431d98f0b5f4..bfa7e0cb164bdf31b5f54945c6b4345379cfc747 100644
+index a651a41b33cb671e0d0bd7b2f990b2a727d6b15c..588d5370a10de25f80022d64abb8af0f16ce943b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
-@@ -18,7 +18,7 @@ dependencies {
+@@ -19,7 +19,7 @@ dependencies {
all its classes to check if they are plugins.
Scanning takes about 1-2 seconds so adding this speeds up the server start.
*/
diff --git a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index 448b0f8554..88ab68ad27 100644
--- a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
diff --git a/build.gradle.kts b/build.gradle.kts
-index bfa7e0cb164bdf31b5f54945c6b4345379cfc747..a00d4f3763929e605bb3ffbbd838e51a77006992 100644
+index 588d5370a10de25f80022d64abb8af0f16ce943b..de1586eb07570ab7daf1775550522bb911699d0e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
-@@ -29,6 +29,7 @@ dependencies {
+@@ -30,6 +30,7 @@ dependencies {
implementation("commons-lang:commons-lang:2.6")
runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
diff --git a/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index fb8b5a6606..13212aa41d 100644
--- a/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
diff --git a/build.gradle.kts b/build.gradle.kts
-index ffa1df9af1ff38ac7bbd64bca764659f308b147a..03bf39337d32b1947b6c57070bfa1de08da72179 100644
+index 50de0801f88091b8e5587ef797fc2d5fd8621a54..4162d6a040a20a4ef8e1adb90f215a8d80fb48a3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
-@@ -28,6 +28,7 @@ dependencies {
+@@ -29,6 +29,7 @@ dependencies {
testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito
implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files
implementation("commons-lang:commons-lang:2.6")
@@ -17,7 +17,7 @@ index ffa1df9af1ff38ac7bbd64bca764659f308b147a..03bf39337d32b1947b6c57070bfa1de0
runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
-@@ -107,6 +108,18 @@ tasks.check {
+@@ -108,6 +109,18 @@ tasks.check {
}
// Paper end
diff --git a/patches/server/0393-Implement-Mob-Goal-API.patch b/patches/server/0393-Implement-Mob-Goal-API.patch
index 71744d7fd7..13ff8a4c78 100644
--- a/patches/server/0393-Implement-Mob-Goal-API.patch
+++ b/patches/server/0393-Implement-Mob-Goal-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API
diff --git a/build.gradle.kts b/build.gradle.kts
-index 03bf39337d32b1947b6c57070bfa1de08da72179..96866069c69ce230ea499ac7208f98627c081586 100644
+index 4162d6a040a20a4ef8e1adb90f215a8d80fb48a3..d63f6a46244b9dd133f12e9cfae16c8cf3b394da 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
-@@ -37,6 +37,7 @@ dependencies {
+@@ -38,6 +38,7 @@ dependencies {
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10")
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10")
diff --git a/patches/server/0710-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0710-Use-Velocity-compression-and-cipher-natives.patch
index e8388c5724..9848c6b07d 100644
--- a/patches/server/0710-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0710-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use Velocity compression and cipher natives
diff --git a/build.gradle.kts b/build.gradle.kts
-index 96866069c69ce230ea499ac7208f98627c081586..f49355493f2637b0b508ba5a685fd88caf239655 100644
+index d63f6a46244b9dd133f12e9cfae16c8cf3b394da..f783c349fe0f4c9ebd15ea20e04b3291d294e947 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
-@@ -32,6 +32,11 @@ dependencies {
+@@ -33,6 +33,11 @@ dependencies {
runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0")
runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
diff --git a/patches/server/0827-Add-support-for-Proxy-Protocol.patch b/patches/server/0827-Add-support-for-Proxy-Protocol.patch
index 36b9f115e5..10999e871e 100644
--- a/patches/server/0827-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0827-Add-support-for-Proxy-Protocol.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add support for Proxy Protocol
diff --git a/build.gradle.kts b/build.gradle.kts
-index f49355493f2637b0b508ba5a685fd88caf239655..a0c5592530d2a59bfde87d1e9eb3752e7d4694da 100644
+index f783c349fe0f4c9ebd15ea20e04b3291d294e947..19186e436cd6a5f00f0b42ac11f8050ad2ef6713 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
-@@ -21,6 +21,7 @@ dependencies {
+@@ -22,6 +22,7 @@ dependencies {
*/
implementation("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - implementation
annotationProcessor("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - Needed to generate meta for our Log4j plugins