Rebase fixups

Oops

Author: Spottedleaf

paper-server/patches/features/0001-Moonrise-optimisation-patches.patch

@@ -6725,10 +6725,10 @@ index 0000000000000000000000000000000000000000..7eafc5b7cba23d8dec92ecc1050afe3f
 \ No newline at end of file
 diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java b/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..80f13315e8c7c0e3c82ab98f92387f56bb3b6481
+index 0000000000000000000000000000000000000000..e03faa94df6c77ab4f3f5d9ffe107220387a0dde
 --- /dev/null
 +++ b/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java
-@@ -0,0 +1,1555 @@
+@@ -0,0 +1,1560 @@
 +package ca.spottedleaf.moonrise.patches.chunk_system.scheduling;
 +
 +import ca.spottedleaf.concurrentutil.collection.MultiThreadedQueue;
@@ -8203,6 +8203,11 @@ index 0000000000000000000000000000000000000000..80f13315e8c7c0e3c82ab98f92387f56
 +
 +        boolean ret = false;
 +
++        if (pendingFullLoadUpdate.isEmpty()) {
++            // avoid allocating changedFullStatus
++            return ret;
++        }
++
 +        final List<NewChunkHolder> changedFullStatus = new ArrayList<>();
 +
 +        NewChunkHolder holder;
@@ -8286,10 +8291,10 @@ index 0000000000000000000000000000000000000000..80f13315e8c7c0e3c82ab98f92387f56
 +}
 diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkTaskScheduler.java b/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkTaskScheduler.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..57f11ed1c8dfe7a10fddc53bcd2abc8cac29b2f4
+index 0000000000000000000000000000000000000000..c47e77ceb15948cbd4a2a370738843c02542f6c1
 --- /dev/null
 +++ b/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkTaskScheduler.java
-@@ -0,0 +1,1044 @@
+@@ -0,0 +1,1055 @@
 +package ca.spottedleaf.moonrise.patches.chunk_system.scheduling;
 +
 +import ca.spottedleaf.concurrentutil.executor.PrioritisedExecutor;
@@ -8630,6 +8635,17 @@ index 0000000000000000000000000000000000000000..57f11ed1c8dfe7a10fddc53bcd2abc8c
 +        return this.mainThreadExecutor.executeTask();
 +    }
 +
++    // run only tasks queued before this function was invoked
++    public void executeAllRecentlyQueuedMainThreadTasks() {
++        // note: order of retrieval is important to avoid race conditions
++        final long executed = this.mainThreadExecutor.getTotalTasksExecuted();
++        final long scheduled = this.mainThreadExecutor.getTotalTasksScheduled();
++
++        final long left = scheduled - executed;
++        // may execute more tasks than expected due to recursion
++        for (long i = 0; i < left && this.mainThreadExecutor.executeTask(); ++i);
++    }
++
 +    public void raisePriority(final int x, final int z, final Priority priority) {
 +        this.chunkHolderManager.raisePriority(x, z, priority);
 +    }
@@ -23005,7 +23021,7 @@ index e7510be12644b2edd966c538c84379a3d5fe89b5..8d299a75c80fddc61a2aa4dc5b0dc594
                  thread1 -> {
                      DedicatedServer dedicatedServer1 = new DedicatedServer(
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 843229c35e5c198f335d47d520e6391c4569237f..a38d52b5b3c16b054332d38c44dfe28f91206284 100644
+index 93668e31b976cad13d002042a9630ef6e70811e4..638990d0d89aa85285675d05e2a74aed6ceaf2f0 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -177,7 +177,7 @@ import net.minecraft.world.phys.Vec2;
@@ -23017,7 +23033,7 @@ index 843229c35e5c198f335d47d520e6391c4569237f..a38d52b5b3c16b054332d38c44dfe28f
      private static MinecraftServer SERVER; // Paper
      public static final Logger LOGGER = LogUtils.getLogger();
      public static final net.kyori.adventure.text.logger.slf4j.ComponentLogger COMPONENT_LOGGER = net.kyori.adventure.text.logger.slf4j.ComponentLogger.logger(LOGGER.getName()); // Paper
-@@ -326,6 +326,77 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -362,6 +362,77 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return minecraftServer;
      }
 
@@ -23095,7 +23111,7 @@ index 843229c35e5c198f335d47d520e6391c4569237f..a38d52b5b3c16b054332d38c44dfe28f
      public MinecraftServer(
          // CraftBukkit start
          joptsimple.OptionSet options,
-@@ -756,7 +827,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -792,7 +863,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          serverLevel.setSpawnSettings(serverLevel.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && serverLevel.getGameRules().getBoolean(GameRules.RULE_SPAWN_MONSTERS)); // Paper - per level difficulty (from setDifficulty(ServerLevel, Difficulty, boolean))
          this.updateEffectiveRespawnData();
          this.forceTicks = false; // CraftBukkit
@@ -23104,7 +23120,7 @@ index 843229c35e5c198f335d47d520e6391c4569237f..a38d52b5b3c16b054332d38c44dfe28f
          new org.bukkit.event.world.WorldLoadEvent(serverLevel.getWorld()).callEvent(); // Paper - call WorldLoadEvent
      }
 
-@@ -779,6 +850,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -815,6 +886,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public abstract boolean shouldRconBroadcast();
 
      public boolean saveAllChunks(boolean suppressLogs, boolean flush, boolean force) {
@@ -23116,7 +23132,7 @@ index 843229c35e5c198f335d47d520e6391c4569237f..a38d52b5b3c16b054332d38c44dfe28f
          boolean flag = false;
 
          for (ServerLevel serverLevel : this.getAllLevels()) {
-@@ -786,7 +862,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -822,7 +898,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  LOGGER.info("Saving chunks for level '{}'/{}", serverLevel, serverLevel.dimension().location());
              }
 
@@ -23125,7 +23141,7 @@ index 843229c35e5c198f335d47d520e6391c4569237f..a38d52b5b3c16b054332d38c44dfe28f
              flag = true;
          }
 
-@@ -876,7 +952,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -912,7 +988,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
          }
 
