Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@0cf7315 Bump to adventure 4.20.0 (#12391)
PaperMC/Paper@0767902 CraftBlock - fix applyBoneMeal false result (#12407)
PaperMC/Paper@f00727c 1.21.5
PaperMC/Paper@8eede4b Fix AbstractHorse get/setSaddle
PaperMC/Paper@93b6829 Also fix AbstractHorse getSize and isEmpty
PaperMC/Paper@f517267 Add passthrough for air serialization
PaperMC/Paper@4511edb [ci skip] Don't promote checking enchantment by legacy lore (#12421)
PaperMC/Paper@8f62e0f Correctly order getArmorContents
PaperMC/Paper@652cea5 Allow `getAsString()`-ing non-persistent entities (#12424)
PaperMC/Paper@de64e70 Update spark
PaperMC/Paper@1b88968 Add Entity#isTrackedBy (#12332)
PaperMC/Paper@8ff94c6 Update a bunch of dependencies
PaperMC/Paper@7903621 Remove json-simple imports from API, keep it as implementation in server
PaperMC/Paper@dcb755a Update log4j jd link
PaperMC/Paper@91bfb6f Fix freeze locked (#12434)
PaperMC/Paper@121a7bf Make GameRule a FeatureDependant (#12429)
PaperMC/Paper@7d5695d Improve ItemMeta#hasCustomModelData compatibility (#12414)
PaperMC/Paper@de410d1 Fix reobf mappings regression in GameRules.Type (#12437)
PaperMC/Paper@33e8928 Add support for bonus chest configuration in WorldCreator (#12344)
PaperMC/Paper@723b511 Clone exit location passed to teleport event (#12354)
PaperMC/Paper@ed32204 Clone blockpos in InsideBlockEffectApplier record

gradle.properties

@@ -2,7 +2,7 @@ group=me.samsuik.sakura
 version=1.21.5-R0.1-SNAPSHOT
 mcVersion=1.21.5
 
-paperRef=42623c4b27f579d874cab29bed7477608135c018
+paperRef=ed322043d00290213ebfefd0bd022ce28a9538cc
 
 org.gradle.jvmargs=-Xmx2G
 org.gradle.vfs.watch=false

sakura-server/build.gradle.kts.patch

@@ -57,7 +57,7 @@
      implementation("ca.spottedleaf:concurrentutil:0.0.3")
      implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
      implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
-@@ -262,7 +_,7 @@
+@@ -267,7 +_,7 @@
      jvmArgumentProviders.add(provider)
  }