Update

patches/server/0004-Test-changes.patch

@@ -5,18 +5,18 @@ Subject: [PATCH] Test changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 14eae4cf079a384691c72c2f70ba627bddb0b2b1..855418dd82c661d94278a5d284629e2823ad1bc5 100644
+index e7fa464573909d4c3d649ebb5f40ef54055e09a8..8d2aa99b4bd0d1c46c66274907a1f11d605a75da 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -23,6 +23,7 @@ dependencies {
+@@ -22,6 +22,7 @@ dependencies {
      testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
      testImplementation("org.hamcrest:hamcrest:2.2")
      testImplementation("org.mockito:mockito-core:5.5.0")
 +    testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // Paper - CartesianTest
  }
 
  val craftbukkitPackageVersion = "1_20_R3" // Paper
-@@ -58,6 +59,12 @@ tasks.compileJava {
+@@ -57,6 +58,12 @@ tasks.compileJava {
      options.setIncremental(false)
  }
 

patches/server/0010-Adventure.patch

@@ -1247,7 +1247,7 @@ index 0000000000000000000000000000000000000000..2fd6c3e65354071af71c7d8ebb97b559
 +}
 diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..2e757cd9b01ac7eba1e4723a6e21dcea9d062483
+index 0000000000000000000000000000000000000000..032d23ecda574ed1a3c740c16d13055f399bd6c4
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 @@ -0,0 +1,421 @@
@@ -5630,7 +5630,7 @@ index 0000000000000000000000000000000000000000..3aedd0bbc97edacc1ebf71264b310e55
 +}
 diff --git a/src/test/java/io/papermc/paper/adventure/AdventureCodecsTest.java b/src/test/java/io/papermc/paper/adventure/AdventureCodecsTest.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b97078552a86885bf77a2832d292f4062116c743
+index 0000000000000000000000000000000000000000..c3b6f1bc0c600242e52f9b483d5b20c193855542
 --- /dev/null
 +++ b/src/test/java/io/papermc/paper/adventure/AdventureCodecsTest.java
 @@ -0,0 +1,369 @@
@@ -6003,39 +6003,6 @@ index 0000000000000000000000000000000000000000..b97078552a86885bf77a2832d292f406
 +            selector(selector),
 +            selector(selector, text(','))
 +        );
-+    }
-+
-+    static List<Component> testBlockNbts() {
-+        return List.of(
-+            blockNBT().nbtPath("abc").localPos(1.23d, 2.0d, 3.89d).build(),
-+            blockNBT().nbtPath("xyz").absoluteWorldPos(4, 5, 6).interpret(true).build(),
-+            blockNBT().nbtPath("eeee").relativeWorldPos(7, 83, 900)
-+                .separator(text(';'))
-+                .build(),
-+            blockNBT().nbtPath("qwert").worldPos(
-+                BlockNBTComponent.WorldPos.Coordinate.absolute(12),
-+                BlockNBTComponent.WorldPos.Coordinate.relative(3),
-+                BlockNBTComponent.WorldPos.Coordinate.absolute(1200)
-+            ).build()
-+        );
-+    }
-+
-+    static List<Component> testEntityNbts() {
-+        return List.of(
-+            entityNBT().nbtPath("abc").selector("test").build(),
-+            entityNBT().nbtPath("abc").selector("test").separator(text(',')).build(),
-+            entityNBT().nbtPath("abc").selector("test").interpret(true).build()
-+        );
-+    }
-+
-+    static List<Component> testStorageNbts() {
-+        return List.of(
-+            storageNBT().nbtPath("abc").storage(key("doom:apple")).build(),
-+            storageNBT().nbtPath("abc").storage(key("doom:apple")).separator(text(", ")).build(),
-+            storageNBT().nbtPath("abc").storage(key("doom:apple")).interpret(true).build()
-+        );
-+    }
-+}
 diff --git a/src/test/java/io/papermc/paper/adventure/ComponentServicesTest.java b/src/test/java/io/papermc/paper/adventure/ComponentServicesTest.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..98114b8fdc441f2a1642abf230457c2b5208bb5c

patches/server/0128-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 65e9d5918d46b123fb4f8122344a7d3863aec758..7a3c96318f95fcd6cf6fd94415958382d1193ec6 100644
+index e865c5ce514770f4fde9146b6e7138e88932c33b..d8f909f4f108343e3973e965af617596c91e3d0e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -6,9 +6,30 @@ plugins {
@@ -60,7 +60,7 @@ index 65e9d5918d46b123fb4f8122344a7d3863aec758..7a3c96318f95fcd6cf6fd94415958382
      implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
      implementation("org.ow2.asm:asm-commons:9.5")
      implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
-@@ -78,7 +99,7 @@ relocation {
+@@ -79,7 +100,7 @@ relocation {
  }
 
  tasks.shadowJar {

patches/server/0366-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 eaaf9a9779f57ee048245899750bf7a1599b716f..450f7c03bdcc109938ba9b66328bdbb2c96c03c9 100644
+index 1a0d26d4604b10fd85797a774a2d159cbd237d7e..76ae7fd188adc1c48d4a58253824e0ff75887339 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -35,6 +35,7 @@ dependencies {
@@ -17,7 +17,7 @@ index eaaf9a9779f57ee048245899750bf7a1599b716f..450f7c03bdcc109938ba9b66328bdbb2
      runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
      runtimeOnly("com.mysql:mysql-connector-j:8.2.0")
      runtimeOnly("com.lmax:disruptor:3.4.4") // Paper
-@@ -124,6 +125,18 @@ tasks.check {
+@@ -125,6 +126,18 @@ tasks.check {
  }
  // Paper end