@@ -23134,7 +23150,7 @@ index 843229c35e5c198f335d47d520e6391c4569237f..a38d52b5b3c16b054332d38c44dfe28f
              this.nextTickTimeNanos = Util.getNanos() + TimeUtil.NANOSECONDS_PER_MILLISECOND;
 
              for (ServerLevel serverLevelx : this.getAllLevels()) {
-@@ -886,18 +962,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -922,18 +998,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
              this.waitUntilNextTick();
          }
@@ -23160,7 +23176,7 @@ index 843229c35e5c198f335d47d520e6391c4569237f..a38d52b5b3c16b054332d38c44dfe28f
 
          this.isSaving = false;
          this.resources.close();
-@@ -917,6 +989,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -953,6 +1025,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.services().nameToIdCache().save(false); // Paper - Perf: Async GameProfileCache saving
          }
          // Spigot end
@@ -23175,9 +23191,44 @@ index 843229c35e5c198f335d47d520e6391c4569237f..a38d52b5b3c16b054332d38c44dfe28f
          // Paper start - Improved watchdog support - move final shutdown items here
          Util.shutdownExecutors();
          try {
-@@ -1102,6 +1182,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                     profilerFiller.push("tick");
+@@ -1045,16 +1125,31 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             // execute small amounts of other tasks just in case the number of tasks we are
+             // draining is large - chunk system and packet processing may be latency sensitive
+ 
+-            // TODO - Chunk System mid-tick
++            ((ca.spottedleaf.moonrise.patches.chunk_system.server.ChunkSystemMinecraftServer)this).moonrise$executeMidTickTasks(); // Paper - rewrite chunk system
+             this.packetProcessor.executeSinglePacket();
+         }
+         profiler.popPush("moonrise:run_all_packets");
+         while (this.packetProcessor.executeSinglePacket()) {
+             // execute possibly latency sensitive chunk system tasks (see above)
+-            // TODO - Chunk System mid-tick
++            ((ca.spottedleaf.moonrise.patches.chunk_system.server.ChunkSystemMinecraftServer)this).moonrise$executeMidTickTasks(); // Paper - rewrite chunk system
+         }
+         profiler.popPush("moonrise:run_all_chunk");
+-        // TODO - Chunk System tasks
++        // Paper start - rewrite chunk system
++        for (final ServerLevel world : this.getAllLevels()) {
++            profiler.push(world.toString() + " " + world.dimension().location()); // keep same formatting from regular tick, see tickChildren
++
++            // note: legacy tasks may expect a distance manager update
++            profiler.push("moonrise:distance_manager_update");
++            ((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel)world).moonrise$getChunkTaskScheduler().chunkHolderManager.processTicketUpdates();
++            profiler.popPush("moonrise:legacy_chunk_tasks");
++            world.getChunkSource().mainThreadProcessor.executeAllRecentInternalTasks();
++            profiler.popPush("moonrise:chunk_system_tasks");
++            ((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel)world).moonrise$getChunkTaskScheduler().executeAllRecentlyQueuedMainThreadTasks();
++            profiler.pop();
++
++            profiler.pop(); // world name
++        }
++        // Paper end - rewrite chunk system
+         profiler.pop(); // moonrise:run_all_chunk
+         profiler.pop(); // moonrise:run_all_tasks
+ 
+@@ -1196,6 +1291,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.tickFrame.start();
+                     this.runAllTasksAtTickStart(); // Paper - improve tick loop
                      this.tickServer(flag ? () -> false : this::haveTime);
 +                    // Paper start - rewrite chunk system
 +                    final Throwable crash = this.chunkSystemCrash;
@@ -23187,17 +23238,17 @@ index 843229c35e5c198f335d47d520e6391c4569237f..a38d52b5b3c16b054332d38c44dfe28f
 +                    }
 +                    // Paper end - rewrite chunk system
                      this.tickFrame.end();
