Update to 26.3-pre-2

Author: lynxplay

gradle.properties

@@ -1,5 +1,5 @@
 group=io.papermc.paper
-mcVersion=26.3-pre-1
+mcVersion=26.3-pre-2
 # This is the current API version for use in (paper-)plugin.yml files
 # During snapshot cycles this should be the anticipated version of the release target
 apiVersion=26.3

paper-server/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
 
 dependencies {
-    mache("io.papermc:mache:26.3-pre-1+build.1")
+    mache("io.papermc:mache:26.3-pre-2+build.2")
     paperclip("io.papermc:paperclip:3.0.4")
 }
 

paper-server/patches/sources/net/minecraft/core/registries/BuiltInRegistries.java.patch

@@ -1,7 +1,7 @@
 --- a/net/minecraft/core/registries/BuiltInRegistries.java
 +++ b/net/minecraft/core/registries/BuiltInRegistries.java
-@@ -372,6 +_,11 @@
-     public static final Registry<MapCodec<? extends SlotSource>> SLOT_SOURCE_TYPE = registerSimple(Registries.SLOT_SOURCE_TYPE, SlotSources::bootstrap);
+@@ -367,6 +_,11 @@
+     public static final Registry<ContextKeySet> CONTEXT_KEY_SET = registerSimple(Registries.CONTEXT_KEY_SET, LootContextParamSets::bootstrap);
      public static final Registry<Consumer<GameTestHelper>> TEST_FUNCTION = registerSimple(Registries.TEST_FUNCTION, BuiltinTestFunctions::bootstrap);
      public static final Registry<? extends Registry<?>> REGISTRY = WRITABLE_REGISTRY;
 +    // Paper start - add built-in registry conversions
@@ -12,15 +12,15 @@
 
      private static <T> Registry<T> registerSimple(final ResourceKey<? extends Registry<T>> name, final BuiltInRegistries.RegistryBootstrap<T> loader) {
          return internalRegister(name, new MappedRegistry<>(name, Lifecycle.stable(), false), loader);
-@@ -399,6 +_,7 @@
+@@ -394,6 +_,7 @@
          final ResourceKey<? extends Registry<T>> name, final R registry, final BuiltInRegistries.RegistryBootstrap<T> loader
      ) {
          Bootstrap.checkBootstrapCalled(() -> "registry " + name.identifier());
 +        io.papermc.paper.registry.PaperRegistryAccess.instance().registerRegistry(registry); // Paper - initialize API registry
          Identifier key = name.identifier();
          LOADERS.put(key, () -> loader.run(registry));
          WRITABLE_REGISTRY.register((ResourceKey)name, registry, RegistrationInfo.BUILT_IN);
-@@ -406,16 +_,34 @@
+@@ -401,16 +_,34 @@
      }
 
      public static void bootStrap() {
@@ -55,7 +55,7 @@
          });
      }
 
