Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@88a3a87 Configurable xp orb merge group count (#12503)
PaperMC/Paper@53d1d04 Disable Item Obfuscation for entity related stacks (#12297)
PaperMC/Paper@c98cd65 Add configuration interface to expose certain config values (#12273)
PaperMC/Paper@42a2a6c Supports the ability for commands to be registered internally (#12520)
PaperMC/Paper@753cff7 Improvements for Dump paper commands (#12512)
PaperMC/Paper@e2da5d2 Registry API for supported Mob Variants (#12417)
PaperMC/Paper@ab0253f Expand PlayerDeathEvent API (#12221)
PaperMC/Paper@cbcf75a Update visual fire handling with TriState support (#12303)
PaperMC/Paper@6c3964d Properly save level data async (#12530)
PaperMC/Paper@d2ad2e6 Add missing EntityLookup#getAllMapped from Moonrise
PaperMC/Paper@358e72e Remove simplify remote item matching stuff for now
PaperMC/Paper@04ffca0 Also remove CraftPlayer methods
PaperMC/Paper@a252581 Update mache

gradle.properties

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

sakura-api/paper-patches/files/src/main/java/org/bukkit/Bukkit.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -127,6 +_,20 @@
+@@ -128,6 +_,20 @@
          // Paper end
      }
  

sakura-api/paper-patches/files/src/main/java/org/bukkit/entity/Entity.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -37,6 +_,22 @@
+@@ -38,6 +_,22 @@
   */
  public interface Entity extends Metadatable, CommandSender, Nameable, PersistentDataHolder, net.kyori.adventure.text.event.HoverEventSource<net.kyori.adventure.text.event.HoverEvent.ShowEntity>, net.kyori.adventure.sound.Sound.Emitter, DataComponentView { // Paper
  

sakura-server/build.gradle.kts.patch

@@ -7,7 +7,7 @@
 +val serverBrand = rootProject.name
  
  dependencies {
-     mache("io.papermc:mache:1.21.5+build.1")
+     mache("io.papermc:mache:1.21.5+build.2")
 @@ -24,6 +_,17 @@
      minecraftVersion = providers.gradleProperty("mcVersion")
      gitFilePatches = 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 8097ad52b8c38726155251376015fca2105f5547..2ed1d5d504a69c03f4860f05e146c320cdb48a60 100644
+index 6fa053b317fa51d0bf25a6d3f48addc55452257e..c5fffb6ca4ef4d447e4eb668e8980fe0885d99da 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,10 +132,10 @@ index 8097ad52b8c38726155251376015fca2105f5547..2ed1d5d504a69c03f4860f05e146c320
          }
  
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 0689dc62a9fefc6d3876787f7d67c0ab4b12716b..1771460df96e294bb9547568d6f00708fa672a4a 100644
+index 531336f7c09e74ed60f7c697c26a9639a9ea489c..5c7bb1ff36fe9d91958eda88a2631b7d60659fb2 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
+@@ -451,6 +451,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          return this.viewDistanceHolder;
      }
      // Paper end - rewrite chunk system
@@ -207,7 +207,7 @@ index 064a9b6cf6792192fc1fa80095a48c2025cebf2a..266a8e6b164d6d76c2fc26c986290569
                          if (this.player.containerMenu != oldContainer) {
                              return;
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 76945e5eab70734015995288faa51c7cc5438d08..ca2939dcc380989d87bed516c4b7a73be90ebf06 100644
+index 96533cb586bb9c15350a6de3d644a7781d6ce8dc..c230477e45603deac6e6055d889b8483955f58d4 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 ca2939dcc380989d87bed516c4b7a73be90ebf06..98664677c90564c2bd454ad408ed832f3ec289b5 100644
+index c230477e45603deac6e6055d889b8483955f58d4..9959c7488167d5a0905e772d4b23d08eb8148762 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 ca2939dcc380989d87bed516c4b7a73be90ebf06..98664677c90564c2bd454ad408ed832f
          );
          potentialCollisionsBB.addAll(entityAABBs);
          final Vec3 collided = ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.performCollisions(movement, currentBox, potentialCollisionsVoxel, potentialCollisionsBB);
-@@ -4932,13 +4946,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4948,13 +4962,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 98664677c90564c2bd454ad408ed832f3ec289b5..6bd0b05906ca41fb24c0d57fe51017b31242c8c5 100644
+index 9959c7488167d5a0905e772d4b23d08eb8148762..46b82a1b7a3859681dec3e141ac6ea97672fcf97 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -3424,7 +3424,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3440,7 +3440,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

@@ -5,7 +5,7 @@ Subject: [PATCH] Merge Cannon Entities
 
 
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 2ed1d5d504a69c03f4860f05e146c320cdb48a60..a4428a3c23db6f795b5ff0ead634e2e21468e3a6 100644
+index c5fffb6ca4ef4d447e4eb668e8980fe0885d99da..939264c895f452e909cfbff19eced2cfc904ee6a 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -687,6 +687,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -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 a4d40032c96956a5dc7d8c0db7a794eb95b3540b..776a1f50c0c94fb578749a00320d25b5ba7ff3e1 100644
+index d1d39737e4001b103e6412983ff6a4761b32c432..549e5bd413ca17d1b79c1e4b57faeb368325d99d 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 a4d40032c96956a5dc7d8c0db7a794eb95b3540b..776a1f50c0c94fb578749a00320d25b5
  
      public Entity(EntityType<?> entityType, Level level) {
          this.type = entityType;
-@@ -4931,6 +4952,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4947,6 +4968,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/features/0013-Add-maxSearch-to-getEntities.patch

@@ -56,10 +56,10 @@ index 6e3a429bc165d8473ea50ee2ae1548270db599d1..417afe621f559d7fab0798ccf586b630
                      if (entity == null || entity == except || !entity.getBoundingBox().intersects(box)) {
                          continue;
 diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/EntityLookup.java b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/EntityLookup.java
-index 7554c109c35397bc1a43dd80e87764fd78645bbf..d60f30f7afb15cc90c1bd4b816136d00b23a53e4 100644
+index 2d24d03bbdb5ee0d862cbfff2219f58afffafe12..1bf06038d51efcc103fad23670686c30d676dc0b 100644
 --- a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/EntityLookup.java
 +++ b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/EntityLookup.java
-@@ -722,6 +722,13 @@ public abstract class EntityLookup implements LevelEntityGetter<Entity> {
+@@ -726,6 +726,13 @@ public abstract class EntityLookup implements LevelEntityGetter<Entity> {
  
      public void getEntities(final Entity except, final AABB box, final List<Entity> into, final Predicate<? super Entity> predicate,
                              final int maxCount) {
@@ -73,7 +73,7 @@ index 7554c109c35397bc1a43dd80e87764fd78645bbf..d60f30f7afb15cc90c1bd4b816136d00
          final int minChunkX = (Mth.floor(box.minX) - 2) >> 4;
          final int minChunkZ = (Mth.floor(box.minZ) - 2) >> 4;
          final int maxChunkX = (Mth.floor(box.maxX) + 2) >> 4;
-@@ -753,7 +760,7 @@ public abstract class EntityLookup implements LevelEntityGetter<Entity> {
+@@ -757,7 +764,7 @@ public abstract class EntityLookup implements LevelEntityGetter<Entity> {
                              continue;
                          }
  

sakura-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -428,6 +_,7 @@
+@@ -420,6 +_,7 @@
      public @Nullable com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
      public @Nullable String clientBrandName = null; // Paper - Brand support
      public @Nullable org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event

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;
-@@ -3987,7 +_,7 @@
+@@ -4003,7 +_,7 @@
      }
  
      public boolean isPushedByFluid() {

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 dab008f7d5cd6c04eee96579d5ec30e549f100f5..9b2bf0c4a4dabe216370f0d8d5b8ab889ad78e58 100644
+index 9615467faa2aeb6cd54a3f54ef519daed76194f4..ca3498b8b0a60d83321cdcfdb89a3ab6578f45d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2375,6 +2375,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2374,6 +2374,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 dab008f7d5cd6c04eee96579d5ec30e549f100f5..9b2bf0c4a4dabe216370f0d8d5b8ab88
      }
  
      public void setExtraData(CompoundTag tag) {
-@@ -2404,6 +2408,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2403,6 +2407,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 dab008f7d5cd6c04eee96579d5ec30e549f100f5..9b2bf0c4a4dabe216370f0d8d5b8ab88
      }
  
      @Override
-@@ -3064,6 +3073,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3063,6 +3072,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().allowsListing();
      }
  

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

@@ -1,6 +1,6 @@
 --- a/src/main/java/io/papermc/paper/configuration/Configurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/Configurations.java
-@@ -94,7 +_,7 @@
+@@ -95,7 +_,7 @@
          };
      }
  
@@ -9,7 +9,7 @@
          return node -> {
              ObjectMapper.Factory factory = (ObjectMapper.Factory) Objects.requireNonNull(node.options().serializers().get(type));
              ObjectMapper.Mutable<T> mutable = (ObjectMapper.Mutable<T>) factory.get(type);
-@@ -229,7 +_,7 @@
+@@ -230,7 +_,7 @@
              .path(worldConfigFile)
              .build();
          final ConfigurationNode worldNode = worldLoader.load();

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
-@@ -1070,6 +_,7 @@
+@@ -1073,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))
-@@ -1101,6 +_,7 @@
+@@ -1104,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/CraftEntity.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -98,6 +_,18 @@
+@@ -99,6 +_,18 @@
          this.entityType = CraftEntityType.minecraftToBukkit(entity.getType());
      }
  

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

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -232,6 +_,18 @@
+@@ -231,6 +_,18 @@
          this.firstPlayed = System.currentTimeMillis();
      }