+                     this.recordEndOfTick(); // Paper - improve tick loop
                      profilerFiller.popPush("nextTickWait");
-                     this.mayHaveDelayedTasks = true;
-@@ -1276,6 +1363,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1368,6 +1470,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      private boolean pollTaskInternal() {
          if (super.pollTask()) {
 +            this.moonrise$executeMidTickTasks(); // Paper - rewrite chunk system
              return true;
          } else {
              boolean ret = false; // Paper - force execution of all worlds, do not just bias the first
-@@ -2457,6 +2545,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2543,6 +2646,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
 

paper-server/patches/features/0002-Rewrite-dataconverter-system.patch

@@ -32907,11 +32907,11 @@ index 71b8bbeda2fecf930870a9b6e856e20639d31645..91650a92a21fcaac65a5dfcac0cc856b
          return structureTemplate.save(new CompoundTag());
      }
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index a38d52b5b3c16b054332d38c44dfe28f91206284..b00241f8ec8da9b009b2526725f4864f3a5c515d 100644
+index 638990d0d89aa85285675d05e2a74aed6ceaf2f0..cc0834ac0ecac9735c7bd399fc7f5b908437676e 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -312,6 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation
+@@ -348,6 +348,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     // Paper end - improve tick loop
 
      public static <S extends MinecraftServer> S spin(Function<Thread, S> threadFunction) {
 +        ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.init(); // Paper - rewrite data converter system

paper-server/patches/features/0021-Incremental-chunk-and-player-saving.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Incremental chunk and player saving
 
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 77aa4307fdbe9a52c4d35a7a74282f87a176da5e..853d4603249c19c31d4252fb0e411d5b41b851ad 100644
+index cc0834ac0ecac9735c7bd399fc7f5b908437676e..c3bb59a755e9c5cb4bb9b5c4f03475c6170a8c3a 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -886,7 +886,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -922,7 +922,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          boolean var4;
          try {
              this.isSaving = true;
@@ -17,7 +17,7 @@ index 77aa4307fdbe9a52c4d35a7a74282f87a176da5e..853d4603249c19c31d4252fb0e411d5b
              var4 = this.saveAllChunks(suppressLogs, flush, force);
          } finally {
              this.isSaving = false;
-@@ -1471,9 +1471,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1578,9 +1578,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
 
          this.ticksUntilAutosave--;
@@ -48,9 +48,9 @@ index 77aa4307fdbe9a52c4d35a7a74282f87a176da5e..853d4603249c19c31d4252fb0e411d5b
 +        // Paper end - Incremental chunk and player saving
 
          ProfilerFiller profilerFiller = Profiler.get();
-         this.runAllTasks(); // Paper - move runAllTasks() into full server tick (previously for timings)
+         this.server.spark.executeMainThreadTasks(); // Paper - spark
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 9aa154a7349ffb7b6af167fd84955168dbcd2bd9..5993a9530586e9792691e26d0a0a57febff5b447 100644
+index f609b9707b4265018b19dbc5a0191923035b7723..8891d2a8832a76ef4a0c62f43d0bbf9c68f05016 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -1371,6 +1371,26 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -81,7 +81,7 @@ index 9aa154a7349ffb7b6af167fd84955168dbcd2bd9..5993a9530586e9792691e26d0a0a57fe
          // Paper start - add close param
          this.save(progress, flush, skipSave, false);
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 0b41d4c924b77fe46089b2e5a0ebc92014a1f143..ff507ab2ec9391e899785fd42150fb4547eac83c 100644
+index be318510a571de3064b3b13187456049bbb52cdf..165e16cafc2787267ceaca637441a13e9bc1826a 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -203,6 +203,7 @@ import org.slf4j.Logger;

paper-server/patches/features/0026-Optimise-EntityScheduler-ticking.patch

@@ -20,10 +20,10 @@ index a2fbc13105673e926cbaed69221826ebd392140f..a42938e1abd371dba6806e65552fde71
 
      @Override
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 853d4603249c19c31d4252fb0e411d5b41b851ad..c4b2eac96d3ab118cfc6b66e789b8aaa4d2a70ec 100644
+index c3bb59a755e9c5cb4bb9b5c4f03475c6170a8c3a..fefc1d9392a6c02531a772ca4ff0aeda2abe27b2 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1591,33 +1591,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1692,33 +1692,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
 

paper-server/patches/features/0029-Optimize-Hoppers.patch

@@ -48,10 +48,10 @@ index 0000000000000000000000000000000000000000..24a2090e068ad3c0d08705050944abdf
 +    }
 +}
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index c4b2eac96d3ab118cfc6b66e789b8aaa4d2a70ec..f0e16de0cd2e5794c0a86b54979d9ac043c704df 100644
+index fefc1d9392a6c02531a772ca4ff0aeda2abe27b2..20efafc39eb219158c5dc126f527cc009fe15b15 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1646,6 +1646,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1747,6 +1747,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              serverLevel.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
              serverLevel.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
              serverLevel.updateLagCompensationTick(); // Paper - lag compensation