-@@ -424,6 +_,7 @@
+@@ -419,6 +_,7 @@
 
          for (Registry<?> registry : REGISTRY) {
              bindBootstrappedTagsToEmpty(registry);

paper-server/patches/sources/net/minecraft/server/Bootstrap.java.patch

@@ -1,20 +1,21 @@
 --- a/net/minecraft/server/Bootstrap.java
 +++ b/net/minecraft/server/Bootstrap.java
-@@ -43,6 +_,7 @@
+@@ -44,6 +_,7 @@
          if (!isBootstrapped) {
              isBootstrapped = true;
              Instant start = Instant.now();
 +            io.papermc.paper.plugin.entrypoint.LaunchEntryPointHandler.enterBootstrappers(); // Paper - Entrypoint for bootstrapping
              if (BuiltInRegistries.REGISTRY.keySet().isEmpty()) {
                  throw new IllegalStateException("Unable to load registries");
              }
-@@ -55,10 +_,80 @@
+@@ -56,11 +_,81 @@
              EntitySelectorOptions.bootStrap();
              DispenseItemBehavior.bootStrap();
              CauldronInteractions.bootStrap();
 -            BuiltInRegistries.bootStrap();
 +            BuiltInRegistries.bootStrap(io.papermc.paper.world.worldgen.OptionallyFlatBedrockCondition::bootstrap); // Paper - Flat bedrock generator settings
              CreativeModeTabs.validate();
+             LootContextParamSets.validate();
              wrapStreams();
              bootstrapDuration.set(Duration.between(start, Instant.now()).toMillis());
 +            // CraftBukkit start

paper-server/patches/sources/net/minecraft/server/level/ServerChunkCache.java.patch

@@ -1,14 +1,14 @@
 --- a/net/minecraft/server/level/ServerChunkCache.java
 +++ b/net/minecraft/server/level/ServerChunkCache.java
-@@ -66,6 +_,7 @@
+@@ -65,6 +_,7 @@
+     private final SavedDataStorage savedDataStorage;
      private final TicketStorage ticketStorage;
-     private long lastInhabitedUpdate;
      public boolean spawnEnemies = true;
 +    public boolean spawnFriendlies = true; // Paper - add back spawnFriendlies field
      private static final int CACHE_SIZE = 4;
      private final long[] lastChunkPos = new long[4];
      private final @Nullable ChunkStatus[] lastChunkStatus = new ChunkStatus[4];
-@@ -74,6 +_,13 @@
+@@ -73,6 +_,13 @@
      private final Set<ChunkHolder> chunkHoldersToBroadcast = new ReferenceOpenHashSet<>();
      @VisibleForDebug
      private NaturalSpawner.@Nullable SpawnState lastSpawnState;
@@ -22,15 +22,15 @@
 
      public ServerChunkCache(
          final ServerLevel level,
-@@ -86,6 +_,7 @@
+@@ -85,6 +_,7 @@
          final int simulationDistance,
          final boolean syncWrites,
          final ChunkStatusUpdateListener chunkStatusListener
 +        , final SavedDataStorage savedDataStorage // Paper - initialize SavedDataStorage earlier
      ) {
          this.level = level;
          this.mainThreadProcessor = new ServerChunkCache.MainThreadExecutor(level);
-@@ -98,7 +_,7 @@
+@@ -97,7 +_,7 @@
              LOGGER.error("Failed to create dimension data storage directory", e);
          }
 
@@ -39,7 +39,7 @@
          this.ticketStorage = this.savedDataStorage.computeIfAbsent(TicketStorage.TYPE);
          this.chunkMap = new ChunkMap(
              level,
-@@ -120,6 +_,64 @@
+@@ -119,6 +_,64 @@
          this.clearCache();
      }
 
@@ -104,7 +104,7 @@
      @Override
      public ThreadedLevelLightEngine getLightEngine() {
          return this.lightEngine;
-@@ -154,7 +_,7 @@
+@@ -153,7 +_,7 @@
          for (int i = 0; i < 4; i++) {
              if (pos == this.lastChunkPos[i] && targetStatus == this.lastChunkStatus[i]) {
                  ChunkAccess chunkAccess = this.lastChunk[i];
@@ -113,7 +113,7 @@
                      return chunkAccess;
                  }
              }
-@@ -233,7 +_,15 @@
+@@ -232,7 +_,15 @@
          long key = pos.pack();
          int targetTicketLevel = ChunkLevel.byStatus(targetStatus);
          ChunkHolder chunkHolder = this.getVisibleChunkIfPresent(key);
@@ -130,7 +130,7 @@
              this.addTicket(new Ticket(TicketType.UNKNOWN, targetTicketLevel), pos);
              if (this.chunkAbsent(chunkHolder, targetTicketLevel)) {
                  ProfilerFiller profiler = Profiler.get();
-@@ -253,7 +_,7 @@
+@@ -252,7 +_,7 @@
      }
 
      private boolean chunkAbsent(final @Nullable ChunkHolder chunkHolder, final int targetTicketLevel) {
@@ -139,7 +139,7 @@
      }
 
      @Override
-@@ -307,17 +_,39 @@
+@@ -306,17 +_,39 @@
 
      @Override
      public void close() throws IOException {
@@ -181,16 +181,16 @@
              this.ticketStorage.purgeStaleTickets(this.chunkMap);
          }
 
-@@ -341,7 +_,7 @@
+@@ -337,7 +_,7 @@
          if (!this.level.isDebug()) {
              ProfilerFiller profiler = Profiler.get();
              profiler.push("pollingChunks");
 -            if (this.level.tickRateManager().runsNormally()) {
 +            if (this.level.tickRateManager().runsNormally() && this.level.paperConfig().unsupportedSettings.ticking.chunks) { // Paper - option to disable ticking
                  profiler.push("tickingChunks");
-                 this.tickChunks(profiler, timeDiff);
+                 this.tickChunks(profiler);
                  profiler.pop();
-@@ -371,12 +_,20 @@
+@@ -367,12 +_,20 @@
          int chunkCount = this.distanceManager.getNaturalSpawnChunkCount();
          NaturalSpawner.SpawnState spawnCookie = NaturalSpawner.createState(chunkCount, this.level, this::getFullChunk, new LocalMobCapCalculator(this.chunkMap));
          this.lastSpawnState = spawnCookie;
@@ -215,7 +215,7 @@
          } else {
              spawningCategories = List.of();
          }
-@@ -563,7 +_,13 @@
+@@ -557,7 +_,13 @@
 
      @Override
      public void setSpawnSettings(final boolean spawnEnemies) {
@@ -229,7 +229,7 @@
      }
 
      public String getChunkDebugData(final ChunkPos pos) {
-@@ -630,12 +_,18 @@
+@@ -624,12 +_,18 @@
 
          @Override
          protected boolean pollTask() {