Update Upstream

gradle.properties

@@ -4,7 +4,7 @@ mcVersion=26.3
 apiVersion=26.3
 version=26.3
 
-purpurRef=ead44b3f901a270a04fb3ed7c6752aac02439419
+purpurRef=004981010c612cedad5aaf0c531237594abef307
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

shreddedpaper-server/minecraft-patches/sources/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java.patch

@@ -127,7 +127,7 @@
                  if (saveStat != null) {
                      if (saveStat.savedChunk()) {
                          ++savedChunk;
-@@ -804,13 +_,13 @@
+@@ -819,13 +_,13 @@
          if (removeDelay == NO_TIMEOUT_MARKER) {
              return false;
          }
@@ -143,7 +143,7 @@
 
          final int sectionShift = ((ChunkSystemServerLevel)this.world).moonrise$getRegionChunkShift();
 
-@@ -1153,6 +_,16 @@
+@@ -1168,6 +_,16 @@
          if (changedFullStatus.isEmpty()) {
              return;
          }
@@ -160,7 +160,7 @@
          if (!TickThread.isTickThread()) {
              // These will be handled on the next ServerChunkCache$MainThreadExecutor#pollTask, as it runs the distance manager update
              // which will invoke processTicketUpdates
-@@ -1167,98 +_,117 @@
+@@ -1182,98 +_,117 @@
 
      private void removeChunkHolder(final NewChunkHolder holder) {
          holder.onUnload();
@@ -344,7 +344,7 @@
 
                      // run stage 1
                      for (int i = 0, len = stage1.size(); i < len; ++i) {
-@@ -1323,10 +_,12 @@
+@@ -1338,10 +_,12 @@
 
              processedCount += stage1.size();
 
@@ -361,7 +361,7 @@
      }
 
      public enum TicketOperationType {
-@@ -1543,7 +_,7 @@
+@@ -1583,7 +_,7 @@
      public JsonObject getDebugJson() {
          final JsonObject ret = new JsonObject();
 

shreddedpaper-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BlockEntity.java.patch

@@ -16,7 +16,7 @@
      // CraftBukkit start - data containers
      private static final org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry();
      public final org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer persistentDataContainer;
-@@ -219,7 +_,8 @@
+@@ -210,7 +_,8 @@
 
      public void setChanged() {
          if (this.level != null) {

shreddedpaper-server/minecraft-patches/sources/net/minecraft/world/level/chunk/LevelChunk.java.patch

@@ -35,7 +35,7 @@
      private LevelChunk.UnsavedListener unsavedListener = chunkPos -> {};
      // CraftBukkit start
      public boolean mustNotSave;
-@@ -423,7 +_,7 @@
+@@ -428,7 +_,7 @@
              return null;
          }
 
@@ -44,7 +44,7 @@
              state.onPlace(this.level, pos, oldState, movedByPiston);
          }
 
-@@ -467,7 +_,7 @@
+@@ -472,7 +_,7 @@
 
      public @Nullable BlockEntity getBlockEntity(final BlockPos pos, final LevelChunk.EntityCreationType creationType) {
          // CraftBukkit start
@@ -53,7 +53,7 @@
          if (blockEntity == null) {
              blockEntity = this.blockEntities.get(pos);
          }
-@@ -654,13 +_,13 @@
+@@ -659,13 +_,13 @@
 
                  org.bukkit.World world = this.level.getWorld();
                  if (world != null) {

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

@@ -11,7 +11,7 @@
  import io.papermc.paper.configuration.GlobalConfiguration;
  import io.papermc.paper.configuration.PaperServerConfiguration;
  import io.papermc.paper.configuration.ServerConfiguration;
-@@ -309,7 +_,7 @@
+@@ -287,7 +_,7 @@
      private final ServerConfiguration serverConfig = new PaperServerConfiguration();
 
      // Paper start - Folia region threading API
@@ -20,7 +20,7 @@
      private final io.papermc.paper.threadedregions.scheduler.FoliaAsyncScheduler asyncScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaAsyncScheduler();
      private final io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler globalRegionScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler();
 
-@@ -386,7 +_,7 @@
+@@ -364,7 +_,7 @@
 
      @Override
      public final boolean isGlobalTickThread() {
@@ -29,23 +29,23 @@
      }
      // Paper end - Folia reagion threading API
 
-@@ -614,6 +_,7 @@
+@@ -592,6 +_,7 @@
              // Spigot end
              DefaultPermissions.registerCorePermissions();
              CraftDefaultPermissions.registerCorePermissions();
 +            ShreddedPaperPermissions.registerCorePermissions(); // ShreddedPaper
              if (!io.papermc.paper.configuration.GlobalConfiguration.get().misc.loadPermissionsYmlBeforePlugins) this.loadCustomPermissions(); // Paper
              this.syncCommands();
          }
-@@ -1037,6 +_,7 @@
+@@ -1015,6 +_,7 @@
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
          this.spark.registerCommandBeforePlugins(this); // Paper - spark
          org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur - Purpur config files
 +        ShreddedPaperCommands.registerCommands(this.getServer()); // ShreddedPaper
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
 
-@@ -1187,6 +_,8 @@
+@@ -1165,6 +_,8 @@
          Preconditions.checkState(this.console.getAllLevels().iterator().hasNext(), "Cannot create additional worlds on STARTUP");
          //Preconditions.checkState(!this.console.isIteratingOverLevels, "Cannot create a world while worlds are being ticked"); // Paper - Cat - Temp disable. We'll see how this goes.
          Preconditions.checkArgument(creator != null, "WorldCreator cannot be null");
@@ -54,7 +54,7 @@
 
          String name = creator.name();
          ChunkGenerator chunkGenerator = creator.generator();
-@@ -2914,6 +_,7 @@
+@@ -2912,6 +_,7 @@
          if (!io.papermc.paper.configuration.GlobalConfiguration.get().misc.loadPermissionsYmlBeforePlugins) loadCustomPermissions();
          DefaultPermissions.registerCorePermissions();
          CraftDefaultPermissions.registerCorePermissions();

shreddedpaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -147,6 +_,14 @@
+@@ -152,6 +_,14 @@
                      .describedAs("Yml file");
                  // Purpur end - Purpur config files
 

shreddedpaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch

@@ -17,7 +17,7 @@
  import net.minecraft.world.level.portal.TeleportTransition;
  import net.minecraft.world.level.storage.TagValueOutput;
  import net.minecraft.world.level.storage.ValueInput;
-@@ -788,7 +_,7 @@
+@@ -794,7 +_,7 @@
          ImmutableSet.Builder<Player> players = ImmutableSet.builder();
 
          ServerLevel world = ((CraftWorld) this.getWorld()).getHandle();
@@ -26,7 +26,7 @@
 
          if (entityTracker != null) {
              for (ServerPlayerConnection connection : entityTracker.seenBy) {
-@@ -805,7 +_,7 @@
+@@ -811,7 +_,7 @@
          Preconditions.checkArgument(player != null, "Player cannot be null");
 
          ServerLevel world = ((CraftWorld) this.getWorld()).getHandle();
@@ -35,7 +35,7 @@
          if (entityTracker == null) return false;
 
          return entityTracker.seenBy.contains(((CraftPlayer) player).getHandle().connection);
-@@ -1120,7 +_,7 @@
+@@ -1141,7 +_,7 @@
          }
 
          ServerLevel world = ((CraftWorld) this.getWorld()).getHandle();
@@ -44,7 +44,7 @@
 
          if (entityTracker == null) {
              return;
-@@ -1137,7 +_,7 @@
+@@ -1158,7 +_,7 @@
          }
 
          ServerLevel world = ((CraftWorld) this.getWorld()).getHandle();
@@ -53,7 +53,7 @@
 
          if (entityTracker == null) {
              return;
-@@ -1175,10 +_,28 @@
+@@ -1196,10 +_,28 @@
 
          ServerLevel world = ((CraftWorld)locationClone.getWorld()).getHandle();
          CompletableFuture<Boolean> ret = new CompletableFuture<>();
@@ -83,7 +83,7 @@
                      final ServerChunkCache chunkCache = world.getChunkSource();
                      for (final net.minecraft.world.level.chunk.ChunkAccess chunk : chunks) {
                          chunkCache.addTicketAtLevel(TicketType.POST_TELEPORT, chunk.getPos(), ChunkLevel.FULL_CHUNK_LEVEL);
-@@ -1266,7 +_,7 @@
+@@ -1287,7 +_,7 @@
      @Override
      public Set<org.bukkit.entity.Player> getTrackedPlayers() {
          ServerLevel world = (net.minecraft.server.level.ServerLevel)this.entity.level();