Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@6b4ad08 Add PlayerRespawnEvent#isMissingRespawnBlock (#12422)
PaperMC/Paper@c0bd568 Add logic for Human canUseEquipmentSlot (#12433)
PaperMC/Paper@a55345f Add support for deserializing manually deserialized items, also add caller note
PaperMC/Paper@2948eb2 Mitigate an issue when loading a spigot config with null spam exclusion entries
PaperMC/Paper@6c2b037 Use correct saved data key for maps
PaperMC/Paper@89cdcba [ci skip] Replace wiki mention for BlockType#isOccluding (#12446)
PaperMC/Paper@5f0b829 Re-add chunk position check to regionfile recalculation patch
PaperMC/Paper@04b9112 Update projects dependents GitHub Action (#12436)
PaperMC/Paper@def0532 Fix writing headers and update to be more papery (#12459)
PaperMC/Paper@d22644a Expand cooldown API (#12435)
PaperMC/Paper@df42993 Fix floating warning log when the kick event is canceled (#12374)
PaperMC/Paper@a820bda [ci skip] Some javadoc fixes
PaperMC/Paper@55f2020 Fix CCE in LingeringPotionSplashEvent (#12463)
PaperMC/Paper@1410a22 Fix passengers sending when riding players
PaperMC/Paper@767868d Fix some components (#12457)
PaperMC/Paper@9cddf13 Fix portal create event block list (#12373)
PaperMC/Paper@a112d37 Fix horse_variant and tropical_fish_pattern (#12472)
PaperMC/Paper@a211ac2 Remove unused warning (#12478)
PaperMC/Paper@ae51281 Add isSuffocating to Block and BlockState (#12445)
PaperMC/Paper@3409e2d Mace was not included in the ENCHANTABLE MaterialSetTag (#12476)
PaperMC/Paper@1cfc96b Add keyStream() API to registries (#12479)
PaperMC/Paper@3222985 [ci skip] Rebuild patches

gradle.properties

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

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

@@ -78,7 +78,7 @@ index dff3cc7456fe69ebd735aa950f79ce0dfed7e25e..07d8bb89ed0f9cea6353905939ba9f91
                  if (flag && !player.getBukkitEntity().canSee(this.entity.getBukkitEntity())) { // Paper - only consider hits
                      flag = false;
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 42f302a4cd2c511609e8818fe29ccd003befc485..59a9632d8fcfacf4828ba4228c813bca730a4c17 100644
+index 8097ad52b8c38726155251376015fca2105f5547..2ed1d5d504a69c03f4860f05e146c320cdb48a60 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -561,6 +561,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -132,7 +132,7 @@ index 42f302a4cd2c511609e8818fe29ccd003befc485..59a9632d8fcfacf4828ba4228c813bca
          }
  
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index e281c7da86433c459d917ab92c9509ec29cad595..dbaf6f1f3ce025bad43e80b651495cb519d825b5 100644
+index 688e1a452a0b9d80d38b3fa2b9b0630c5124dc7e..4704436b85c3b326cdc03e64e507ba10d1b21449 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
@@ -144,7 +144,7 @@ index e281c7da86433c459d917ab92c9509ec29cad595..dbaf6f1f3ce025bad43e80b651495cb5
      public ServerPlayer(MinecraftServer server, ServerLevel level, GameProfile gameProfile, ClientInformation clientInformation) {
          super(level, level.getSharedSpawnPos(), level.getSharedSpawnAngle(), gameProfile);
 diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index d385cb836b7713f2dbd0b8693777c8e5ea0a74e4..81de75ff6726f79b4e9bf1dc1d242b09bb86b4a9 100644
+index 186393485396cfe9b1baef29586198356e2d2600..a06f5a9b577cd9cc2cb948b2801b0aec31db8836 100644
 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -51,6 +51,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -195,10 +195,10 @@ index d385cb836b7713f2dbd0b8693777c8e5ea0a74e4..81de75ff6726f79b4e9bf1dc1d242b09
          }
      }
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f49a2c18ec20a7181951389066b7d062b48d43fa..1b89962ac8058c289137da0521b736259ba2443d 100644
+index deddc0b3b9e7f4ff299feab2ebb8ddb2a4cfa6e2..315a6f3f15aa9965a170d3f9d5e09c9ac1e1b774 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3197,6 +3197,7 @@ public class ServerGamePacketListenerImpl
+@@ -3190,6 +3190,7 @@ public class ServerGamePacketListenerImpl
  
                          event.setCancelled(cancelled);
                          net.minecraft.world.inventory.AbstractContainerMenu oldContainer = this.player.containerMenu; // SPIGOT-1224

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

@@ -123,10 +123,10 @@ index f1ab0e66e7d464f7f31a7a360528ed97cdda0aa0..4aed59c3038cb4af7e454a0dd8455488
          public DataItem(EntityDataAccessor<T> accessor, T value) {
              this.accessor = accessor;
 diff --git a/net/minecraft/server/level/ServerEntity.java b/net/minecraft/server/level/ServerEntity.java
-index 257ecbcf7d463eefb951867a5426eaf24e356305..ff1c1cd9ff78cdd3492f3c906ba6b8b2da7f1bed 100644
+index b118e91f1e0b5a8b8c0b2a4a32faabc5a34a5954..b26b47afe4533d223d0079e4733ef0172121cc9d 100644
 --- a/net/minecraft/server/level/ServerEntity.java
 +++ b/net/minecraft/server/level/ServerEntity.java
-@@ -143,7 +143,7 @@ public class ServerEntity {
+@@ -148,7 +148,7 @@ public class ServerEntity {
              this.sendDirtyEntityData();
          }
  
@@ -135,7 +135,7 @@ index 257ecbcf7d463eefb951867a5426eaf24e356305..ff1c1cd9ff78cdd3492f3c906ba6b8b2
              byte b = Mth.packDegrees(this.entity.getYRot());
              byte b1 = Mth.packDegrees(this.entity.getXRot());
              boolean flag = Math.abs(b - this.lastSentYRot) >= 1 || Math.abs(b1 - this.lastSentXRot) >= 1;
-@@ -412,7 +412,15 @@ public class ServerEntity {
+@@ -417,7 +417,15 @@ public class ServerEntity {
          List<SynchedEntityData.DataValue<?>> list = entityData.packDirty();
          if (list != null) {
              this.trackedDataValues = entityData.getNonDefaultValues();

sakura-server/paper-patches/files/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-@@ -169,7 +_,7 @@
+@@ -173,7 +_,7 @@
              .defaultOptions(PaperConfigurations::defaultOptions);
      }
  
@@ -9,7 +9,7 @@
          return options.serializers(builder -> builder
              .register(MapSerializer.TYPE, new MapSerializer(false))
              .register(new EnumValueSerializer())
-@@ -466,7 +_,7 @@
+@@ -470,7 +_,7 @@
      }
  
      // Symlinks are not correctly checked in createDirectories

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
-@@ -1064,6 +_,7 @@
+@@ -1067,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))
-@@ -1095,6 +_,7 @@
+@@ -1098,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/spigotmc/SpigotConfig.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -228,7 +_,7 @@
+@@ -229,7 +_,7 @@
      }
  
      private static void tpsCommand() {