sync netty version with vanilla (#9842)

6 files changed, 16 insertions, 25 deletions

diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch
index ef01672983..8d8d538af8 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/server/0003-Build-system-changes.patch
@@ -9,7 +9,7 @@ public net.minecraft.server.packs.VanillaPackResourcesBuilder safeGetPath(Ljava/
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..3a8b06b7cafb912cf1faecd219673afea2319815 100644
+index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..e8c4e7379d46b1ba88110729b8ccbde00c68ce55 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,10 +9,9 @@ plugins {
@@ -25,16 +25,7 @@ index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..3a8b06b7cafb912cf1faecd219673afe
      implementation("commons-lang:commons-lang:2.6")
      runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
      runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
-@@ -23,6 +22,8 @@ dependencies {
- 
-     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
-     testImplementation("org.hamcrest:hamcrest:2.2")
-+
-+    implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty
- }
- 
- val craftbukkitPackageVersion = "1_20_R2" // Paper
-@@ -34,6 +35,7 @@ tasks.jar {
+@@ -34,6 +33,7 @@ tasks.jar {
          val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
          val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
          val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
@@ -42,7 +33,7 @@ index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..3a8b06b7cafb912cf1faecd219673afe
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
-@@ -42,6 +44,9 @@ tasks.jar {
+@@ -42,6 +42,9 @@ tasks.jar {
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
              "Specification-Vendor" to "Bukkit Team",
@@ -52,7 +43,7 @@ index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..3a8b06b7cafb912cf1faecd219673afe
          )
          for (tld in setOf("net", "com", "org")) {
              attributes("$tld/bukkit", "Sealed" to true)
-@@ -49,6 +54,11 @@ tasks.jar {
+@@ -49,6 +52,11 @@ tasks.jar {
      }
  }
  
@@ -64,7 +55,7 @@ index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..3a8b06b7cafb912cf1faecd219673afe
  publishing {
      publications.create<MavenPublication>("maven") {
          artifact(tasks.shadowJar)
-@@ -75,6 +85,17 @@ tasks.shadowJar {
+@@ -75,6 +83,17 @@ tasks.shadowJar {
      }
  }
  
@@ -82,7 +73,7 @@ index beb19d5aa6cb60115cbd173b2a7f67769b4a367d..3a8b06b7cafb912cf1faecd219673afe
  tasks.test {
      exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
      useJUnitPlatform()
-@@ -133,7 +154,14 @@ tasks.registerRunTask("runReobf") {
+@@ -133,7 +152,14 @@ tasks.registerRunTask("runReobf") {
      classpath(runtimeClasspathWithoutVanillaServer)
  }
  
diff --git a/patches/server/0004-Test-changes.patch b/patches/server/0004-Test-changes.patch
index b761eee237..4bcf44e701 100644
--- a/patches/server/0004-Test-changes.patch
+++ b/patches/server/0004-Test-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Test changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3a8b06b7cafb912cf1faecd219673afea2319815..e03e01c4b9f3886a72c569d7a64da0cca5cbcc5b 100644
+index e8c4e7379d46b1ba88110729b8ccbde00c68ce55..9c2e9f73fada65f67144c4f85bb182dcc4282055 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,6 +12,7 @@ dependencies {
@@ -16,7 +16,7 @@ index 3a8b06b7cafb912cf1faecd219673afea2319815..e03e01c4b9f3886a72c569d7a64da0cc
      implementation("commons-lang:commons-lang:2.6")
      runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
      runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
-@@ -59,6 +60,12 @@ tasks.compileJava {
+@@ -57,6 +58,12 @@ tasks.compileJava {
      options.setIncremental(false)
  }
  
diff --git a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
index 53aa870419..ce5f1e817c 100644
--- a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -25,7 +25,7 @@ Other changes:
 Co-Authored-By: Emilia Kond <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ded8824a43c99754ea12544930b416c610bd2ead..f2285f5e5669ba5c13dc8a6eb61823b0bf213161 100644
+index f86524b7ec33041f4394e12099afe8df8efb4457..c5ebde259622ef3acde1ed42ce5b9797807ca5b1 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -6,9 +6,30 @@ plugins {
@@ -60,7 +60,7 @@ index ded8824a43c99754ea12544930b416c610bd2ead..f2285f5e5669ba5c13dc8a6eb61823b0
      implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
      implementation("org.ow2.asm:asm:9.5")
      implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation
-@@ -81,7 +102,7 @@ relocation {
+@@ -79,7 +100,7 @@ relocation {
  }
  
  tasks.shadowJar {
diff --git a/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index cb39dc0d71..614940f5eb 100644
--- a/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2f32a91bea8c27eb1f768e8a2a876a081cd68de8..8d40814519e777182e95d8f48c02fa0e606a551f 100644
+index 8b892c96eae2395093fcbfd696731fefd2003941..c210a1d4d779cc64ff7f5ae2d2c63b249ceb6205 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -37,6 +37,7 @@ dependencies {
@@ -17,7 +17,7 @@ index 2f32a91bea8c27eb1f768e8a2a876a081cd68de8..8d40814519e777182e95d8f48c02fa0e
      runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
      runtimeOnly("com.mysql:mysql-connector-j:8.1.0")
      runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
-@@ -127,6 +128,18 @@ tasks.check {
+@@ -125,6 +126,18 @@ tasks.check {
  }
  // Paper end
  
diff --git a/patches/server/0392-Implement-Mob-Goal-API.patch b/patches/server/0392-Implement-Mob-Goal-API.patch
index 17ae61d43b..4e5407726e 100644
--- a/patches/server/0392-Implement-Mob-Goal-API.patch
+++ b/patches/server/0392-Implement-Mob-Goal-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 8d40814519e777182e95d8f48c02fa0e606a551f..5a89e789d44fcf42838643c9023bc5ffc9b98606 100644
+index c210a1d4d779cc64ff7f5ae2d2c63b249ceb6205..0fb730260d1a31cf74db808d3655a566a61fd754 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -46,6 +46,7 @@ dependencies {
@@ -15,7 +15,7 @@ index 8d40814519e777182e95d8f48c02fa0e606a551f..5a89e789d44fcf42838643c9023bc5ff
 +    testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
      testImplementation("org.hamcrest:hamcrest:2.2")
- 
+ }
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..f80a6ad7638453348ee82ea00b166a3aac029142
diff --git a/patches/server/0811-Add-support-for-Proxy-Protocol.patch b/patches/server/0811-Add-support-for-Proxy-Protocol.patch
index dca2d167d9..a40838dee3 100644
--- a/patches/server/0811-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0811-Add-support-for-Proxy-Protocol.patch
@@ -5,14 +5,14 @@ Subject: [PATCH] Add support for Proxy Protocol
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c70fd0daeb312e339301c3a72e53a2e9b96759c3..c187641f0ec6444a10e0e1583e1697d07e8f0267 100644
+index c545e94e4d045bc698b45e6b602ff481419fad52..a79461457ea19339f47572c70705d655ebc55276 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -30,6 +30,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)
-+    implementation("io.netty:netty-codec-haproxy:4.1.87.Final") // Paper - Add support for proxy protocol
++    implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol
      // Paper end
      implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
      implementation("org.ow2.asm:asm:9.5")