Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2a1ace0 Prepare for 1.20.3 dev
PaperMC/Paper@8e8d6ae Finish API
PaperMC/Paper@9b56221 Adventure (kind of)
PaperMC/Paper@603b329 More work
PaperMC/Paper@d7fc0c5 More more work
PaperMC/Paper@2efd9bb More more more work
PaperMC/Paper@2a9a9c4 Remove unnecessary import
PaperMC/Paper@fad3fa9 Update loot table and other patches
PaperMC/Paper@dfac4f9 patches
PaperMC/Paper@b89fff0 Update generated API
PaperMC/Paper@c3f3ede port UnknownCommandEvent patch
PaperMC/Paper@a30aad9 some patches
PaperMC/Paper@1a33343 some more patches
PaperMC/Paper@9d9fcf7 fix timings patch field use
PaperMC/Paper@7a59fd3 patches up to anti x ray
PaperMC/Paper@6e9a238 some more patch
PaperMC/Paper@ad99d45 initial work on native Adventure codecs
PaperMC/Paper@bdbdca8 Bump Gradle wrapper to 8.5
PaperMC/Paper@5513f8a patches ...
PaperMC/Paper@723c05e some patches :D
PaperMC/Paper@c7a463a Add update helper task
PaperMC/Paper@fc12258 more patch
PaperMC/Paper@2053d6a Improve update helper task
PaperMC/Paper@29e1376 p a t c h e s
PaperMC/Paper@cc78c7f fix serializing TextColor with name
PaperMC/Paper@46be245 add description to helper
PaperMC/Paper@25dc4af Patches!!!
PaperMC/Paper@6bf2ebf Patches!!! (2)
PaperMC/Paper@cd61b5d Patches!!! MORE
PaperMC/Paper@9546b9c Patches!!! MORE MORE MORE MOOOOORE
PaperMC/Paper@855a819 Fix custom potion mixes patch
PaperMC/Paper@13b92ad Make things explodes via patches
PaperMC/Paper@6c4efc9 fix mismatched bracket in game packet listener
PaperMC/Paper@0dee538 Upstream blocked Player#remove so our patch needed to be refactored
PaperMC/Paper@a364b7e fix more compile issues
PaperMC/Paper@b8f9558 Apply all patches
PaperMC/Paper@67f1688 Toggle updatingMinecraft property
PaperMC/Paper@5999d66 More compile fixes
PaperMC/Paper@6b272a6 remove old diff
PaperMC/Paper@deb0272 more compile fixes
PaperMC/Paper@0514872 build script updates
PaperMC/Paper@1d028f3 More compile fixes
PaperMC/Paper@c2b7033 It compiles
PaperMC/Paper@0354144 Drop old packs in setResourcePack
PaperMC/Paper@b32a34c Add missing timings stop
PaperMC/Paper@d3f1bc0 Remove some patches
PaperMC/Paper@ff2946e Fix some missing diffs
PaperMC/Paper@9bc67ab Fixup
PaperMC/Paper@f10b36d wait for second pass apply
PaperMC/Paper@a2b6275 Add missing removed patches
PaperMC/Paper@c833571 Make it compile again
PaperMC/Paper@0addaa1 Temp adventure update
PaperMC/Paper@d1dbe00 Fix lootable patch, cb crash due to unimplemented methods
PaperMC/Paper@896e29b Inline imports in loottable patch
PaperMC/Paper@772d430 Fix timings check with tick freezes
PaperMC/Paper@b1f94a8 Update cb package version
PaperMC/Paper@6bafacf Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@ada77b3 Wait on stream redirect futures (update helper task)
PaperMC/Paper@3b94cc3 Clean up settings script
PaperMC/Paper@b277feb Hotfix DefaultDispenseItemBehavior#spawnItem
PaperMC/Paper@9227a96 Clean up username validation logic
PaperMC/Paper@6c4c13d Update adventure
PaperMC/Paper@6577db6 cleanup Optimize MappedRegistry patch
PaperMC/Paper@9223f05 Updated Upstream (CraftBukkit)
PaperMC/Paper@d047683 more adventure codec stuff
PaperMC/Paper@ff72782 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@930a24f 1.20.4
PaperMC/Paper@f9edc4b Update paperweight to 1.5.11
PaperMC/Paper@2f92d4e Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@8d8eb3b optimise explosion damage further
PaperMC/Paper@7606e6d fixup tests and add missing API detected by those tests
PaperMC/Paper@f17622c more cleanup and resource pack api fixes
PaperMC/Paper@9051fc3 remove redundant patch
PaperMC/Paper@abfb6b2 more work on adventure codecs
PaperMC/Paper@b42a1da Use uuid param in setResourcePack
PaperMC/Paper@bcbe5dc Fix `PlayerInteractEvent#getClickedBlock()` returning wrong block in adventure mode (#10019)
PaperMC/Paper@166761f Update and clean up api dependencies (#10018)
PaperMC/Paper@3434a6f Update key gen for 1.20.4 (#10015)
PaperMC/Paper@dd16335 fix NPE when iterating over default drops (#10017)
PaperMC/Paper@28abbaa Catch setEnabled to ensure classloader is properly unloaded (#10020)
PaperMC/Paper@82f9280 Fix deprecated bungee APIs still serializing to JSON in packets (#10028)
PaperMC/Paper@7c2dc4b Use Codecs for adventure Component conversions & network serialization (#10014)
PaperMC/Paper@0fadaed [ci skip] move decomp fixes to correct patch
PaperMC/Paper@dc3ef2a Fix vanilla components not being translated (#9893)
PaperMC/Paper@7e15d97 Remove no longer needed diff from adventure patch
PaperMC/Paper@f1820dc Fix incorrect border collision detection
PaperMC/Paper@de04cbc Updated Upstream (Bukkit/CraftBukkit) (#10034)
PaperMC/Paper@ff26d54 send sound and particle packets immediately even if off main (#10033)
PaperMC/Paper@e3140fb hotfix spawning item/xp in wrong spot
PaperMC/Paper@0b95298 Make worldborder collisions consistent with Vanilla
PaperMC/Paper@47b2c18 Don't fire the drop event on player deaths (#10046)
PaperMC/Paper@8c007d9 properly read and store sus effect duration (#10050)
PaperMC/Paper@5385b21 [ci skip] Make test results viewable in-browser and downloadable (#10055)
PaperMC/Paper@086ca61 Fix world border edge collision (#10053)
PaperMC/Paper@45e01a2 Use correct max stack size in crafter (#10057)
PaperMC/Paper@d11a588 Remove duplicate code in chunk tick iteration (#10056)
PaperMC/Paper@b4c9e7e add missing Experimental annotations (#10012)
PaperMC/Paper@1e7dd72 Remove 'fix Vanilla Minecart speed' patch (#10068)
PaperMC/Paper@e7e1c8a Fix and add new scoreboard API (#10037)
PaperMC/Paper@49f9f6f Add Registry#getKey (#10066)
PaperMC/Paper@4adca3d Update to adventure 4.15 (#10045)
PaperMC/Paper@ff7b9b0 Increase default custom payload channel size limit (#10006)
PaperMC/Paper@1cda66e Hotfix Entity isInRain reobf issue
PaperMC/Paper@61768e0 [ci skip] Remove no longer needed mappings change
PaperMC/Paper@e035fd7 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@c215ce1 [ci skip] cleanup patch diff from last commit

gradle.properties

@@ -1,9 +1,9 @@
 group = dev.booky.cloudplane
-version = 1.20.2-R0.1-SNAPSHOT
+version = 1.20.4-R0.1-SNAPSHOT
 
-mcVersion = 1.20.2
-packageVersion = 1_20_R2
-paperRef = 1.20.2
+mcVersion = 1.20.4
+packageVersion = 1_20_R3
+paperRef = c215ce185861af0fd123a91a79ad8907d9a7951a
 
 org.gradle.jvmargs = -Xmx2G
 

patches/api/0001-Pufferfish-api-patches.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Pufferfish api patches
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e827ee211e3c65dc68ac5867fd8476639df63645..2d18e06eef3a3530f9d449c75750465ce698ce40 100644
+index bf01892c248b988531d21d9fb0f74d0adf2205ac..e58933f5c8284971d81728932b95c05b5201983b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -72,6 +72,8 @@ dependencies {
+@@ -75,6 +75,8 @@ dependencies {
      testImplementation("org.hamcrest:hamcrest:2.2")
      testImplementation("org.mockito:mockito-core:5.5.0")
      testImplementation("org.ow2.asm:asm-tree:9.5")
@@ -17,7 +17,7 @@ index e827ee211e3c65dc68ac5867fd8476639df63645..2d18e06eef3a3530f9d449c75750465c
  }
 
  // Paper start
-@@ -106,6 +108,13 @@ val generateApiVersioningFile by tasks.registering {
+@@ -109,6 +111,13 @@ val generateApiVersioningFile by tasks.registering {
      }
  }
 

patches/api/0002-Add-CloudPlane-configuration.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add CloudPlane configuration
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d0c634629aa0b6bac0da93655dd86ad3aea0ce30..b40fda8cba62775c68e0eee20a93446ba6296805 100644
+index 9af4bc16da09e59009c47911219e99450cdf2aa5..4be9f47d41c17ce8d0b221289e7735dd648c660c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2190,6 +2190,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2198,6 +2198,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
 

patches/api/0003-Add-allowPvP-gamerule.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add allowPvP gamerule
 
 
 diff --git a/src/main/java/org/bukkit/GameRule.java b/src/main/java/org/bukkit/GameRule.java
-index 695a299a3544547bbc24095980221205ce5469ba..786741ef8ee75d57ac0f9536c7e743c00d8cdf1e 100644
+index be827e7fef0acb17bd41aeff9dc3dc4da3718e5e..2ce2d4845acc2d52dad27abf858621f26bebc2f7 100644
 --- a/src/main/java/org/bukkit/GameRule.java
 +++ b/src/main/java/org/bukkit/GameRule.java
-@@ -211,6 +211,13 @@ public final class GameRule<T> implements net.kyori.adventure.translation.Transl
+@@ -216,6 +216,13 @@ public final class GameRule<T> implements net.kyori.adventure.translation.Transl
       */
      public static final GameRule<Boolean> ENDER_PEARLS_VANISH_ON_DEATH = new GameRule<>("enderPearlsVanishOnDeath", Boolean.class);
 

patches/server/0014-Fix-non-adventure-components-not-being-translated.patch → patches/removed/1.20.4/0014-Fix-non-adventure-components-not-being-translated.patch

@@ -5,6 +5,8 @@ Subject: [PATCH] Fix non-adventure components not being translated
 
 If an entity ever gets unloaded, this destroys every translation system
 
+Fixed by paper in https://github.com/PaperMC/Paper/commit/dc3ef2ae0f54ca6b67f651740df5bcda1a2bbe4f 
+
 diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 index f2f4575e6ec4f5a90b8f48306b0edfef2e5527f5..5ec4339fde101cbf1380dc7104f6d7894e8b9031 100644
 --- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java

patches/server/0016-Work-around-worldborder-collision-issues.patch → patches/removed/1.20.4/0016-Work-around-worldborder-collision-issues.patch

@@ -3,6 +3,7 @@ From: booky10 <[email protected]>
 Date: Thu, 26 Oct 2023 21:15:06 +0200
 Subject: [PATCH] Work around worldborder collision issues
 
+Fixed by paper in https://github.com/PaperMC/Paper/commit/086ca616d8bd98dde4e4859d29ce89314494d90c 
 
 diff --git a/src/main/java/net/minecraft/world/level/border/WorldBorder.java b/src/main/java/net/minecraft/world/level/border/WorldBorder.java
 index 204f008dc36212e696fba781fede88044b2f735a..05af61f8e6987f714b349282c1887414caeb987c 100644

patches/server/0001-Reduce-allocation-of-Vec3D-by-entity-tracker.patch

@@ -18,10 +18,10 @@ index 33d9131e9c75ef23cd637f5d6c39a2704a0c92a5..4b6e0fe2fabcc55007fd8979e81f66df
      @VisibleForTesting
      static long encode(double value) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index caa73632aee15583c6b6ed12a668c8f49b794708..73d50715d34fdf67f346672901dd1d24bb2ac7fb 100644
+index d9cd497bc1b654030ff1a597f038b6a881df9f6b..67d9be1e73ab877c8f04a13b8220cfafaf8d18f7 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1419,10 +1419,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1418,10 +1418,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          public void updatePlayer(ServerPlayer player) {
              org.spigotmc.AsyncCatcher.catchOp("player tracker update"); // Spigot
              if (player != this.entity) {