Finish 26.1.1 patches

Author: PureGero

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Configure Git User Details

.github/workflows/upstream.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: Configure Git User Details

shreddedpaper-server/minecraft-patches/sources/ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java.patch

@@ -155,7 +155,7 @@
 
 -            final TrackedChunk chunk = NearbyPlayers.this.byChunk.get(chunkKey);
 +            NearbyPlayers.this.chunkModificationLock.write(chunkKey, () -> { // ShreddedPaper
-+            TrackedChunk chunk = NearbyPlayers.this.byChunkLock.optimisticRead(() -> NearbyPlayers.this.byChunk.get(chunkKey)); // ShreddedPaper
++            final TrackedChunk chunk = NearbyPlayers.this.byChunkLock.optimisticRead(() -> NearbyPlayers.this.byChunk.get(chunkKey)); // ShreddedPaper
              final NearbyMapType type = this.type;
              if (chunk != null) {
                  chunk.addPlayer(parameter, type);
@@ -180,7 +180,7 @@
 +            NearbyPlayers.this.chunkModificationLock.write(chunkKey, () -> { // ShreddedPaper
 +            final TrackedChunk chunk = NearbyPlayers.this.byChunkLock.optimisticRead(() -> NearbyPlayers.this.byChunk.get(chunkKey)); // ShreddedPaper
              if (chunk == null) {
-                 throw new IllegalStateException("Chunk should exist at " + new ChunkPos(chunkKey));
+                 throw new IllegalStateException("Chunk should exist at " + ChunkPos.unpack(chunkKey));
              }
 @@ -262,12 +_,13 @@
              type.removeFrom(parameter, NearbyPlayers.this.world, chunkX, chunkZ);

shreddedpaper-server/minecraft-patches/sources/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java.patch

@@ -18,15 +18,22 @@
          long currTime = System.nanoTime();
          for (final ServerPlayer player : new java.util.ArrayList<>(this.world.players())) {
              final PlayerChunkLoaderData loader = ((ChunkSystemServerPlayer)player).moonrise$getChunkLoader();
-@@ -387,6 +_,7 @@
-                 Math.abs(c2x - centerX) + Math.abs(c2z - centerZ)
+@@ -405,13 +_,13 @@
+                 (diff2X * diff2X) + (diff2Z * diff2Z)
              );
          };
 +        private final LongArrayList retryLaterSendQueue = new LongArrayList(); // ShreddedPaper
-         private final LongHeapPriorityQueue sendQueue = new LongHeapPriorityQueue(CLOSEST_MANHATTAN_DIST);
-         private final LongHeapPriorityQueue tickingQueue = new LongHeapPriorityQueue(CLOSEST_MANHATTAN_DIST);
-         private final LongHeapPriorityQueue generatingQueue = new LongHeapPriorityQueue(CLOSEST_MANHATTAN_DIST);
-@@ -641,7 +_,7 @@
+         private final LongHeapPriorityQueue sendQueue = new LongHeapPriorityQueue(this.queueComparator);
+         private final LongHeapPriorityQueue tickingQueue = new LongHeapPriorityQueue(this.queueComparator);
+         private final LongHeapPriorityQueue generatingQueue = new LongHeapPriorityQueue(this.queueComparator);
+         private final LongHeapPriorityQueue genQueue = new LongHeapPriorityQueue(this.queueComparator);
+         private final LongHeapPriorityQueue loadingQueue = new LongHeapPriorityQueue(this.queueComparator);
+         private final LongHeapPriorityQueue loadQueue = new LongHeapPriorityQueue(this.queueComparator);
+-
+         private volatile boolean removed;
+ 
+         public PlayerChunkLoaderData(final ServerLevel world, final ServerPlayer player) {
+@@ -659,7 +_,7 @@
              return true;
          }
 
@@ -35,12 +42,12 @@
              TickThread.ensureTickThread(this.player, "Cannot tick player chunk loader async");
              if (this.removed) {
                  throw new IllegalStateException("Ticking removed player chunk loader");
-@@ -821,17 +_,31 @@
-             final long maxSends = Math.max(0L, Math.min(MAX_RATE, Integer.MAX_VALUE)); // note: no logic to track concurrent sends
-             final int maxSendsThisTick = Math.min((int)this.chunkSendLimiter.takeAllocation(time, sendRate, maxSends), this.sendQueue.size());
+@@ -838,17 +_,31 @@
+             final long maxSends = Math.max(0L, Math.min(MAX_RATE, Math.min(this.sendQueue.size(), Integer.MAX_VALUE))); // note: no logic to track concurrent sends
+             final long maxSendsThisTick = this.chunkSendLimiter.takeAllocation(maxSends);
              // we do not return sends that we took from the allocation back because we want to limit the max send rate, not target it
 +            int j = 0; // ShreddedPaper
-             for (int i = 0; i < maxSendsThisTick; ++i) {
+             for (long i = 0; i < maxSendsThisTick; ++i) {
                  final long pendingSend = this.sendQueue.firstLong();
                  final int pendingSendX = CoordinateUtils.getChunkX(pendingSend);
                  final int pendingSendZ = CoordinateUtils.getChunkZ(pendingSend);
@@ -68,7 +75,7 @@
                      // not yet post-processed, need to do this so that tile entities can properly be sent to clients
                      chunk.postProcessGeneration(this.world);
                      // check if there was any recursive action
-@@ -841,7 +_,17 @@
+@@ -858,7 +_,17 @@
                  }
                  this.sendQueue.dequeueLong();
 
@@ -87,7 +94,7 @@
 
                  if (this.removed) {
                      // sendChunk may invoke plugin logic
-@@ -849,6 +_,15 @@
+@@ -866,6 +_,15 @@
                  }
              }
 
@@ -103,7 +110,7 @@
              this.flushDelayedTicketOps();
          }
 
-@@ -907,7 +_,7 @@
+@@ -918,7 +_,7 @@
              );
          }
 
@@ -112,15 +119,15 @@
              TickThread.ensureTickThread(this.player, "Cannot update player asynchronously");
              if (this.removed) {
                  throw new IllegalStateException("Updating removed player chunk loader");
-@@ -967,6 +_,7 @@
+@@ -978,6 +_,7 @@
                  this.player.connection.send(this.updateClientSimulationDistance(tickViewDistance));
              }
 
 +            this.retryLaterSendQueue.clear(); // ShreddedPaper
              this.sendQueue.clear();
              this.tickingQueue.clear();
              this.generatingQueue.clear();
-@@ -1073,6 +_,7 @@
+@@ -1084,6 +_,7 @@
              this.tickMap.remove();
 
              // purge queues

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

@@ -22,12 +22,12 @@
 
 @@ -77,7 +_,7 @@
 
-     private final ConcurrentLong2ReferenceChainedHashTable<TicketSet> tickets = new ConcurrentLong2ReferenceChainedHashTable<>();
-     private final ConcurrentLong2ReferenceChainedHashTable<Long2IntOpenHashMap> sectionToChunkToExpireCount = new ConcurrentLong2ReferenceChainedHashTable<>();
+     private final ConcurrentChainedLong2ReferenceHashTable<TicketSet> tickets = new ConcurrentChainedLong2ReferenceHashTable<>();
+     private final ConcurrentChainedLong2ReferenceHashTable<Long2IntOpenHashMap> sectionToChunkToExpireCount = new ConcurrentChainedLong2ReferenceHashTable<>();
 -    final ChunkUnloadQueue unloadQueue;
 +    // final ChunkUnloadQueue unloadQueue; // ShreddedPaper - use our own unload queue
 
-     private final ConcurrentLong2ReferenceChainedHashTable<NewChunkHolder> chunkHolders = ConcurrentLong2ReferenceChainedHashTable.createWithCapacity(16384, 0.25f);
+     private final ConcurrentChainedLong2ReferenceHashTable<NewChunkHolder> chunkHolders = ConcurrentChainedLong2ReferenceHashTable.createWithCapacity(16384, 0.25f);
      private final ServerLevel world;
 @@ -85,6 +_,7 @@
      private long currentTick;

shreddedpaper-server/minecraft-patches/sources/net/minecraft/CrashReport.java.patch

@@ -7,5 +7,5 @@
 -    private List<String> extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER! REPORT TO PURPUR INSTEAD!", ""); // Purpur - Rebrand
 +    private List<String> extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER! REPORT TO SHREDDEDPAPER INSTEAD!", ""); // Purpur - Rebrand // ShreddedPaper
 
-     public CrashReport(String title, Throwable exception) {
+     public CrashReport(final String title, final Throwable t) {
          this.title = title;

shreddedpaper-server/minecraft-patches/sources/net/minecraft/core/dispenser/DispenseItemBehavior.java.patch

@@ -1,15 +1,15 @@
 --- a/net/minecraft/core/dispenser/DispenseItemBehavior.java
 +++ b/net/minecraft/core/dispenser/DispenseItemBehavior.java
-@@ -407,20 +_,20 @@
+@@ -337,20 +_,20 @@
                      return result;
                  }
                  // Paper end - Call BlockDispenseEvent
 -                level.captureTreeGeneration = true; // CraftBukkit
 +                level.captureTreeGenerationThreadLocal.set(true); // CraftBukkit // ShreddedPaper - use thread local
-                 if (!BoneMealItem.growCrop(item, level, blockPos) && !BoneMealItem.growWaterPlant(item, level, blockPos, null)) {
+                 if (!BoneMealItem.growCrop(dispensed, level, target) && !BoneMealItem.growWaterPlant(dispensed, level, target, null)) {
                      this.setSuccess(false);
                  } else if (!level.isClientSide()) {
-                     level.levelEvent(LevelEvent.PARTICLES_AND_SOUND_PLANT_GROWTH, blockPos, 15);
+                     level.levelEvent(LevelEvent.PARTICLES_AND_SOUND_PLANT_GROWTH, target, 15);
                  }
                  // CraftBukkit start
 -                level.captureTreeGeneration = false;
@@ -20,7 +20,7 @@
 +                if (!level.capturedBlockStatesThreadLocal.get().isEmpty()) { // ShreddedPaper - use thread local
 +                    org.bukkit.TreeType treeType = net.minecraft.world.level.block.SaplingBlock.treeTypeThreadLocal.get(); // ShreddedPaper - use thread local
 +                    net.minecraft.world.level.block.SaplingBlock.treeTypeThreadLocal.remove(); // ShreddedPaper - use thread local
-                     org.bukkit.Location location = org.bukkit.craftbukkit.util.CraftLocation.toBukkit(blockPos, level);
+                     org.bukkit.Location location = org.bukkit.craftbukkit.util.CraftLocation.toBukkit(target, level);
 -                    List<org.bukkit.block.BlockState> states = new java.util.ArrayList<>(level.capturedBlockStates.values());
 -                    level.capturedBlockStates.clear();
 +                    List<org.bukkit.block.BlockState> states = new java.util.ArrayList<>(level.capturedBlockStatesThreadLocal.get().values()); // ShreddedPaper - use thread local

shreddedpaper-server/minecraft-patches/sources/net/minecraft/network/Connection.java.patch

@@ -32,37 +32,37 @@
  import net.minecraft.util.debugchart.LocalSampleLogger;
 @@ -303,6 +_,7 @@
 
-     private static void syncAfterConfigurationChange(ChannelFuture future) {
+     private static void syncAfterConfigurationChange(final ChannelFuture future) {
          try {
 +            if (TickThread.isTickThread()) MinecraftServer.getServer().managedBlock(future::isDone); // ShreddedPaper - don't block main thread
              future.syncUninterruptibly();
          } catch (Exception var2) {
              if (var2 instanceof ClosedChannelException) {
-@@ -400,7 +_,7 @@
+@@ -398,7 +_,7 @@
 
-     public void send(Packet<?> packet, @Nullable ChannelFutureListener sendListener, boolean flush) {
+     public void send(final Packet<?> packet, final @Nullable ChannelFutureListener listener, final boolean flush) {
          // Paper start - Optimize network: Handle oversized packets better
 -        final boolean connected = this.isConnected();
 +        final boolean connected = true || this.isConnected(); // ShreddedPaper - Checking if the player is connected is expensive
          if (!connected && !this.preparing) {
              return;
          }
-@@ -448,6 +_,14 @@
+@@ -446,6 +_,14 @@
          if (this.channel.eventLoop().inEventLoop()) {
-             this.doSendPacket(packet, sendListener, flush);
+             this.doSendPacket(packet, listener, flush);
          } else {
 +            // ShreddedPaper start - Use lazyExecute if we aren't flushing
 +            if (ShreddedPaperConfiguration.get().optimizations.useLazyExecuteWhenNotFlushing && !flush) {
 +                ((AbstractEventExecutor) this.channel.eventLoop()).lazyExecute(() -> {
-+                    this.doSendPacket(packet, sendListener, flush);
++                    this.doSendPacket(packet, listener, flush);
 +                });
 +                return;
 +            }
 +            // ShreddedPaper end - Use lazyExecute if we aren't flushing
-             this.channel.eventLoop().execute(() -> this.doSendPacket(packet, sendListener, flush));
+             this.channel.eventLoop().execute(() -> this.doSendPacket(packet, listener, flush));
          }
      }
-@@ -500,7 +_,7 @@
+@@ -498,7 +_,7 @@
      }
 
      // Paper start - Optimize network: Rewrite this to be safer if ran off main thread
@@ -71,7 +71,7 @@
          if (!this.isConnected()) {
              return true;
          }
-@@ -556,7 +_,8 @@
+@@ -554,7 +_,8 @@
      private static int currTick; // Paper - Buffer joins to world
      private static int tickSecond; // Purpur - Max joins per second
      public void tick() {

shreddedpaper-server/minecraft-patches/sources/net/minecraft/network/protocol/PacketUtils.java.patch

@@ -18,24 +18,23 @@
  import org.jspecify.annotations.Nullable;
  import org.slf4j.Logger;
 
-@@ -19,6 +_,28 @@
+@@ -19,6 +_,27 @@
      }
 
-     public static <T extends PacketListener> void ensureRunningOnSameThread(Packet<T> packet, T packetListener, PacketProcessor processor) throws RunningOnDifferentThreadException {
+     public static <T extends PacketListener> void ensureRunningOnSameThread(final Packet<T> packet, final T listener, final PacketProcessor packetProcessor) throws RunningOnDifferentThreadException {
 +        // ShreddedPaper start - run on player's thread
-+        if (packetListener instanceof ServerGamePacketListenerImpl gamePacketListener) {
++        if (listener instanceof ServerGamePacketListenerImpl gamePacketListener) {
 +            if (TickThread.isTickThreadFor(gamePacketListener.player)) return;
 +            ShreddedPaper.runSync(gamePacketListener.player, () -> {
-+                if (packetListener instanceof net.minecraft.server.network.ServerCommonPacketListenerImpl serverCommonPacketListener && serverCommonPacketListener.processedDisconnect) return; // Paper - Don't handle sync packets for kicked players
-+                if (packetListener.shouldHandleMessage(packet)) {
++                if (listener instanceof net.minecraft.server.network.ServerCommonPacketListenerImpl serverCommonPacketListener && serverCommonPacketListener.processedDisconnect) return; // Paper - Don't handle sync packets for kicked players
++                if (listener.shouldHandleMessage(packet)) {
 +                    try {
-+                        packet.handle(packetListener);
++                        packet.handle(listener);
 +                    } catch (Exception var3) {
 +                        if (var3 instanceof ReportedException reportedException && reportedException.getCause() instanceof OutOfMemoryError) {
-+                            throw PacketUtils.makeReportedException(var3, packet, packetListener);
++                            throw PacketUtils.makeReportedException(var3, packet, listener);
 +                        }
-+
-+                        packetListener.onPacketError(packet, var3);
++                        listener.onPacketError(packet, var3);
 +                    }
 +                } else {
 +                    LOGGER.debug("Ignoring packet due to disconnection: {}", packet);
@@ -44,6 +43,6 @@
 +            throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD;
 +        }
 +        // ShreddedPaper end - run on player's thread
-         if (!processor.isSameThread()) {
-             processor.scheduleIfPossible(packetListener, packet);
+         if (!packetProcessor.isSameThread()) {
+             packetProcessor.scheduleIfPossible(listener, packet);
              throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD;

shreddedpaper-server/minecraft-patches/sources/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java.patch

@@ -5,14 +5,14 @@
      // Paper start - Async-Anti-Xray - Ready flag for the connection, add chunk packet info
      private volatile boolean ready;
 +    public boolean modifyBlocks; // ShreddedPaper
- 
      @Override
      public boolean isReady() {
-@@ -39,6 +_,7 @@
-         ChunkPos pos = chunk.getPos();
-         this.x = pos.x;
-         this.z = pos.z;
+         return this.ready;
+@@ -51,6 +_,7 @@
+         ChunkPos chunkPos = levelChunk.getPos();
+         this.x = chunkPos.x();
+         this.z = chunkPos.z();
 +        this.modifyBlocks = modifyBlocks; // ShreddedPaper
-         io.papermc.paper.antixray.ChunkPacketInfo<net.minecraft.world.level.block.state.BlockState> chunkPacketInfo = modifyBlocks ? chunk.getLevel().chunkPacketBlockController.getChunkPacketInfo(this, chunk) : null; // Paper - Ant-Xray
-         this.chunkData = new ClientboundLevelChunkPacketData(chunk, chunkPacketInfo); // Paper - Anti-Xray
-         this.lightData = new ClientboundLightUpdatePacketData(pos, lightEngine, skyLight, blockLight);
+         io.papermc.paper.antixray.ChunkPacketInfo<net.minecraft.world.level.block.state.BlockState> chunkPacketInfo = modifyBlocks ? levelChunk.getLevel().chunkPacketBlockController.getChunkPacketInfo(this, levelChunk) : null; // Paper - Anti-Xray
+         this.chunkData = new ClientboundLevelChunkPacketData(levelChunk, chunkPacketInfo); // Paper - Anti-Xray
+         this.lightData = new ClientboundLightUpdatePacketData(chunkPos, lightEngine, skyChangedLightSectionFilter, blockChangedLightSectionFilter);