diff --git a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch
index ae13000aef..3692466a0c 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 <emilia@rymiel.space>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 94fcbfae0678391d38ee8e6e54576d9fb294585e..3dc1e82536e1e84287499825ab191c4e92bc37d7 100644
+index 94fcbfae0678391d38ee8e6e54576d9fb294585e..05ea33821177d5a4917cd3cb69be85fefb9452a7 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -5,9 +5,30 @@ plugins {
+@@ -5,9 +5,29 @@ plugins {
      `maven-publish`
  }
  
@@ -44,8 +44,7 @@ index 94fcbfae0678391d38ee8e6e54576d9fb294585e..3dc1e82536e1e84287499825ab191c4e
 +    // Paper start
 +    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.3") // Manually bump beyond above transitive dep
++    implementation("net.kyori:adventure-text-serializer-ansi:4.16.0") // Keep in sync with adventureVersion from Paper-API build file
 +    /*
 +          Required to add the missing Log4j2Plugins.dat file from log4j-core
 +          which has been removed by Mojang. Without it, log4j has to classload
@@ -60,7 +59,7 @@ index 94fcbfae0678391d38ee8e6e54576d9fb294585e..3dc1e82536e1e84287499825ab191c4e
      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
-@@ -75,6 +96,19 @@ tasks.check {
+@@ -75,6 +95,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 7b3f3156dd..e3a8285a0e 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 3dc1e82536e1e84287499825ab191c4e92bc37d7..5b5bcb37cf3a318fa80e6b594b0b900f50a471cc 100644
+index 05ea33821177d5a4917cd3cb69be85fefb9452a7..859ef5811880e988640230374f180fb2d197a26e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -24,7 +24,7 @@ dependencies {
+@@ -23,7 +23,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 1635092537..920a040798 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 5b5bcb37cf3a318fa80e6b594b0b900f50a471cc..37bf660248173c25ec379639faece55c9e1207ce 100644
+index 859ef5811880e988640230374f180fb2d197a26e..2412647683b78f811537bf527d2c70bd3ec7ad21 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -33,8 +33,7 @@ dependencies {
+@@ -32,8 +32,7 @@ dependencies {
      implementation("org.ow2.asm:asm-commons:9.7")
      implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
      implementation("commons-lang:commons-lang:2.6")
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 9f28b08353..c9901448e0 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 37bf660248173c25ec379639faece55c9e1207ce..71da2755ac2253b73b128cf8f1afe9cf5e537912 100644
+index 2412647683b78f811537bf527d2c70bd3ec7ad21..dbb67a5dc1eecb1339cd4da1a23e69ed675ddbe4 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -33,6 +33,7 @@ dependencies {
+@@ -32,6 +32,7 @@ dependencies {
      implementation("org.ow2.asm:asm-commons:9.7")
      implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
      implementation("commons-lang:commons-lang:2.6")
diff --git a/patches/server/0020-Plugin-remapping.patch b/patches/server/0020-Plugin-remapping.patch
index 6fbd1d7f78..62d0316083 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 <nassim@njahnke.dev>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 71da2755ac2253b73b128cf8f1afe9cf5e537912..8e2a118be60e100a057d863457eee57ee34147bd 100644
+index dbb67a5dc1eecb1339cd4da1a23e69ed675ddbe4..c29c309503d5d5defe7991baca34b0d692d57e36 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -45,9 +45,14 @@ dependencies {
+@@ -44,9 +44,14 @@ 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
@@ -25,7 +25,7 @@ index 71da2755ac2253b73b128cf8f1afe9cf5e537912..8e2a118be60e100a057d863457eee57e
  tasks.jar {
      archiveClassifier.set("dev")
  
-@@ -67,7 +72,7 @@ tasks.jar {
+@@ -66,7 +71,7 @@ tasks.jar {
              "Specification-Vendor" to "Bukkit Team",
              "Git-Branch" to gitBranch, // Paper
              "Git-Commit" to gitHash, // Paper
@@ -34,7 +34,7 @@ index 71da2755ac2253b73b128cf8f1afe9cf5e537912..8e2a118be60e100a057d863457eee57e
          )
          for (tld in setOf("net", "com", "org")) {
              attributes("$tld/bukkit", "Sealed" to true)
-@@ -156,20 +161,41 @@ val runtimeClasspathWithoutVanillaServer = configurations.runtimeClasspath.flatM
+@@ -155,20 +160,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 840e4b1c15..348061d5a7 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 <11360596+jpenilla@users.noreply.github.com>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 8e2a118be60e100a057d863457eee57ee34147bd..5e0200abc509989d79a5f3dd2ee456b7a3fca33f 100644
+index c29c309503d5d5defe7991baca34b0d692d57e36..1caa3ef9f0fd71f2bea2e1ea36bb2fa34c6ee689 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -33,7 +33,6 @@ dependencies {
+@@ -32,7 +32,6 @@ dependencies {
      implementation("org.ow2.asm:asm-commons:9.7")
      implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
      implementation("commons-lang:commons-lang:2.6")
@@ -17,7 +17,7 @@ index 8e2a118be60e100a057d863457eee57ee34147bd..5e0200abc509989d79a5f3dd2ee456b7
      runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
  
      runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
-@@ -47,6 +46,12 @@ dependencies {
+@@ -46,6 +45,12 @@ dependencies {
      testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
      implementation("net.neoforged:AutoRenamingTool:2.0.3") // Paper - remap plugins
      implementation("net.neoforged:srgutils:1.0.9") // Paper - remap plugins - bump transitive of ART
diff --git a/patches/server/0283-Brigadier-Mojang-API.patch b/patches/server/0283-Brigadier-Mojang-API.patch
index 4b9d8b66e1..80e75802b7 100644
--- a/patches/server/0283-Brigadier-Mojang-API.patch
+++ b/patches/server/0283-Brigadier-Mojang-API.patch
@@ -10,7 +10,7 @@ Adds CommandRegisteredEvent
   - Allows manipulating the CommandNode to add more children/metadata for the client
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 5e0200abc509989d79a5f3dd2ee456b7a3fca33f..39961c6751d9e09ee150125944384661f7a2ab69 100644
+index 1caa3ef9f0fd71f2bea2e1ea36bb2fa34c6ee689..b1b7d9b72c9f79fe2cfcde47be35a7e73b35d6ff 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,6 +13,7 @@ val alsoShade: Configuration by configurations.creating
diff --git a/patches/server/0363-Implement-Mob-Goal-API.patch b/patches/server/0363-Implement-Mob-Goal-API.patch
index 24864a4666..33bb7d6d59 100644
--- a/patches/server/0363-Implement-Mob-Goal-API.patch
+++ b/patches/server/0363-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 39961c6751d9e09ee150125944384661f7a2ab69..ecd857d58be4a7aa9944934af2ad6a83b2d1b647 100644
+index b1b7d9b72c9f79fe2cfcde47be35a7e73b35d6ff..81b42b378f2d44ce1ffba5ee3f50aad3c13e60fa 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -40,6 +40,7 @@ dependencies {
+@@ -39,6 +39,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/0723-Add-support-for-Proxy-Protocol.patch b/patches/server/0723-Add-support-for-Proxy-Protocol.patch
index 7c99aeac41..8a97a4d29d 100644
--- a/patches/server/0723-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0723-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 ecd857d58be4a7aa9944934af2ad6a83b2d1b647..9f9ee63e2fd2b3fac5781b50435e26ec079c94fd 100644
+index 81b42b378f2d44ce1ffba5ee3f50aad3c13e60fa..4216f5b1d5fa5769b6c2b24204e2146c4511cc8b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -29,6 +29,7 @@ dependencies {
+@@ -28,6 +28,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/1012-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1012-Use-Velocity-compression-and-cipher-natives.patch
index 30eed62d11..bf3cd56769 100644
--- a/patches/server/1012-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/1012-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 9f9ee63e2fd2b3fac5781b50435e26ec079c94fd..9f69c079ad2c65d94de27ac11d02e236f48bc308 100644
+index 4216f5b1d5fa5769b6c2b24204e2146c4511cc8b..3b0cb2a4e200fb31b8789b2d99f033758b4f7145 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -36,6 +36,11 @@ dependencies {
+@@ -35,6 +35,11 @@ dependencies {
      implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
      implementation("commons-lang:commons-lang:2.6")
      runtimeOnly("com.lmax:disruptor:3.4.4") // Paper