Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@6520ca1 Fix main thread priority being lowered (#9488)
PaperMC/Paper@47b805f Don't let player loot if reloot time is disabled (#9615)
PaperMC/Paper@73af2d4 Add clicked position to PlayerUseUnknownEntityEvent (#9604)
PaperMC/Paper@ea1f33c Delete patch to fix PaperMC/Paper#9612 (#9621)
PaperMC/Paper@307d05b Count down radius-aware dependency tree node parents (#9600)
PaperMC/Paper@eb8f2bb Fix unknown entity interaction clicked position getter if null
PaperMC/Paper@fd4f0c7 API for an entity's scoreboard name (#9462)
PaperMC/Paper@2bd6ba2 Deprecate and replace methods using deprecated StructureType (#8643)
PaperMC/Paper@666a214 [ci skip] rebuild patches
PaperMC/Paper@d129162 Properly handle BlockBreakEvent#isDropItems (#8936)
PaperMC/Paper@67a1a8c Fix Inventory#getLocation not working for the composter (#9596)
PaperMC/Paper@5b34a09 Add option to disable chorus plant and mushroom block updates (#9442)
PaperMC/Paper@ed8401c Fix rotation for spawning display entities (#9552)
PaperMC/Paper@bd67b83 Determine lava and water fluid explosion resistance by their block explosion resistance (#9482)
PaperMC/Paper@d928dda Don't tab-complete namespaced commands if `send-namespaced` is false (#9366)
PaperMC/Paper@f43a19c Fix CME in CraftPersistentDataTypeRegistry (#6701)
PaperMC/Paper@45ba652 [ci skip] Rebuild patches
PaperMC/Paper@990765b Fire entity death event for ender dragon (#9495)
PaperMC/Paper@1259b93 Fixed CraftItemStack/CraftItemMeta enchantment level inconsistency (#8792)
PaperMC/Paper@88891c3  Add Entity Coordinate and Rotation API (#9461)
PaperMC/Paper@5bf82aa Add cancellability to PlayerTrackEntityEvent (#8605)
PaperMC/Paper@1b96c64 Improve cancelling PreCreatureSpawnEvent with per player mob spawns (#9400)
PaperMC/Paper@7232506 Add entity tracker min Y distance config option (#9406)
PaperMC/Paper@00a68b1 Player listing API (#8782)
PaperMC/Paper@af6142e [ci skip] Update Gradle wrapper
PaperMC/Paper@281855c Remove unused lag-compensate-block-breaking option (#9635)
PaperMC/Paper@35ef053 [ci skip] update editorconfig and gitattributes (#9608)
PaperMC/Paper@97b9c4a Fix NPE on Boat#getStatus (#9115)
PaperMC/Paper@2be57c6 Expand Pose API (#8781)
PaperMC/Paper@b29ecd4 Expose clicked BlockFace during BlockDamageEvent (#9632)
PaperMC/Paper@e3f29f4 MerchantRecipe: add copy constructor (#8703)
PaperMC/Paper@fed9042 More DragonBattle API (#5655)
PaperMC/Paper@27d39ca Properly clone custom nbt tags inside ItemMeta (#7849)
PaperMC/Paper@0c7385b Add PlayerPickItemEvent (#5590)
PaperMC/Paper@9395aa6 Improve performance of mass crafts (#9603)
PaperMC/Paper@7386a13 Fix endgateway teleportation offset (#9517)
PaperMC/Paper@a712766 Allow custom damage for trident (#8132)
PaperMC/Paper@3716832 Prevent overfilled bundles from duplicating items (#9633)
PaperMC/Paper@9cbad8e Expose Hand during BlockCanBuildEvent (#9636)
PaperMC/Paper@fcc5f23 Optimize nearest structure border iteration (#9638)
PaperMC/Paper@a751001 [ci skip] Refactor context records for easier expansion (#9589)
PaperMC/Paper@7a1863e Limit setBurnTime to valid short values (#9623)
PaperMC/Paper@b8a0049 Fix exact choice recipe book clicks (#7822)
PaperMC/Paper@b45ecc9 [ci skip] clear out test plugin
PaperMC/Paper@0c8882f Add OfflinePlayer#isConnected (#9642)
PaperMC/Paper@e552beb Fix inventory desync (#9640)
PaperMC/Paper@6f30f08 Readd old BlockDamageEvent constructor
PaperMC/Paper@6813244 Fix/improve destroy speed API (#9645)
PaperMC/Paper@7d13b70 Add titleOverride to InventoryOpenEvent (#7540)
PaperMC/Paper@0e622c7 Add sniffer egg api (#9288)
PaperMC/Paper@0c0a480 Do crystal-portal proximity check before entity lookup (#9611)
PaperMC/Paper@b8edb0e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9648)
PaperMC/Paper@b4e3b3d Allow non-op players to execute the click event callback (#9652)
PaperMC/Paper@39953cf Take in account waterlogged blocks for scaffolding (#9676)
PaperMC/Paper@471f4de Copy NBT in upgrade data neighbor ticks
PaperMC/Paper@33bec7f Copy NBT in legacy dragon fight converter
PaperMC/Paper@72e87ab Strip raytracing for EntityLiving#hasLineOfSight
PaperMC/Paper@e2b1971 Add missing slot sanity checks for container clicks
PaperMC/Paper@c9cd94f Fix fixItemsMergingThroughWalls check (#9707)
PaperMC/Paper@fb06829 Optimise multiple block updates occurring in the same chunk
PaperMC/Paper@517f8fb Fix line of sight distance check
PaperMC/Paper@1c15111 Add missing particle javadocs (#9716)
PaperMC/Paper@eea0c64 Swap some nullable annotations (#9696)
PaperMC/Paper@e68fd71 Add missing Piglin Dancing API (#8894)
PaperMC/Paper@6378792 Add Barrel to LootableBlockInventory (#9687)
PaperMC/Paper@7145f41 compression level change with config option (#9711)
PaperMC/Paper@29d1c7b Call BlockRedstoneEvents for lecterns (#9721)
PaperMC/Paper@eb60bff Create raw chat type as resource file instead of in source (#9226)
PaperMC/Paper@99b311d [ci skip] Clarify where furnace-related events are called (#8753)
PaperMC/Paper@83cfeb1 Improve java version check (#9692)
PaperMC/Paper@deb92c2 Add ItemStack#isEmpty and related methods (#9664)
PaperMC/Paper@0c8e84c Enforce sign line nullability when setting line with Adventure Method (#9689)
PaperMC/Paper@ede9c06 Fix Projectile#setOwner(null) not clearing owner (#9715)
PaperMC/Paper@e312ebb Add DISPLAY tracking range type (#9668)
PaperMC/Paper@06a741d Fix leashed pets teleporting to owner when loaded (#9686)
PaperMC/Paper@064fb50 Cleanup old async commands patch (#8895)
PaperMC/Paper@d8af99a Fix silent equipment change for mobs (#9677)
PaperMC/Paper@3cec9c9 [ci skip] Add missing javadoc links (#9497)
PaperMC/Paper@ba0e1f5 Fix sapling observer detection and grow event (#9654)
PaperMC/Paper@a856073 Fix two beacon bugs (#9675)
PaperMC/Paper@581b683 Fix spigot's Forced-Stats (#9663)
PaperMC/Paper@1b1c230 Add missing InventoryHolders to inventories (#7400)
PaperMC/Paper@3fd1502 Add missing deprecation (#8886)
PaperMC/Paper@773dd72 Updated Upstream (Bukkit/CraftBukkit) (#9739)
PaperMC/Paper@6267e26 So it begins...
PaperMC/Paper@b6e46e9 rebuild old indexes, first work
PaperMC/Paper@2b72b74 more work
PaperMC/Paper@20253f4 more more work
PaperMC/Paper@9167175 more more more work
PaperMC/Paper@7ebfdd5 more more more more work
PaperMC/Paper@c60dd35 more more more more more work
PaperMC/Paper@a272623 some work
PaperMC/Paper@ef6a411 some more work
PaperMC/Paper@7b29d1f even more work
PaperMC/Paper@78a003e work and compile errors
PaperMC/Paper@2bc818e some more patches
PaperMC/Paper@24fd5ae and some more patches
PaperMC/Paper@a62835b almost halfway done with server patches
PaperMC/Paper@2cee841 and some more
PaperMC/Paper@fc84aee more more more more more more work
PaperMC/Paper@2cb3a1a Fix leave message in common packet listener
PaperMC/Paper@00d8298 Missing paper comment
PaperMC/Paper@79fef73 More work work work
PaperMC/Paper@662b6c5 Port sidebar slots patch
PaperMC/Paper@74094ed More more more (more ??) more work
PaperMC/Paper@af10902 Fix PaperAdvancementDisplay
PaperMC/Paper@95a31de More work work work
PaperMC/Paper@574bc96 More work
PaperMC/Paper@452009b Working hard on messing with leafs patches
PaperMC/Paper@e5bd562 Work here, work there, work for everyone
PaperMC/Paper@2617c92 More work work work work work work work work work
PaperMC/Paper@772fb3e more more more more more more more work
PaperMC/Paper@32d9c66 more more more more more more more more work
PaperMC/Paper@4875ee4 more more more more more more more more more work
PaperMC/Paper@3aa8e7e more more more more more more more more more more work
PaperMC/Paper@ac7e4ad more more more more more more more more more more more work: passing the torch
PaperMC/Paper@8baf510 some work
PaperMC/Paper@a91e19f more work
PaperMC/Paper@63a1b0c some compile issues
PaperMC/Paper@f4d8a64 more more more more more more more more more more more work: passing the torch
PaperMC/Paper@1ebaffa some compile fixes
PaperMC/Paper@603c33d some more compile fixes
PaperMC/Paper@ead3ddb Move unapplied patches so ATs import
PaperMC/Paper@896aa8b Rebuild patches
PaperMC/Paper@e88856d Chunk system patch
PaperMC/Paper@ea01aa3 Add some patches, fix compile
PaperMC/Paper@d259503 Fix recursion with pathfind entity event
PaperMC/Paper@6af97e1 Port patches from folia dev/optimisations
PaperMC/Paper@915bb92 Fixup advancement patch (#9745)
PaperMC/Paper@47aeab8 fixup display slots patch (#9746)
PaperMC/Paper@81c5901 re-add distance map patch
PaperMC/Paper@b3ec8bd Revert "re-add distance map patch"
PaperMC/Paper@d23c4a5 Fix local attribute setting
PaperMC/Paper@0280723 Fix chat processing
PaperMC/Paper@a50d7c3 Make sure to maintain the players sent to set for ChunkHolder
PaperMC/Paper@a353f4d Readd network optimization patch
PaperMC/Paper@4c17176 Update foojay resolver convention plugin
PaperMC/Paper@9df2066 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@8b512e3 Support Paper ip address config + add missing logs
PaperMC/Paper@38b7565 Remove Spigot Bug Fix for MC-109346
PaperMC/Paper@9c126fd fix test
PaperMC/Paper@b561a12 Fix SuspiciousStewMeta
PaperMC/Paper@9624451 Add missing kick event cause
PaperMC/Paper@6be4395 Migrate paper log ips option to new server.properties option
PaperMC/Paper@2ec643a Readd anti xray and oversized block entity patches
PaperMC/Paper@8d92274 Drop no longer needed patch
PaperMC/Paper@38dc3b2 Optimise chunk tick iteration
PaperMC/Paper@84556f3 Add lag compensation for breaking blocks
PaperMC/Paper@5dca26c Fix race condition on UpgradeData.BlockFixers class init
PaperMC/Paper@ea56138 Fix some issues
PaperMC/Paper@025c5d7 rebuild patches
PaperMC/Paper@866d2d9 Use correct ClientboundLevelChunkWithLightPacket constructor in later patch
PaperMC/Paper@8b9e3dc Optimise nearby player retrieval
PaperMC/Paper@11138a7 Re-add remove streams for Brain AI patch
PaperMC/Paper@7a00758 Rebuild patches
PaperMC/Paper@e284bb1 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@5923b7d Fix missing map initialize event call & missing map id assignment (#9756)
PaperMC/Paper@5cbce36 Handle new brand payload type
PaperMC/Paper@3cf03fc Fix/update wiki (#9758)
PaperMC/Paper@298c478 Fix tests that broke during the junit 5 update (#9757)
PaperMC/Paper@c207429 Fix VoxelShape#isFullBlock() for non-single AABB types
PaperMC/Paper@b3b961f Fire PlayerConnectionCloseEvent for configuration packet listener
PaperMC/Paper@fe54a13 Properly call overloaded super onDisconnect
PaperMC/Paper@1765917 Fix creating the reverse map for loot table keys (#9766)
PaperMC/Paper@4cdbb0c Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@0f69290 [ci skip] Fix typo (important)

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("java-library")
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.5"
+    id("io.papermc.paperweight.patcher") version "1.5.7-SNAPSHOT"
 }
 
 repositories {

gradle.properties

@@ -1,9 +1,9 @@
 group = dev.booky.cloudplane
-version = 1.20.1-R0.1-SNAPSHOT
+version = 1.20.2-R0.1-SNAPSHOT
 
-mcVersion = 1.20.1
-packageVersion = 1_20_R1
-paperRef = a73ed9572e68f228c97e168be74fb357cf9115bf
+mcVersion = 1.20.2
+packageVersion = 1_20_R2
+paperRef = 0f69290f07f16e7423f82dc2d3f4d258af0e2f44
 
 org.gradle.jvmargs = -Xmx2G
 

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

@@ -5,12 +5,12 @@ Subject: [PATCH] Pufferfish api patches
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 149f9088fe806467656e8b1c4157df60fda69ba7..a9ef5d7c9e1fd3b8bb33fdb169ea0d69317f9e79 100644
+index 639651972fddce4dff63a0f0a7e566a15b9e2dd6..a3b44568774d16937bf292329bd19ae09367f663 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -71,6 +71,8 @@ dependencies {
-     testImplementation("junit:junit:4.13.2")
-     testImplementation("org.hamcrest:hamcrest-library:1.3")
+     testImplementation("org.hamcrest:hamcrest:2.2")
+     testImplementation("org.mockito:mockito-core:5.5.0")
      testImplementation("org.ow2.asm:asm-tree:9.5")
 +
 +    api("io.sentry:sentry:5.4.0") // Pufferfish

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 68206cf0178c26c0f528a1e14a5fb4e9ad410369..0cd39064429a17cdcb06cc598df46becdc52996c 100644
+index 8d8fe04e6b09d2a5b1cc05002073df5c58cdcb96..8758095bd8669061561802ba4bf0243d7f3c38c7 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2081,6 +2081,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2121,6 +2121,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
 

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

@@ -5,12 +5,12 @@ Subject: [PATCH] Add allowPvP gamerule
 
 
 diff --git a/src/main/java/org/bukkit/GameRule.java b/src/main/java/org/bukkit/GameRule.java
-index c6bc84a8755b2fe5d7d8d3ec857700ec1cba3c9b..0003450b36a1755f6ace9a2ff747773d771bde9b 100644
+index 695a299a3544547bbc24095980221205ce5469ba..786741ef8ee75d57ac0f9536c7e743c00d8cdf1e 100644
 --- a/src/main/java/org/bukkit/GameRule.java
 +++ b/src/main/java/org/bukkit/GameRule.java
-@@ -207,6 +207,13 @@ public final class GameRule<T> implements net.kyori.adventure.translation.Transl
+@@ -211,6 +211,13 @@ public final class GameRule<T> implements net.kyori.adventure.translation.Transl
       */
-     public static final GameRule<Boolean> DO_VINES_SPREAD = new GameRule<>("doVinesSpread", Boolean.class);
+     public static final GameRule<Boolean> ENDER_PEARLS_VANISH_ON_DEATH = new GameRule<>("enderPearlsVanishOnDeath", Boolean.class);
 
 +    // CloudPlane start - added allowPvP gamerule
 +    /**