Use ConcurrentUtil from Paper repo

patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -25,7 +25,7 @@ Other changes:
 Co-Authored-By: Emilia Kond <emilia@rymiel.space>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b4a389d0ef9df8ef49abb7049037e391d491d0c9..611960836f7f66af17e9a231d85e7181dcc068c8 100644
+index 4a666be25894eae32a002a9eaf0eee22ae19da95..f9ee2826122e1ae9c7df14ada6dfd8fb767c1c42 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -5,6 +5,12 @@ plugins {
@@ -41,10 +41,10 @@ index b4a389d0ef9df8ef49abb7049037e391d491d0c9..611960836f7f66af17e9a231d85e7181
  // Paper start - configure mockito agent that is needed in newer java versions
  val mockitoAgent = configurations.register("mockitoAgent")
  abstract class MockitoAgentProvider : CommandLineArgumentProvider {
-@@ -19,7 +25,22 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
+@@ -20,7 +26,22 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
- 
  dependencies {
      implementation(project(":paper-api"))
+     implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency
 -    implementation("jline:jline:2.12.1")
 +    // Paper start
 +    implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
@@ -65,7 +65,7 @@ index b4a389d0ef9df8ef49abb7049037e391d491d0c9..611960836f7f66af17e9a231d85e7181
      implementation("org.apache.logging.log4j:log4j-iostreams:2.24.1") // Paper - remove exclusion
      implementation("org.ow2.asm:asm-commons:9.7.1")
      implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
-@@ -92,6 +113,19 @@ tasks.check {
+@@ -93,6 +114,19 @@ tasks.check {
      dependsOn(scanJar)
  }
  // Paper end

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 611960836f7f66af17e9a231d85e7181dcc068c8..dca5a9897195315a1e2c006aa3ae4338742e3fc9 100644
+index f9ee2826122e1ae9c7df14ada6dfd8fb767c1c42..72a48e3971d63e0cb9aec1bfa21dd291a530a73d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -36,7 +36,7 @@ dependencies {
+@@ -37,7 +37,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.
       */

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 dca5a9897195315a1e2c006aa3ae4338742e3fc9..ca7d5e2bb44e2719eee8ad046e40e1e52021a4a9 100644
+index 72a48e3971d63e0cb9aec1bfa21dd291a530a73d..ea6865398308111dd36a81401b53c9db8a8fc74a 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -47,6 +47,7 @@ dependencies {
+@@ -48,6 +48,7 @@ dependencies {
      implementation("commons-lang:commons-lang:2.6")
      runtimeOnly("org.xerial:sqlite-jdbc:3.47.0.0")
      runtimeOnly("com.mysql:mysql-connector-j:9.1.0")

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 ca7d5e2bb44e2719eee8ad046e40e1e52021a4a9..19d9cbcaa05061a5bedf5b1d821138091acfe973 100644
+index ea6865398308111dd36a81401b53c9db8a8fc74a..278743a5d30c04c071f03f41c709344c9a2729ec 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -60,6 +60,7 @@ dependencies {
+@@ -61,6 +61,7 @@ dependencies {
      mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Paper - configure mockito agent that is needed in newer java versions
      testImplementation("org.ow2.asm:asm-tree:9.7.1")
      testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest

patches/server/0020-Plugin-remapping.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Plugin remapping
 Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 19d9cbcaa05061a5bedf5b1d821138091acfe973..884ac16677ee3f52174c7bbf7b34896bcbf04bbc 100644
+index 278743a5d30c04c071f03f41c709344c9a2729ec..fdf92d6d2fbde8f3fd9663761fcabf550fd51907 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -61,6 +61,7 @@ dependencies {
+@@ -62,6 +62,7 @@ dependencies {
      testImplementation("org.ow2.asm:asm-tree:9.7.1")
      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 19d9cbcaa05061a5bedf5b1d821138091acfe973..884ac16677ee3f52174c7bbf7b34896b
  }
  
  paperweight {
-@@ -188,20 +189,41 @@ val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatM
+@@ -189,20 +190,41 @@ val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatM
          runtime.filterNot { it.asFile.absolutePath == vanilla }
      }
  

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 <11360596+jpenilla@users.noreply.github.com>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 884ac16677ee3f52174c7bbf7b34896bcbf04bbc..49749e2bd8a4af96d2091fa1bccd876c2abb9e12 100644
+index fdf92d6d2fbde8f3fd9663761fcabf550fd51907..605853668f24ca149d048ba435d479728fe86061 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -62,6 +62,12 @@ dependencies {
+@@ -63,6 +63,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

patches/server/0033-Expose-server-build-information.patch

@@ -11,7 +11,7 @@ Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 Co-authored-by: masmc05 <masmc05@gmail.com>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 49749e2bd8a4af96d2091fa1bccd876c2abb9e12..221c7dace9950bd4e57299eeff46b2ee4cd05258 100644
+index 605853668f24ca149d048ba435d479728fe86061..d5ad109d2deb4fe756924ebaac4091017beb6b99 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -1,4 +1,5 @@
@@ -20,7 +20,7 @@ index 49749e2bd8a4af96d2091fa1bccd876c2abb9e12..221c7dace9950bd4e57299eeff46b2ee
  
  plugins {
      java
-@@ -79,18 +80,24 @@ tasks.jar {
+@@ -80,18 +81,24 @@ tasks.jar {
  
      manifest {
          val git = Git(rootProject.layout.projectDirectory.path)

patches/server/0348-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 221c7dace9950bd4e57299eeff46b2ee4cd05258..3be55cc6e95c02fb43d6e1cd13d05e4e4857ac6b 100644
+index d5ad109d2deb4fe756924ebaac4091017beb6b99..cc0a3c29aeb67e486fb75c1d6cc280192421c7cd 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -54,6 +54,7 @@ dependencies {
+@@ -55,6 +55,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")
  

patches/server/0691-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 3be55cc6e95c02fb43d6e1cd13d05e4e4857ac6b..eaccf005560af84beb98065ea4ac0adaef71768e 100644
+index cc0a3c29aeb67e486fb75c1d6cc280192421c7cd..d79040747ec4dfddc866f0ad36d8423db957e98d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -41,6 +41,7 @@ dependencies {
+@@ -42,6 +42,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)

patches/server/0975-Use-Velocity-compression-and-cipher-natives.patch

@@ -9,10 +9,10 @@ Feature patch
 private-f net.minecraft.network.CompressionDecoder inflater
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index eaccf005560af84beb98065ea4ac0adaef71768e..2ceee9c2f7a237dac1c2e5c3fcc50a869d93d1ac 100644
+index d79040747ec4dfddc866f0ad36d8423db957e98d..b27ffd7e2e981698b3c3dc9ba52ce698c2bad71f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -50,6 +50,11 @@ dependencies {
+@@ -51,6 +51,11 @@ dependencies {
      runtimeOnly("org.xerial:sqlite-jdbc:3.47.0.0")
      runtimeOnly("com.mysql:mysql-connector-j:9.1.0")
      runtimeOnly("com.lmax:disruptor:3.4.4") // Paper

patches/server/1044-Bundle-spark.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Bundle spark
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2ceee9c2f7a237dac1c2e5c3fcc50a869d93d1ac..092a9ee1e862bde04c2025de6f7e25b6ec13760a 100644
+index b27ffd7e2e981698b3c3dc9ba52ce698c2bad71f..2da91ed6363c0851e4c459188f5e8ef5475e0c97 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -76,6 +76,10 @@ dependencies {
+@@ -77,6 +77,10 @@ dependencies {
      implementation("io.papermc:reflection-rewriter-runtime:$reflectionRewriterVersion")
      implementation("io.papermc:reflection-rewriter-proxy-generator:$reflectionRewriterVersion")
      // Paper end - Remap reflection