diff options
12 files changed, 31 insertions, 25 deletions
diff --git a/patches/api/0008-Use-ASM-for-event-executors.patch b/patches/api/0008-Use-ASM-for-event-executors.patch index d06ca16763..df38da57a2 100644 --- a/patches/api/0008-Use-ASM-for-event-executors.patch +++ b/patches/api/0008-Use-ASM-for-event-executors.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/build.gradle.kts b/build.gradle.kts -index af3514113abdf3f42c41f1e7ff0f930cc1a417f5..ed0b67ac322aa22b191cd35502ae5b4f20af19f8 100644 +index 106d4d5756dc579c446699106f52462085ea9a52..d6252c1ff21c92bf0d232d5bfdf828d1d2ce38c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -47,6 +47,9 @@ dependencies { diff --git a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch index 35237b2e07..97e1f14851 100644 --- a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/patches/server/0011-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 94dfc105b197c9eda481cbe90bb48b71c845e702..0a05e753ff5e7b1d741c7719524715d7364cac4f 100644 +index 94dfc105b197c9eda481cbe90bb48b71c845e702..e5a897eaea50252b92fba674daf5d43c9c11d196 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -5,9 +5,29 @@ plugins { +@@ -5,9 +5,35 @@ plugins { `maven-publish` } @@ -42,7 +42,13 @@ index 94dfc105b197c9eda481cbe90bb48b71c845e702..0a05e753ff5e7b1d741c7719524715d7 implementation(project(":paper-api")) - implementation("jline:jline:2.12.1") + // Paper start -+ implementation("org.jline:jline-terminal-jansi:3.21.0") ++ // TODO: Look into these ++ //implementation("org.jline:jline-terminal-ffm:3.26.1") // Investigate if this is broken with java 21 ++ //implementation("org.jline:jline-terminal-jni:3.26.1") // check behavior of this in windows... ++ implementation("org.jline:jline-terminal-jansi:3.21.0") { ++ exclude("org.fusesource.jansi", "jansi") // J21 already bundles and even sometimes installs its own jansi ++ } ++ + implementation("net.minecrell:terminalconsoleappender:1.3.0") + implementation("net.kyori:adventure-text-serializer-ansi:4.17.0") // Keep in sync with adventureVersion from Paper-API build file + /* @@ -59,7 +65,7 @@ index 94dfc105b197c9eda481cbe90bb48b71c845e702..0a05e753ff5e7b1d741c7719524715d7 implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion implementation("org.ow2.asm:asm-commons:9.7") implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files -@@ -78,6 +98,19 @@ tasks.check { +@@ -78,6 +104,19 @@ tasks.check { dependsOn(scanJar) } // Paper end diff --git a/patches/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch index 714d232818..1dc5881569 100644 --- a/patches/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/patches/server/0012-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 0a05e753ff5e7b1d741c7719524715d7364cac4f..d82d1e90cbda544b3d20edcc13d1cb955c48f731 100644 +index e5a897eaea50252b92fba674daf5d43c9c11d196..7d2d248c059ffefb1b4430bba9df41da50a108c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -23,7 +23,7 @@ dependencies { +@@ -29,7 +29,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/0014-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0014-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch index 1d920095cb..034da396b8 100644 --- a/patches/server/0014-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch +++ b/patches/server/0014-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 d82d1e90cbda544b3d20edcc13d1cb955c48f731..3bd5c2a2add9b462523beb9dfaf2eb5a00d470b9 100644 +index 7d2d248c059ffefb1b4430bba9df41da50a108c0..9f8744781ce4084b9ddb916e91656c1f5e155b8e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -34,6 +34,7 @@ dependencies { +@@ -40,6 +40,7 @@ dependencies { implementation("commons-lang:commons-lang:2.6") runtimeOnly("org.xerial:sqlite-jdbc:3.46.0.0") runtimeOnly("com.mysql:mysql-connector-j:8.4.0") diff --git a/patches/server/0015-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0015-Deobfuscate-stacktraces-in-log-messages-crash-report.patch index 7e2c824c7e..3fed7813ed 100644 --- a/patches/server/0015-Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/server/0015-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 3bd5c2a2add9b462523beb9dfaf2eb5a00d470b9..a2bb659ae3a502d4c181d1ccbd15eefc38e4823b 100644 +index 9f8744781ce4084b9ddb916e91656c1f5e155b8e..b9f82d5a13419dd823145283ea8a8fc24e724a4d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -45,6 +45,7 @@ dependencies { +@@ -51,6 +51,7 @@ dependencies { testImplementation("org.mockito:mockito-core:5.11.0") testImplementation("org.ow2.asm:asm-tree:9.7") testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest diff --git a/patches/server/0020-Plugin-remapping.patch b/patches/server/0020-Plugin-remapping.patch index dc3aee0b84..2d615656bb 100644 --- a/patches/server/0020-Plugin-remapping.patch +++ b/patches/server/0020-Plugin-remapping.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Plugin remapping Co-authored-by: Nassim Jahnke <[email protected]> diff --git a/build.gradle.kts b/build.gradle.kts -index a2bb659ae3a502d4c181d1ccbd15eefc38e4823b..8350fc099b68918fb03a21b6a5047ceee72dcbb4 100644 +index b9f82d5a13419dd823145283ea8a8fc24e724a4d..c972a9b1a632f9e6a0873fe7d363c3b3c9e5f5fe 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -46,6 +46,7 @@ dependencies { +@@ -52,6 +52,7 @@ dependencies { testImplementation("org.ow2.asm:asm-tree:9.7") testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling @@ -17,7 +17,7 @@ index a2bb659ae3a502d4c181d1ccbd15eefc38e4823b..8350fc099b68918fb03a21b6a5047cee } paperweight { -@@ -164,20 +165,41 @@ val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatM +@@ -170,20 +171,41 @@ val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatM runtime.filterNot { it.asFile.absolutePath == vanilla } } diff --git a/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch b/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch index 71679c179f..9fa2e3351b 100644 --- a/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch +++ b/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Remap reflection calls in plugins using internals Co-authored-by: Jason Penilla <[email protected]> diff --git a/build.gradle.kts b/build.gradle.kts -index 8350fc099b68918fb03a21b6a5047ceee72dcbb4..404c2eefa88319e0eaf7b0d1d2696c91dd0e0e0b 100644 +index c972a9b1a632f9e6a0873fe7d363c3b3c9e5f5fe..696bada19a7d3449dfb525c255becbed825e5c16 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -47,6 +47,12 @@ dependencies { +@@ -53,6 +53,12 @@ dependencies { testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling implementation("net.neoforged:AutoRenamingTool:2.0.3") // Paper - remap plugins diff --git a/patches/server/0034-Expose-server-build-information.patch b/patches/server/0034-Expose-server-build-information.patch index 985fec1d8b..4b12a0b98f 100644 --- a/patches/server/0034-Expose-server-build-information.patch +++ b/patches/server/0034-Expose-server-build-information.patch @@ -11,7 +11,7 @@ Co-authored-by: Jake Potrebic <[email protected]> Co-authored-by: masmc05 <[email protected]> diff --git a/build.gradle.kts b/build.gradle.kts -index 404c2eefa88319e0eaf7b0d1d2696c91dd0e0e0b..e7c00486bd831578008c02fcda13f3a555e6a2f1 100644 +index 696bada19a7d3449dfb525c255becbed825e5c16..ed2d66b44d701f9e2f30428b9f51d5dc03dc38a0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,5 @@ @@ -20,7 +20,7 @@ index 404c2eefa88319e0eaf7b0d1d2696c91dd0e0e0b..e7c00486bd831578008c02fcda13f3a5 plugins { java -@@ -64,18 +65,24 @@ tasks.jar { +@@ -70,18 +71,24 @@ tasks.jar { manifest { val git = Git(rootProject.layout.projectDirectory.path) diff --git a/patches/server/0356-Implement-Mob-Goal-API.patch b/patches/server/0356-Implement-Mob-Goal-API.patch index a3c40fa19b..aacf24dc45 100644 --- a/patches/server/0356-Implement-Mob-Goal-API.patch +++ b/patches/server/0356-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 e7c00486bd831578008c02fcda13f3a555e6a2f1..688e901b75e95941e0101cc7d0c4effa7993cf3f 100644 +index ed2d66b44d701f9e2f30428b9f51d5dc03dc38a0..ed7d58b45bfb0fb2b636ae5b1b057bdaec0347ac 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -41,6 +41,7 @@ dependencies { +@@ -47,6 +47,7 @@ dependencies { runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") diff --git a/patches/server/0706-Add-support-for-Proxy-Protocol.patch b/patches/server/0706-Add-support-for-Proxy-Protocol.patch index aca878218f..8fc8b29bad 100644 --- a/patches/server/0706-Add-support-for-Proxy-Protocol.patch +++ b/patches/server/0706-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 688e901b75e95941e0101cc7d0c4effa7993cf3f..9de7a09c5f1b23754a2823978fa3ff218aadcfa7 100644 +index ed7d58b45bfb0fb2b636ae5b1b057bdaec0347ac..28d25e6821f4e8ce9253a8025dc4094e6cacd0fa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -28,6 +28,7 @@ dependencies { +@@ -34,6 +34,7 @@ dependencies { log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins runtimeOnly(log4jPlugins.output) alsoShade(log4jPlugins.output) diff --git a/patches/server/1006-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1006-Use-Velocity-compression-and-cipher-natives.patch index 276343645a..f24145a5b3 100644 --- a/patches/server/1006-Use-Velocity-compression-and-cipher-natives.patch +++ b/patches/server/1006-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 9de7a09c5f1b23754a2823978fa3ff218aadcfa7..1a734293c9416f13324bb0edf8f950c9029f8bc4 100644 +index 28d25e6821f4e8ce9253a8025dc4094e6cacd0fa..a73ac2d5d2bcaeb046ab76e06dfcd5a68a70a2f3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -37,6 +37,11 @@ dependencies { +@@ -43,6 +43,11 @@ dependencies { runtimeOnly("org.xerial:sqlite-jdbc:3.46.0.0") runtimeOnly("com.mysql:mysql-connector-j:8.4.0") runtimeOnly("com.lmax:disruptor:3.4.4") // Paper diff --git a/patches/server/1027-Improved-Watchdog-Support.patch b/patches/server/1027-Improved-Watchdog-Support.patch index cacfe63010..987f92f861 100644 --- a/patches/server/1027-Improved-Watchdog-Support.patch +++ b/patches/server/1027-Improved-Watchdog-Support.patch @@ -262,7 +262,7 @@ index 7d2896918ff5fed37e5de5a22c37b0c7f32634a8..7d82cc6b847124cf4225428ba3103095 } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index bad83045ff9409678a0699cdc0781efd8ef30a44..22c705e4e3f852102c46ae0c885feb1b085545b6 100644 +index 369b3485f452ac157b3ebf88b4f1970605d302d2..5f20606cc2c79ad9a4c4d4d6c9e6a2a31a88b282 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -604,7 +604,7 @@ public abstract class PlayerList { |