Update to 26.2

Author: Spottedleaf

folia-api/build.gradle.kts.patch

@@ -1,6 +1,6 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
-@@ -91,7 +_,7 @@
+@@ -94,7 +_,7 @@
      testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.3")
  }
 
@@ -9,7 +9,7 @@
  idea {
      module {
          generatedSourceDirs.add(generatedDir.toFile())
-@@ -101,6 +_,18 @@
+@@ -104,6 +_,18 @@
      main {
          java {
              srcDir(generatedDir)
@@ -28,7 +28,7 @@
          }
      }
  }
-@@ -183,7 +_,7 @@
+@@ -186,7 +_,7 @@
 
  tasks.withType<Javadoc>().configureEach {
      val options = options as StandardJavadocDocletOptions
@@ -37,7 +37,7 @@
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
-@@ -217,11 +_,11 @@
+@@ -213,11 +_,11 @@
      }
 
      // workaround for https://github.com/gradle/gradle/issues/4046

folia-api/paper-patches/features/0004-Add-TPS-From-Region.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add TPS From Region
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index de21023e1e0ea9d22f6beb8ef50715809c10058a..550c7eef69acde07c05b0cb75bf413186c09a26a 100644
+index d083e3e5f00aac3e5c48a248cae665f3517a4b4a..8a24b84db656da4cec59e9bccac306467c8155b0 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2990,6 +2990,42 @@ public final class Bukkit {
+@@ -2994,6 +2994,42 @@ public final class Bukkit {
          return server.isGlobalTickThread();
      }
      // Paper end - Folia region threading API
@@ -52,10 +52,10 @@ index de21023e1e0ea9d22f6beb8ef50715809c10058a..550c7eef69acde07c05b0cb75bf41318
      /**
       * @deprecated All methods on this class have been deprecated, see the individual methods for replacements.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index dd8ad5976eb413f049245a4f37bd94b3e41829de..23901bb9e01a90dc5f12e458b7188d51e91022b4 100644
+index 62341f72e8457c5547994bee1f3fda9faade6ce0..fb5ca3ab0ddba433a39e65572beeb955b50d6f72 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2780,4 +2780,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2776,4 +2776,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
      // Paper end - API to check if the server is sleeping

folia-server/build.gradle.kts.patch

@@ -20,7 +20,7 @@
 +
 +
      updatingMinecraft {
-         // oldPaperCommit = "7e80cef5198561d0db53406127e5b8bc7af51577"
+         // oldPaperCommit = "d4fe85375af18bfa88f44d7c1e6a61904ae550cc"
      }
 @@ -86,7 +_,19 @@
      }
@@ -49,7 +49,7 @@
  dependencies {
 -    implementation(project(":paper-api"))
 +    implementation(project(":folia-api"))
-     implementation("ca.spottedleaf:concurrentutil:0.0.10")
+     implementation("ca.spottedleaf:leafpile:1.0.0")
      implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
      implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
 @@ -171,14 +_,14 @@

folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Max pending logins
 Should help the floodgates on launch
 
 diff --git a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 282fae3104687119cb9e9502bcb3d211950e4571..d924369285878ff73811b8186cdb16e76f5dda90 100644
+index c96c38d3fe7c48a4c9e02bfe7daef006cb4eeafa..f2329d1a9d9d4bf4c9d771e25e54f2f9ef65a76c 100644
 --- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -98,7 +98,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -19,10 +19,10 @@ index 282fae3104687119cb9e9502bcb3d211950e4571..d924369285878ff73811b8186cdb16e7
 
          if (this.state == ServerLoginPacketListenerImpl.State.WAITING_FOR_DUPE_DISCONNECT
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 7de3f5694185ae26439a8262224a9e600475e7bb..36dc653df87c501c6d1d65769c5be264beee58d2 100644
+index 70e1b8b84b90a5ae3d3cf3549dffa87cc4b442ac..abded55cb8b695eb33a1894284a63887547c7a75 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -150,6 +150,17 @@ public abstract class PlayerList {
+@@ -149,6 +149,17 @@ public abstract class PlayerList {
              conflictingId = this.connectionById.get(byId);
 
              if (conflictingName == null && conflictingId == null) {

folia-server/minecraft-patches/features/0002-Max-pending-logins.patch

@@ -58,10 +58,10 @@ index 96ccb8f657d755b2e58a8dd0cda00ca0df4886b2..fd48134ab73d3096bc86402b4eb393c8
                  chunk = wrappedFull.getWrapped();
              } else {
 diff --git a/io/papermc/paper/threadedregions/commands/CommandServerHealth.java b/io/papermc/paper/threadedregions/commands/CommandServerHealth.java
-index a80983c10fe39db500512b88442b9b3c30d03b12..7826c50b7c7c59e148905337ddc0dc8085f3f7c1 100644
+index d362c9b19a82b8e87bb52497729a9ff134574b1c..aa860cfe9de616f185163fe74e0f4f49bd13a805 100644
 --- a/io/papermc/paper/threadedregions/commands/CommandServerHealth.java
 +++ b/io/papermc/paper/threadedregions/commands/CommandServerHealth.java
-@@ -169,6 +169,9 @@ public final class CommandServerHealth extends Command {
+@@ -170,6 +170,9 @@ public final class CommandServerHealth extends Command {
              totalUtil += (report == null ? 0.0 : report.utilisation());
          }
 
@@ -71,7 +71,7 @@ index a80983c10fe39db500512b88442b9b3c30d03b12..7826c50b7c7c59e148905337ddc0dc80
          totalUtil += globalTickReport.utilisation();
 
          tpsByRegion.sort(null);
-@@ -283,6 +286,12 @@ public final class CommandServerHealth extends Command {
+@@ -284,6 +287,12 @@ public final class CommandServerHealth extends Command {
                  .append(Component.text(ONE_DECIMAL_PLACES.get().format(maxThreadCount * 100.0), INFORMATION))
                  .append(Component.text("%\n", PRIMARY))
 

folia-server/minecraft-patches/features/0003-Add-chunk-system-throughput-counters-to-tps.patch

@@ -9,10 +9,10 @@ add explicit block update suppression techniques, it's better
 than the server crashing.
 
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index ff2622f007cf61028447523bbec0ec6076609923..d90edfdd7a7c0c1b31254fe1de19a91a66513d11 100644
+index faec81c45af77876ebdb33eb8395c2a33115c415..a8401a953a955a69f39fa13e9678d177796889f0 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
-@@ -2110,7 +2110,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -2118,7 +2118,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
      public void updateNeighbourForOutputSignal(final BlockPos pos, final Block changedBlock) {
          for (Direction direction : Direction.Plane.HORIZONTAL) {
              BlockPos relativePos = pos.relative(direction);
@@ -22,7 +22,7 @@ index ff2622f007cf61028447523bbec0ec6076609923..d90edfdd7a7c0c1b31254fe1de19a91a
                  if (state.is(Blocks.COMPARATOR)) {
                      this.neighborChanged(state, relativePos, changedBlock, null, false);
 diff --git a/net/minecraft/world/level/block/DetectorRailBlock.java b/net/minecraft/world/level/block/DetectorRailBlock.java
-index 5f09b65c6986579047662436d3ec4251338f55b3..ed718d3046e11c0652f0a5bb543bba4006e003c5 100644
+index 0caf401ef2e4f8646e429a476993ba06ee405445..816d9c71c26b5f08435bc4fdefe92af6592d5eb4 100644
 --- a/net/minecraft/world/level/block/DetectorRailBlock.java
 +++ b/net/minecraft/world/level/block/DetectorRailBlock.java
 @@ -134,8 +134,8 @@ public class DetectorRailBlock extends BaseRailBlock {
@@ -37,7 +37,7 @@ index 5f09b65c6986579047662436d3ec4251338f55b3..ed718d3046e11c0652f0a5bb543bba40
      }
 
 diff --git a/net/minecraft/world/level/block/PoweredRailBlock.java b/net/minecraft/world/level/block/PoweredRailBlock.java
-index a03cc9176f98b30054701e03b51b8c054a6a0e3a..8571a2d238281f6791fe4bcaf9b5722c6c0cb01d 100644
+index 03c878a4f539e290dda30adcf5a375199be6e676..36f10c676db121dc1f9cebe85eadfd920d26de7d 100644
 --- a/net/minecraft/world/level/block/PoweredRailBlock.java
 +++ b/net/minecraft/world/level/block/PoweredRailBlock.java
 @@ -102,8 +102,8 @@ public class PoweredRailBlock extends BaseRailBlock {
@@ -49,10 +49,10 @@ index a03cc9176f98b30054701e03b51b8c054a6a0e3a..8571a2d238281f6791fe4bcaf9b5722c
 +        BlockState state = !ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(level, pos, 25) ? null : level.getBlockStateIfLoaded(pos);
 +        if (state == null || !state.is(this)) { // Folia - block updates in unloaded chunks
              return false;
-         } else {
-             RailShape myShape = state.getValue(SHAPE);
+         }
+ 
 diff --git a/net/minecraft/world/level/block/RedStoneWireBlock.java b/net/minecraft/world/level/block/RedStoneWireBlock.java
-index 4f6205c6d75f195cafb756adbcaee683c7d6761b..759eb347299813c20226cc2fc5dc7718d12b7f56 100644
+index ba408de343d6fe8a2d88a6e4a644d102a16a298e..957c45b39e9d6f74fb9791ecd121b0e2bd6bc732 100644
 --- a/net/minecraft/world/level/block/RedStoneWireBlock.java
 +++ b/net/minecraft/world/level/block/RedStoneWireBlock.java
 @@ -215,8 +215,9 @@ public class RedStoneWireBlock extends Block {
@@ -67,7 +67,7 @@ index 4f6205c6d75f195cafb756adbcaee683c7d6761b..759eb347299813c20226cc2fc5dc7718
                  BlockState blockStateDown = level.getBlockState(blockPos);
                  if (blockStateDown.is(this)) {
 diff --git a/net/minecraft/world/level/block/TripWireBlock.java b/net/minecraft/world/level/block/TripWireBlock.java
-index 83823edc4a943e006e3237ecb9198a571a681873..04e5995409a3532947dfab1c8ef05bd546a6f66d 100644
+index 49510dc0ef82621953be8e485708872bd8b2b88b..e19a82ebb7b3be71e51ac28914de58fab32a708e 100644
 --- a/net/minecraft/world/level/block/TripWireBlock.java
 +++ b/net/minecraft/world/level/block/TripWireBlock.java
 @@ -131,6 +131,7 @@ public class TripWireBlock extends Block {
@@ -79,7 +79,7 @@ index 83823edc4a943e006e3237ecb9198a571a681873..04e5995409a3532947dfab1c8ef05bd5
                  if (block.is(this.hook)) {
                      if (block.getValue(TripWireHookBlock.FACING) == direction.getOpposite()) {
 diff --git a/net/minecraft/world/level/block/TripWireHookBlock.java b/net/minecraft/world/level/block/TripWireHookBlock.java
-index 31f8b7225ae5804ed66e7b17862ee56ac6ae5237..82713a22a7c9c54c64616cbd96aac9dfb10cf4e3 100644
+index 9d08ce61f964bb3115c708091549a233dabcf0e3..8bcc8b6f83ab4d5a472741185511b5d84f4974be 100644
 --- a/net/minecraft/world/level/block/TripWireHookBlock.java
 +++ b/net/minecraft/world/level/block/TripWireHookBlock.java
 @@ -128,6 +128,7 @@ public class TripWireHookBlock extends Block {
@@ -91,10 +91,10 @@ index 31f8b7225ae5804ed66e7b17862ee56ac6ae5237..82713a22a7c9c54c64616cbd96aac9df
                  if (wireState.is(Blocks.TRIPWIRE_HOOK)) {
                      if (wireState.getValue(FACING) == direction.getOpposite()) {
 diff --git a/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java b/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
-index 3d8c7590740495fbdf8686bcae7c0e57ed92bcea..d805f0d1e8d25069c986b973eed557cabbd4b037 100644
+index 4c3336fde3a82b8d41b47ade89e80add295940b2..16a0a789b930ec4fb92a03bc8f25e98053f0773a 100644
 --- a/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
 +++ b/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
-@@ -147,7 +147,8 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
+@@ -149,7 +149,8 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
          public boolean runNext(final Level level) {
              Direction direction = NeighborUpdater.UPDATE_ORDER[this.idx++];
              BlockPos neighborPos = this.sourcePos.relative(direction);
@@ -104,15 +104,15 @@ index 3d8c7590740495fbdf8686bcae7c0e57ed92bcea..d805f0d1e8d25069c986b973eed557ca
              Orientation orientation = null;
              if (level.enabledFeatures().contains(FeatureFlags.REDSTONE_EXPERIMENTS)) {
                  if (this.orientation == null) {
-@@ -160,6 +161,7 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
+@@ -162,6 +163,7 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
              }
 
              NeighborUpdater.executeUpdate(level, state, neighborPos, this.sourceBlock, orientation, false, this.sourcePos); // Paper - Add source block to BlockPhysicsEvent
 +            } // Folia - block updates in unloaded chunks
              if (this.idx < NeighborUpdater.UPDATE_ORDER.length && NeighborUpdater.UPDATE_ORDER[this.idx] == this.skipDirection) {
                  this.idx++;
              }
-@@ -189,7 +191,9 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
+@@ -191,7 +193,9 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
      ) implements CollectingNeighborUpdater.NeighborUpdates {
          @Override
          public boolean runNext(final Level level) {
@@ -122,8 +122,8 @@ index 3d8c7590740495fbdf8686bcae7c0e57ed92bcea..d805f0d1e8d25069c986b973eed557ca
              return false;
          }
 
-@@ -202,8 +206,8 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
-     record SimpleNeighborUpdate(BlockPos pos, Block block, @Nullable Orientation orientation) implements CollectingNeighborUpdater.NeighborUpdates {
+@@ -204,8 +208,8 @@ public class CollectingNeighborUpdater implements NeighborUpdater {
+     private record SimpleNeighborUpdate(BlockPos pos, Block block, @Nullable Orientation orientation) implements CollectingNeighborUpdater.NeighborUpdates {
          @Override
          public boolean runNext(final Level level) {
 -            BlockState state = level.getBlockState(this.pos);

folia-server/minecraft-patches/features/0004-Prevent-block-updates-in-non-loaded-or-non-owned-chu.patch

@@ -7,7 +7,7 @@ The returned TE may be in the world, in which case it is unsafe
 for the current thread to modify or access its contents.
 
 diff --git a/net/minecraft/world/level/chunk/ImposterProtoChunk.java b/net/minecraft/world/level/chunk/ImposterProtoChunk.java
-index 94652b00e18ffcbe02f1ad0578d671e2a1d1d16a..ebfc72d730687945639e131a8e8fe02a965280a2 100644
+index 754c3bb648558d96f9eed990a41480e4366bd72f..3e6fbef8466c02ca93b6eaa39481effbe87a2910 100644
 --- a/net/minecraft/world/level/chunk/ImposterProtoChunk.java
 +++ b/net/minecraft/world/level/chunk/ImposterProtoChunk.java
 @@ -83,6 +83,11 @@ public class ImposterProtoChunk extends ProtoChunk implements ca.spottedleaf.moo

folia-server/minecraft-patches/features/0005-Block-reading-in-world-tile-entities-on-worldgen-thr.patch

@@ -7,10 +7,10 @@ This allows the player to be re-positioned before logging into
 the world without causing thread checks to trip on Folia.
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 45921b0c22dc35facd608b1c7644e5b9a03a97ec..5d4310dab55cc960ccfce279e656e7b740f3d5c0 100644
+index a17b622d15221e3936252f52868a855958bf2beb..fbe0ef19bfabfc42d9e0e08e17b08159321b3804 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -739,8 +739,18 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -729,8 +729,18 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          Optional<ValueInput> rootTag = playerInput.child("RootVehicle");
          if (!rootTag.isEmpty()) {
              ServerLevel serverLevel = this.level();