Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@deaccd2 [ci skip] Add file reference url to help.yml (#12481)
PaperMC/Paper@f86b435 Add vault change state event (#12069)
PaperMC/Paper@3e3b42c Update player chat session sync (#12382)
PaperMC/Paper@f8fa4f6 Add method to retrieve FishHook (#12310)
PaperMC/Paper@b9d3147 Use correct placed block position for sound (#12410)
PaperMC/Paper@952338b [ci skip] Add missing exception docs to Player#listPlayer (#12488)
PaperMC/Paper@1db3785 [ci skip] improve javadoc for off-hand swaps through getHotbarButton (#12489)
PaperMC/Paper@d1810f2 Allow Server#getDefaultGameMode before worlds are initialized (#12490)
PaperMC/Paper@02d20ff Fix NPE in Server#getMap before worlds are loaded (#12492)
PaperMC/Paper@9e873f5 Fix inconsistencies between offline/online spawn position getter (#11960)
PaperMC/Paper@fc0c371 Fix handling of resultant crafting container from craftItemResult (#12307)
PaperMC/Paper@a7a76c8 Add methods for Armadillo (#12031)
PaperMC/Paper@a74400d Update adventure to 4.21.0 (#12499)
PaperMC/Paper@1e93076 Fix ipv6 loopback addresses being able to get connection throttled (#12155)
PaperMC/Paper@646b80c Fix unnecessary map data saves (#12296)
PaperMC/Paper@e663f99 Add combat tracker API (#11853)
PaperMC/Paper@cd4fe5b [ci skip] Drop non-applicable ATs (#12498)
PaperMC/Paper@5acfdd6 Fix save/load NaN Entity Motion (#12269)
PaperMC/Paper@2754d7c Add Throw EntityChangeBlockEvent for BrushableBlockEntity#brush (#12133)
PaperMC/Paper@567f63a Parity for respawn events (#11792)
PaperMC/Paper@bc3d946 Normalizes CraftEntity#toString/getHandle (#12170)
PaperMC/Paper@0e9b94d Fix ItemStack amount issues with Chat Components (#12216)
PaperMC/Paper@835b955 Add a method on InventoryView to get the MenuType (#12193)
PaperMC/Paper@c9411bf Fix min ItemStack amount check for asHoverEvent (#12505)
PaperMC/Paper@1acf3b3 Infer block entity data in brigadier blockstate argument (#12197)
PaperMC/Paper@b9b3cd6 Use components instead of ChatColor in more places  (#12507)
PaperMC/Paper@ec42171 Add missing spaces back (#12508)
PaperMC/Paper@51345a1 Correct nullable fall location type
PaperMC/Paper@93246a0 Fix errors when loading raid files without a PDC
PaperMC/Paper@cb3ffd0 Don't store empty PDCs on raids
PaperMC/Paper@d637ae8 Fix NoSuchElementException in EntityTransformEvent for slimes (#12510)
PaperMC/Paper@1074237 Pass correct draw strength for EntityShootBowEvent (#12308)
PaperMC/Paper@825685f Add PlayerPickBlockEvent and PlayerPickEntityEvent (#12425)
PaperMC/Paper@2bd84f6 Expand PotionMeta Api to allow getting effective potion colour and effects (#12390)
PaperMC/Paper@6f1f5b6 Fix ArmorStand items for canceled EntityDeathEvent (#12288)

gradle.properties

@@ -2,7 +2,7 @@ group=me.samsuik.sakura
 version=1.21.5-R0.1-SNAPSHOT
 mcVersion=1.21.5
 
-paperRef=3222985e438261bd13d0b74e81d0e37158e083f1
+paperRef=6f1f5b67e044b151feec164e4fad13ce282417c1
 
 org.gradle.jvmargs=-Xmx2G
 org.gradle.vfs.watch=false

sakura-api/build.gradle.kts.patch

@@ -1,6 +1,6 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
-@@ -93,7 +_,7 @@
+@@ -90,7 +_,7 @@
      testRuntimeOnly("org.junit.platform:junit-platform-launcher")
  }
  
@@ -9,7 +9,7 @@
  idea {
      module {
          generatedSourceDirs.add(generatedDir.toFile())
-@@ -103,6 +_,18 @@
+@@ -100,6 +_,18 @@
      main {
          java {
              srcDir(generatedDir)
@@ -28,7 +28,7 @@
          }
      }
  }
-@@ -169,7 +_,7 @@
+@@ -166,7 +_,7 @@
  
  tasks.withType<Javadoc> {
      val options = options as StandardJavadocDocletOptions
@@ -37,7 +37,7 @@
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
-@@ -202,11 +_,11 @@
+@@ -199,11 +_,11 @@
      }
  
      // workaround for https://github.com/gradle/gradle/issues/4046

sakura-server/minecraft-patches/features/0002-Client-Visibility-Settings.patch

@@ -132,7 +132,7 @@ index 8097ad52b8c38726155251376015fca2105f5547..2ed1d5d504a69c03f4860f05e146c320
          }
  
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 688e1a452a0b9d80d38b3fa2b9b0630c5124dc7e..4704436b85c3b326cdc03e64e507ba10d1b21449 100644
+index 0689dc62a9fefc6d3876787f7d67c0ab4b12716b..1771460df96e294bb9547568d6f00708fa672a4a 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -459,6 +459,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -195,10 +195,10 @@ index 186393485396cfe9b1baef29586198356e2d2600..a06f5a9b577cd9cc2cb948b2801b0aec
          }
      }
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index deddc0b3b9e7f4ff299feab2ebb8ddb2a4cfa6e2..315a6f3f15aa9965a170d3f9d5e09c9ac1e1b774 100644
+index 064a9b6cf6792192fc1fa80095a48c2025cebf2a..266a8e6b164d6d76c2fc26c986290569781cf871 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3190,6 +3190,7 @@ public class ServerGamePacketListenerImpl
+@@ -3192,6 +3192,7 @@ public class ServerGamePacketListenerImpl
  
                          event.setCancelled(cancelled);
                          net.minecraft.world.inventory.AbstractContainerMenu oldContainer = this.player.containerMenu; // SPIGOT-1224
@@ -207,7 +207,7 @@ index deddc0b3b9e7f4ff299feab2ebb8ddb2a4cfa6e2..315a6f3f15aa9965a170d3f9d5e09c9a
                          if (this.player.containerMenu != oldContainer) {
                              return;
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 607a3243074d1a67c413d33493fa7b8d9d3055d8..ec7687616eb0bc0f1149d990051a5d67b04edc19 100644
+index 76945e5eab70734015995288faa51c7cc5438d08..ca2939dcc380989d87bed516c4b7a73be90ebf06 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -512,6 +512,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

sakura-server/minecraft-patches/features/0003-Load-Chunks-on-Movement.patch

@@ -51,7 +51,7 @@ index f91eed907ffc61a4092aabaa0a1b061c2c453673..0159517f425491ce490d982a09e40efd
      public static TicketType register(String name, long timeout, boolean persist, TicketType.TicketUse use) {
          return Registry.register(BuiltInRegistries.TICKET_TYPE, name, new TicketType(timeout, persist, use));
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index ec7687616eb0bc0f1149d990051a5d67b04edc19..7031f59d7b2b07bffc44d09b9685dc3d779e3afc 100644
+index ca2939dcc380989d87bed516c4b7a73be90ebf06..98664677c90564c2bd454ad408ed832f3ec289b5 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -516,6 +516,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -84,7 +84,7 @@ index ec7687616eb0bc0f1149d990051a5d67b04edc19..7031f59d7b2b07bffc44d09b9685dc3d
          );
          potentialCollisionsBB.addAll(entityAABBs);
          final Vec3 collided = ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.performCollisions(movement, currentBox, potentialCollisionsVoxel, potentialCollisionsBB);
-@@ -4931,13 +4945,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4932,13 +4946,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      @Override
      public boolean shouldBeSaved() {
          return (this.removalReason == null || this.removalReason.shouldSave())

sakura-server/minecraft-patches/features/0004-Slice-Packet-obfuscation-and-reduction.patch

@@ -153,10 +153,10 @@ index b118e91f1e0b5a8b8c0b2a4a32faabc5a34a5954..b26b47afe4533d223d0079e4733ef017
  
          if (this.entity instanceof LivingEntity) {
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 7031f59d7b2b07bffc44d09b9685dc3d779e3afc..b94c17c87628f2ff3aae700f731e7fa5160ed799 100644
+index 98664677c90564c2bd454ad408ed832f3ec289b5..6bd0b05906ca41fb24c0d57fe51017b31242c8c5 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -3423,7 +3423,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3424,7 +3424,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              this.entityData.markDirty(Entity.DATA_AIR_SUPPLY_ID);
              return;
          }

sakura-server/minecraft-patches/features/0008-Merge-Cannon-Entities.patch

@@ -41,7 +41,7 @@ index 2ed1d5d504a69c03f4860f05e146c320cdb48a60..a4428a3c23db6f795b5ff0ead634e2e2
                                      this.guardEntityTick(this::tickNonPassenger, entity);
                                      profilerFiller.pop();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 437d10c650f5aea171f2ea0d075f140d7f3cb058..4c4a662306b698112242775f9701902b70e3ae85 100644
+index a4d40032c96956a5dc7d8c0db7a794eb95b3540b..776a1f50c0c94fb578749a00320d25b5ba7ff3e1 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -545,6 +545,27 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -72,7 +72,7 @@ index 437d10c650f5aea171f2ea0d075f140d7f3cb058..4c4a662306b698112242775f9701902b
  
      public Entity(EntityType<?> entityType, Level level) {
          this.type = entityType;
-@@ -4930,6 +4951,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4931,6 +4952,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          if (this.removalReason != Entity.RemovalReason.UNLOADED_TO_CHUNK) { this.getPassengers().forEach(Entity::stopRiding); } // Paper - rewrite chunk system
          this.levelCallback.onRemove(removalReason);
          this.onRemoval(removalReason);

sakura-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch

@@ -8,7 +8,7 @@
  
      public Entity(EntityType<?> entityType, Level level) {
          this.type = entityType;
-@@ -3986,7 +_,7 @@
+@@ -3987,7 +_,7 @@
      }
  
      public boolean isPushedByFluid() {

sakura-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/item/ItemStack.java
 +++ b/net/minecraft/world/item/ItemStack.java
-@@ -847,6 +_,15 @@
+@@ -846,6 +_,15 @@
          }
      }
  

sakura-server/paper-patches/features/0001-Client-Visibility-Settings.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Client Visibility Settings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 13f6d27edf12628a9e3d7891ad0573aeffd1bcde..9c3d6bad289f11d7c450485557f9d9deb63887b3 100644
+index dab008f7d5cd6c04eee96579d5ec30e549f100f5..9b2bf0c4a4dabe216370f0d8d5b8ab889ad78e58 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2383,6 +2383,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2375,6 +2375,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              handle.expToDrop = data.getIntOr("expToDrop", 0);
              handle.keepLevel = data.getBooleanOr("keepLevel", false);
          });
@@ -19,7 +19,7 @@ index 13f6d27edf12628a9e3d7891ad0573aeffd1bcde..9c3d6bad289f11d7c450485557f9d9de
      }
  
      public void setExtraData(CompoundTag tag) {
-@@ -2412,6 +2416,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2404,6 +2408,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          paper.putLong("LastLogin", handle.loginTime);
          paper.putLong("LastSeen", System.currentTimeMillis());
          // Paper end
@@ -31,7 +31,7 @@ index 13f6d27edf12628a9e3d7891ad0573aeffd1bcde..9c3d6bad289f11d7c450485557f9d9de
      }
  
      @Override
-@@ -3072,6 +3081,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3064,6 +3073,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().allowsListing();
      }
  

sakura-server/paper-patches/features/0002-Merge-Cannon-Entities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Merge Cannon Entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
-index 8be01a87b637a835c2c840e8281d10cd9c0566e2..100509197893cbe13745751ff1606b71cfb95115 100644
+index e77b06c3ef9b534a8f4f160d077cf4339ee7622d..f0efb5feea71a69ac52f4dd81266f3a48020f926 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
 @@ -25,6 +25,27 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock {
@@ -37,7 +37,7 @@ index 8be01a87b637a835c2c840e8281d10cd9c0566e2..100509197893cbe13745751ff1606b71
      @Override
      public FallingBlockEntity getHandle() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
-index 465edd85d9a74f51a2bc8bddc85ddcc2aad2e39e..23fa8c8939154ebad654f3ae94aa4bdfcda033a0 100644
+index eea78db7f12f5976077663a9ff0c0e188ffa8849..3fcee720ec174255ebd71428d8449a444d2a22ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
 @@ -12,6 +12,28 @@ public class CraftTNTPrimed extends CraftEntity implements TNTPrimed {
@@ -67,5 +67,5 @@ index 465edd85d9a74f51a2bc8bddc85ddcc2aad2e39e..23fa8c8939154ebad654f3ae94aa4bdf
 +    // Sakura end - merge cannon entities
 +
      @Override
-     public float getYield() {
+     public PrimedTnt getHandle() {
-         return this.getHandle().explosionPower;
+         return (PrimedTnt) this.entity;

sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1067,6 +_,7 @@
+@@ -1070,6 +_,7 @@
  
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -8,7 +8,7 @@
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1098,6 +_,7 @@
+@@ -1101,6 +_,7 @@
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper

sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch

@@ -16,6 +16,6 @@
 +    }
 +    // Sakura end - entity tracking range modifier
 +
-     public GameProfile getProfile() {
+     @Override
-         return this.getHandle().getGameProfile();
+     public ServerPlayer getHandle() {
-     }
+         return (ServerPlayer) this.entity;