Rebase fixups

patches/server/Improve-and-expand-AsyncCatcher.patch

@@ -59,8 +59,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private boolean addEntity(T entity, boolean existing) {
 +        org.spigotmc.AsyncCatcher.catchOp("Entity add"); // Paper
          // Paper start - chunk system hooks
-         if (existing) {
          // I don't want to know why this is a generic type.
+         Entity entityCasted = (Entity)entity;
 @@ -0,0 +0,0 @@ public class PersistentEntitySectionManager<T extends EntityAccess> implements A
      }
  

patches/server/More-Teleport-API.patch

@@ -86,7 +86,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        java.util.concurrent.CompletableFuture<Boolean> ret = new java.util.concurrent.CompletableFuture<>();
 +
 +        world.loadChunksForMoveAsync(getHandle().getBoundingBoxAt(locationClone.getX(), locationClone.getY(), locationClone.getZ()),
-+            this instanceof CraftPlayer ? ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.HIGHER : ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.NORMAL, (list) -> {
++            this instanceof CraftPlayer ? ca.spottedleaf.concurrentutil.util.Priority.HIGHER : ca.spottedleaf.concurrentutil.util.Priority.NORMAL, (list) -> {
 +                net.minecraft.server.level.ServerChunkCache chunkProviderServer = world.getChunkSource();
 +                for (net.minecraft.world.level.chunk.ChunkAccess chunk : list) {
 +                    chunkProviderServer.addTicketAtLevel(net.minecraft.server.level.TicketType.POST_TELEPORT, chunk.getPos(), 33, CraftEntity.this.getEntityId());

patches/server/Optimize-BlockPosition-helper-methods.patch

@@ -19,7 +19,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public BlockPos above(int distance) {
 -        return this.relative(Direction.UP, distance);
-+        return distance == 0 ? this : new BlockPos(this.getX(), this.getY() + distance, this.getZ()); // Paper - Perf: Optimize BlockPosition
++        return distance == 0 ? this.immutable() : new BlockPos(this.getX(), this.getY() + distance, this.getZ()); // Paper - Perf: Optimize BlockPosition
      }
  
      @Override
@@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public BlockPos below(int i) {
 -        return this.relative(Direction.DOWN, i);
-+        return i == 0 ? this : new BlockPos(this.getX(), this.getY() - i, this.getZ()); // Paper - Perf: Optimize BlockPosition
++        return i == 0 ? this.immutable() : new BlockPos(this.getX(), this.getY() - i, this.getZ()); // Paper - Perf: Optimize BlockPosition
      }
  
      @Override
@@ -43,7 +43,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public BlockPos north(int distance) {
 -        return this.relative(Direction.NORTH, distance);
-+        return distance == 0 ? this : new BlockPos(this.getX(), this.getY(), this.getZ() - distance); // Paper - Perf: Optimize BlockPosition
++        return distance == 0 ? this.immutable() : new BlockPos(this.getX(), this.getY(), this.getZ() - distance); // Paper - Perf: Optimize BlockPosition
      }
  
      @Override
@@ -55,7 +55,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public BlockPos south(int distance) {
 -        return this.relative(Direction.SOUTH, distance);
-+        return distance == 0 ? this : new BlockPos(this.getX(), this.getY(), this.getZ() + distance); // Paper - Perf: Optimize BlockPosition
++        return distance == 0 ? this.immutable() : new BlockPos(this.getX(), this.getY(), this.getZ() + distance); // Paper - Perf: Optimize BlockPosition
      }
  
      @Override
@@ -67,7 +67,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public BlockPos west(int distance) {
 -        return this.relative(Direction.WEST, distance);
-+        return distance == 0 ? this : new BlockPos(this.getX() - distance, this.getY(), this.getZ()); // Paper - Perf: Optimize BlockPosition
++        return distance == 0 ? this.immutable() : new BlockPos(this.getX() - distance, this.getY(), this.getZ()); // Paper - Perf: Optimize BlockPosition
      }
  
      @Override
@@ -79,7 +79,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public BlockPos east(int distance) {
 -        return this.relative(Direction.EAST, distance);
-+        return distance == 0 ? this : new BlockPos(this.getX() + distance, this.getY(), this.getZ()); // Paper - Perf: Optimize BlockPosition
++        return distance == 0 ? this.immutable() : new BlockPos(this.getX() + distance, this.getY(), this.getZ()); // Paper - Perf: Optimize BlockPosition
      }
  
      @Override

patches/server/Paper-config-files.patch

@@ -523,6 +523,45 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public static GlobalConfiguration get() {
 +        return instance;
 +    }
++
++    public ChunkLoadingBasic chunkLoadingBasic;
++
++    public class ChunkLoadingBasic extends ConfigurationPart {
++        @Comment("The maximum rate in chunks per second that the server will send to any individual player. Set to -1 to disable this limit.")
++        public double playerMaxChunkSendRate = 75.0;
++
++        @Comment(
++            "The maximum rate at which chunks will load for any individual player. " +
++            "Note that this setting also affects chunk generations, since a chunk load is always first issued to test if a" +
++            "chunk is already generated. Set to -1 to disable this limit."
++        )
++        public double playerMaxChunkLoadRate = 100.0;
++
++        @Comment("The maximum rate at which chunks will generate for any individual player. Set to -1 to disable this limit.")
++        public double playerMaxChunkGenerateRate = -1.0;
++    }
++
++    public ChunkLoadingAdvanced chunkLoadingAdvanced;
++
++    public class ChunkLoadingAdvanced extends ConfigurationPart {
++        @Comment(
++            "Set to true if the server will match the chunk send radius that clients have configured" +
++            "in their view distance settings if the client is less-than the server's send distance."
++        )
++        public boolean autoConfigSendDistance = true;
++
++        @Comment(
++            "Specifies the maximum amount of concurrent chunk loads that an individual player can have." +
++            "Set to 0 to let the server configure it automatically per player, or set it to -1 to disable the limit."
++        )
++        public int playerMaxConcurrentChunkLoads = 0;
++
++        @Comment(
++            "Specifies the maximum amount of concurrent chunk generations that an individual player can have." +
++            "Set to 0 to let the server configure it automatically per player, or set it to -1 to disable the limit."
++        )
++        public int playerMaxConcurrentChunkGenerates = 0;
++    }
 +    static void set(GlobalConfiguration instance) {
 +        GlobalConfiguration.instance = instance;
 +    }
@@ -638,21 +677,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        public int incomingPacketThreshold = 300;
 +    }
 +
-+    public ChunkLoading chunkLoading;
-+
-+    public class ChunkLoading extends ConfigurationPart {
-+        public int minLoadRadius = 2;
-+        public int maxConcurrentSends = 2;
-+        public boolean autoconfigSendDistance = true;
-+        public double targetPlayerChunkSendRate = 100.0;
-+        public double globalMaxChunkSendRate = -1.0;
-+        public boolean enableFrustumPriority = false;
-+        public double globalMaxChunkLoadRate = -1.0;
-+        public double playerMaxConcurrentLoads = 20.0;
-+        public double globalMaxConcurrentLoads = 500.0;
-+        public double playerMaxChunkLoadRate = -1.0;
-+    }
-+
 +    public UnsupportedSettings unsupportedSettings;
 +
 +    public class UnsupportedSettings extends ConfigurationPart {
@@ -711,7 +735,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +        @PostProcess
 +        private void postProcess() {
-+            //io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.init(this);
++
 +        }
 +    }
 +

patches/server/fixup-More-Teleport-API.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Thu, 24 Oct 2024 11:13:42 -0700
-Subject: [PATCH] fixup! More Teleport API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-         java.util.concurrent.CompletableFuture<Boolean> ret = new java.util.concurrent.CompletableFuture<>();
- 
-         world.loadChunksForMoveAsync(getHandle().getBoundingBoxAt(locationClone.getX(), locationClone.getY(), locationClone.getZ()),
--            this instanceof CraftPlayer ? ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.HIGHER : ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.NORMAL, (list) -> {
-+            this instanceof CraftPlayer ? ca.spottedleaf.concurrentutil.util.Priority.HIGHER : ca.spottedleaf.concurrentutil.util.Priority.NORMAL, (list) -> {
-                 net.minecraft.server.level.ServerChunkCache chunkProviderServer = world.getChunkSource();
-                 for (net.minecraft.world.level.chunk.ChunkAccess chunk : list) {
-                     chunkProviderServer.addTicketAtLevel(net.minecraft.server.level.TicketType.POST_TELEPORT, chunk.getPos(), 33, CraftEntity.this.getEntityId());

patches/server/fixup-Optimize-BlockPosition-helper-methods.patch

@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Mon, 21 Oct 2024 19:13:43 -0700
-Subject: [PATCH] fixup! Optimize BlockPosition helper methods
-
-
-diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/core/BlockPos.java
-+++ b/src/main/java/net/minecraft/core/BlockPos.java
-@@ -0,0 +0,0 @@ public class BlockPos extends Vec3i {
- 
-     @Override
-     public BlockPos above(int distance) {
--        return distance == 0 ? this : new BlockPos(this.getX(), this.getY() + distance, this.getZ()); // Paper - Perf: Optimize BlockPosition
-+        return distance == 0 ? this.immutable() : new BlockPos(this.getX(), this.getY() + distance, this.getZ()); // Paper - Perf: Optimize BlockPosition
-     }
- 
-     @Override
-@@ -0,0 +0,0 @@ public class BlockPos extends Vec3i {
- 
-     @Override
-     public BlockPos below(int i) {
--        return i == 0 ? this : new BlockPos(this.getX(), this.getY() - i, this.getZ()); // Paper - Perf: Optimize BlockPosition
-+        return i == 0 ? this.immutable() : new BlockPos(this.getX(), this.getY() - i, this.getZ()); // Paper - Perf: Optimize BlockPosition
-     }
- 
-     @Override
-@@ -0,0 +0,0 @@ public class BlockPos extends Vec3i {
- 
-     @Override
-     public BlockPos north(int distance) {
--        return distance == 0 ? this : new BlockPos(this.getX(), this.getY(), this.getZ() - distance); // Paper - Perf: Optimize BlockPosition
-+        return distance == 0 ? this.immutable() : new BlockPos(this.getX(), this.getY(), this.getZ() - distance); // Paper - Perf: Optimize BlockPosition
-     }
- 
-     @Override
-@@ -0,0 +0,0 @@ public class BlockPos extends Vec3i {
- 
-     @Override
-     public BlockPos south(int distance) {
--        return distance == 0 ? this : new BlockPos(this.getX(), this.getY(), this.getZ() + distance); // Paper - Perf: Optimize BlockPosition
-+        return distance == 0 ? this.immutable() : new BlockPos(this.getX(), this.getY(), this.getZ() + distance); // Paper - Perf: Optimize BlockPosition
-     }
- 
-     @Override
-@@ -0,0 +0,0 @@ public class BlockPos extends Vec3i {
- 
-     @Override
-     public BlockPos west(int distance) {
--        return distance == 0 ? this : new BlockPos(this.getX() - distance, this.getY(), this.getZ()); // Paper - Perf: Optimize BlockPosition
-+        return distance == 0 ? this.immutable() : new BlockPos(this.getX() - distance, this.getY(), this.getZ()); // Paper - Perf: Optimize BlockPosition
-     }
- 
-     @Override
-@@ -0,0 +0,0 @@ public class BlockPos extends Vec3i {
- 
-     @Override
-     public BlockPos east(int distance) {
--        return distance == 0 ? this : new BlockPos(this.getX() + distance, this.getY(), this.getZ()); // Paper - Perf: Optimize BlockPosition
-+        return distance == 0 ? this.immutable() : new BlockPos(this.getX() + distance, this.getY(), this.getZ()); // Paper - Perf: Optimize BlockPosition
-     }
- 
-     @Override

patches/server/fixup-Paper-config-files.patch

@@ -1,87 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Thu, 24 Oct 2024 08:11:12 -0700
-Subject: [PATCH] fixup! Paper config files
-
-
-diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -0,0 +0,0 @@ public class GlobalConfiguration extends ConfigurationPart {
-     public static GlobalConfiguration get() {
-         return instance;
-     }
-+
-+    public ChunkLoadingBasic chunkLoadingBasic;
-+
-+    public class ChunkLoadingBasic extends ConfigurationPart {
-+        @Comment("The maximum rate in chunks per second that the server will send to any individual player. Set to -1 to disable this limit.")
-+        public double playerMaxChunkSendRate = 75.0;
-+
-+        @Comment(
-+            "The maximum rate at which chunks will load for any individual player. " +
-+            "Note that this setting also affects chunk generations, since a chunk load is always first issued to test if a" +
-+            "chunk is already generated. Set to -1 to disable this limit."
-+        )
-+        public double playerMaxChunkLoadRate = 100.0;
-+
-+        @Comment("The maximum rate at which chunks will generate for any individual player. Set to -1 to disable this limit.")
-+        public double playerMaxChunkGenerateRate = -1.0;
-+    }
-+
-+    public ChunkLoadingAdvanced chunkLoadingAdvanced;
-+
-+    public class ChunkLoadingAdvanced extends ConfigurationPart {
-+        @Comment(
-+            "Set to true if the server will match the chunk send radius that clients have configured" +
-+            "in their view distance settings if the client is less-than the server's send distance."
-+        )
-+        public boolean autoConfigSendDistance = true;
-+
-+        @Comment(
-+            "Specifies the maximum amount of concurrent chunk loads that an individual player can have." +
-+            "Set to 0 to let the server configure it automatically per player, or set it to -1 to disable the limit."
-+        )
-+        public int playerMaxConcurrentChunkLoads = 0;
-+
-+        @Comment(
-+            "Specifies the maximum amount of concurrent chunk generations that an individual player can have." +
-+            "Set to 0 to let the server configure it automatically per player, or set it to -1 to disable the limit."
-+        )
-+        public int playerMaxConcurrentChunkGenerates = 0;
-+    }
-     static void set(GlobalConfiguration instance) {
-         GlobalConfiguration.instance = instance;
-     }
-@@ -0,0 +0,0 @@ public class GlobalConfiguration extends ConfigurationPart {
-         public int incomingPacketThreshold = 300;
-     }
- 
--    public ChunkLoading chunkLoading;
--
--    public class ChunkLoading extends ConfigurationPart {
--        public int minLoadRadius = 2;
--        public int maxConcurrentSends = 2;
--        public boolean autoconfigSendDistance = true;
--        public double targetPlayerChunkSendRate = 100.0;
--        public double globalMaxChunkSendRate = -1.0;
--        public boolean enableFrustumPriority = false;
--        public double globalMaxChunkLoadRate = -1.0;
--        public double playerMaxConcurrentLoads = 20.0;
--        public double globalMaxConcurrentLoads = 500.0;
--        public double playerMaxChunkLoadRate = -1.0;
--    }
--
-     public UnsupportedSettings unsupportedSettings;
- 
-     public class UnsupportedSettings extends ConfigurationPart {
-@@ -0,0 +0,0 @@ public class GlobalConfiguration extends ConfigurationPart {
- 
-         @PostProcess
-         private void postProcess() {
--            //io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.init(this);
-+
-         }
-     }
-