Update build_1.21.4.yml (#75)

* feat: Disable Heightmap Warning

* description: fix text in raid Config

.github/workflows/build_1.21.4.yml

@@ -1,10 +1,10 @@
-name: Luminol CI - dev/1.21.4-hardfork
+name: Luminol CI - dev/1.21.4-hardfork-with-new-scheduler
 
 on:
     push:
-      branches: [ "dev/1.21.4-hardfork" ]
+      branches: [ "dev/1.21.4-hardfork-with-new-scheduler" ]
     pull_request:
-      branches: [ "dev/1.21.4-hardfork" ]
+      branches: [ "dev/1.21.4-hardfork-with-new-scheduler" ]
 
 permissions: write-all
 
@@ -41,7 +41,7 @@ jobs:
         uses: "actions/upload-artifact@v4"
         with:
           name: "${{ env.project_id_b }} CI Artifacts"
-          path: "luminol-server/build/libs/*.jar"
+          path: "luminol-server/build/libs/*-paperclip-*-mojmap.jar"
       - name: SetENV
         if: github.event_name != 'pull_request'
         run: sh scripts/SetENV.sh
@@ -52,13 +52,17 @@ jobs:
           tag: ${{ env.tag }}
           name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}
           body: |
+            > [!CAUTION]
+            > 🚨You are trying to download experimental builds!
+            > **<u>DO NOT</u>** use these builds in production, as there may be many bugs and corruption issues.
+            > Please report any and all issues you encounter!
+            
             📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LuminolMC/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LuminolMC/${{ env.project_id }}/download/${{ env.tag }}/${{ env.jar }})
             This release is automatically compiled by GitHub Actions
             ### Commit Message
             ${{ env.commit_msg }}
           artifacts: |
             ${{ env.jar_dir }}
-            ${{ env.jar_dir_bundler }}
           generateReleaseNotes: true
           prerelease: ${{ env.pre }}
           makeLatest: ${{ env.make_latest }}

gradle.properties

@@ -2,7 +2,7 @@ group = me.earthme.luminol
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4
 
-foliaRef=d3969cdc419b84e2d94c13854d4eb94ae2e0b7be
+foliaRef=80ab57dcbe5fa96cc2f7fe34ecba94162d8dd5e9
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

luminol-server/minecraft-patches/features/0001-Luminol-config-base.patch

@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <mrhua269@gmail.com>
+Date: Sat, 22 Mar 2025 17:36:17 +0800
+Subject: [PATCH] Luminol config base
+
+
+diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
+index 9aa664537cc37e44db46d5a2a64ae3116938c681..8d6a6534a134e99e5ee2652d7b0c858d538e69bd 100644
+--- a/net/minecraft/server/Main.java
++++ b/net/minecraft/server/Main.java
+@@ -108,6 +108,7 @@ public class Main {
+                 JvmProfiler.INSTANCE.start(Environment.SERVER);
+             }
+ 
++            me.earthme.luminol.config.LuminolConfig.preLoadConfig(); // Luminol - Luminol config
+             io.papermc.paper.plugin.PluginInitializerManager.load(optionSet); // Paper
+             Bootstrap.bootStrap();
+             Bootstrap.validate();
+diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
+index e3b7184e20bda4983ee1fc5463d91ca0cdd8ec1f..375f4a59333ee1d75fb1acb8c2cbada7866bd48e 100644
+--- a/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -212,6 +212,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         this.paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
+         this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
+         // Paper end - initialize global and world-defaults configuration
++        me.earthme.luminol.config.LuminolConfig.finalizeLoadConfig(); //Luminol - load config file
++        me.earthme.luminol.config.LuminolConfig.setupLatch(); //Luminol - load config file
+         this.server.spark.enableEarlyIfRequested(); // Paper - spark
+         // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
+         if (this.convertOldUsers()) {

luminol-server/minecraft-patches/features/0002-Add-config-for-server-mod-name.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add config for server mod name
 
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index faf72dd6dff74296c73cb058aaabd1f9f475a072..46375fa81b36b89b79c22f0a7ac6d610ab1183d4 100644
+index be82a6b43b1f0c644c53d08a6e16bc2876c8c1e0..9261d83f28af5e057d060741ab900f8cde8f992b 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1967,7 +1967,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1968,7 +1968,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {

luminol-server/minecraft-patches/features/0005-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch

@@ -17,10 +17,10 @@ index 8d67b4629c69d3039b199aaad45533d1acde114e..f7bfeca4b11b9860241d5eb80b6df420
          ((ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickServerLevel)(ServerLevel)chunk.getLevel()).moonrise$removeChunkForPlayerTicking(chunk); // Moonrise - chunk tick iteration
      }
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 46375fa81b36b89b79c22f0a7ac6d610ab1183d4..f2124edb487b1d5f6bdc7fa086814f870724363a 100644
+index 9261d83f28af5e057d060741ab900f8cde8f992b..fc088edaa36e7e68ddd23c57e351ef3b31ed5ad8 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1665,7 +1665,44 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1666,7 +1666,44 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Folia end - region threading
          //this.tickCount++; // Folia - region threading
          //this.tickRateManager.tick(); // Folia - region threading
@@ -118,10 +118,10 @@ index f2d2ddfd964bff914e41c0b4150fe1aad7866ebf..7defcd15c44601bfd2f7f55046038693
      }
  
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 423534a1ff02bd0d0f9baacfe2428f45c7d9acb9..9fd3fe181df2ce6dbe695f6463d3940ac4c01167 100644
+index dbf9231b1f01576906b90a3ddf0bf2cbbeb4590a..b17ace9118c94a756fa2901621c6b2b9bd9e5764 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -393,7 +393,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -400,7 +400,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
      public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
      public @Nullable String clientBrandName = null; // Paper - Brand support
      public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
@@ -132,7 +132,7 @@ index 423534a1ff02bd0d0f9baacfe2428f45c7d9acb9..9fd3fe181df2ce6dbe695f6463d3940a
      // Paper start - rewrite chunk system
      private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
      private final ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder viewDistanceHolder = new ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder();
-@@ -1006,8 +1008,35 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1013,8 +1015,35 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
          this.trackEnteredOrExitedLavaOnVehicle();
          this.updatePlayerAttributes();
          this.advancements.flushDirty(this);

luminol-server/minecraft-patches/features/0010-Add-config-to-disable-entity-tick-catchers.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add config to disable entity tick catchers
 
 
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index dafd90502937019b616ac0a79465e1dbc578cf66..96daa716aa06de31b2867f09833ac8e77b6314c4 100644
+index 78f4dd7032d18b8e020a4576e4ac012c1d472e67..120e25ca0544980d1bfc1498e1386f965dae7044 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
 @@ -1547,6 +1547,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl

luminol-server/minecraft-patches/features/0011-Add-fix-for-off-region-adult-following-ai-behavior.patch

@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <wangxyper@163.com>
-Date: Sun, 12 Jan 2025 10:39:35 +0800
-Subject: [PATCH] Add fix for off region adult following ai behavior
-
-
-diff --git a/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java b/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java
-index a9be3acbf4ea52d2988347abfa6f4f8c02b1da26..751f3dde8e6bc2c0365e8672f5079af0379a69de 100644
---- a/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java
-+++ b/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java
-@@ -25,6 +25,14 @@ public class BabyFollowAdult {
-                         return false;
-                     } else {
-                         LivingEntity ageableMob = instance.get(nearestVisibleAdult); // CraftBukkit - type
-+
-+                        // Luminol start - Fix off world entity following which caused async issue
-+                        if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(ageableMob)) {
-+                            nearestVisibleAdult.erase();
-+                            return true;
-+                        }
-+                        // Luminol end
-+
-                         if (mob.closerThan(ageableMob, followRange.getMaxValue() + 1) && !mob.closerThan(ageableMob, followRange.getMinValue())) {
-                             // CraftBukkit start
-                             org.bukkit.event.entity.EntityTargetLivingEntityEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTargetLivingEvent(mob, ageableMob, org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER);

luminol-server/minecraft-patches/features/0012-Add-config-for-tripwire-dupe.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
 Date: Mon, 24 Feb 2025 06:00:00 -0800
-Subject: [PATCH] Configurable tripwire dupe
+Subject: [PATCH] Add config for tripwire dupe
 
 
 diff --git a/net/minecraft/world/level/block/TripWireHookBlock.java b/net/minecraft/world/level/block/TripWireHookBlock.java

luminol-server/minecraft-patches/features/0015-Add-experiment-config-for-force-enabling-data-comman.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kercute <A3167717663@hotmail.com>
 Date: Sun, 16 Mar 2025 23:31:41 +0800
-Subject: [PATCH] Add force the data command to be enabled config
+Subject: [PATCH] Add experiment config for force enabling data command
 
 
 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java

luminol-server/minecraft-patches/features/0016-Add-configurable-region-format-framework-linear-v2-r.patch

@@ -55,7 +55,7 @@ index 51c126735ace8fdde89ad97b5cab62f244212db0..c7d4d944eb198ac53a3eeae717a25c7d
 +    public void moonrise$write(final abomination.IRegionFile regionFile) throws IOException; // Luminol - Configurable region file format
  }
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index f2124edb487b1d5f6bdc7fa086814f870724363a..ed00a29daccfee1d631bef27c0a3a4ae83140018 100644
+index fc088edaa36e7e68ddd23c57e351ef3b31ed5ad8..5d709b3b47702e7607dafa4a38380c801b228e2d 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -986,10 +986,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

luminol-server/minecraft-patches/features/0019-Force-disable-builtin-spark-plugin.patch

@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <wangxyper@163.com>
-Date: Sun, 12 Jan 2025 11:00:49 +0800
+From: MrHua269 <mrhua269@gmail.com>
+Date: Sat, 22 Mar 2025 17:36:44 +0800
 Subject: [PATCH] Force disable builtin spark plugin
 
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index ed00a29daccfee1d631bef27c0a3a4ae83140018..330af9f4de1c72387326816065350e71fe546efe 100644
+index 5d709b3b47702e7607dafa4a38380c801b228e2d..c2027b8d4a5f9fccacb93ba108e34c36285aec7b 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -783,8 +783,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -65,7 +65,7 @@ index ed00a29daccfee1d631bef27c0a3a4ae83140018..330af9f4de1c72387326816065350e71
          new com.destroystokyo.paper.event.server.ServerTickStartEvent((int)region.getCurrentTick()).callEvent(); // Paper - Server Tick Events // Folia - region threading
          // Folia start - region threading
          if (region != null) {
-@@ -1743,7 +1744,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1744,7 +1745,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          long remaining = scheduledEnd - endTime; // Folia - region ticking
          new com.destroystokyo.paper.event.server.ServerTickEndEvent((int)io.papermc.paper.threadedregions.RegionizedServer.getCurrentTick(), ((double)(endTime - startTime) / 1000000D), remaining).callEvent(); // Folia - region ticking
          // Paper end - Server Tick Events

luminol-server/minecraft-patches/features/0021-Fix-uncorrected-death-check-of-folia.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix uncorrected death check of folia
 
 
 diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 50af953a4698a3c6e16b840fab764dd733b3fbc9..a9c058238819f3631d94ac306185e909821caf35 100644
+index acca8c51d2030c675c157b10d0bbc6af631afe61..d0b688e69979c5e7b8267ac96bd71bcd33444c41 100644
 --- a/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
-@@ -679,7 +679,7 @@ public abstract class AbstractContainerMenu {
+@@ -689,7 +689,7 @@ public abstract class AbstractContainerMenu {
      }
  
      private static void dropOrPlaceInInventory(Player player, ItemStack stack) {

luminol-server/minecraft-patches/features/0022-Fix-a-series-issue-around-entity-memory-typed-Global.patch

@@ -5,6 +5,25 @@ Subject: [PATCH] Fix a series issue around entity memory typed GlobalPos and
  WalkTarget
 
 
+diff --git a/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java b/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java
+index a9be3acbf4ea52d2988347abfa6f4f8c02b1da26..751f3dde8e6bc2c0365e8672f5079af0379a69de 100644
+--- a/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java
++++ b/net/minecraft/world/entity/ai/behavior/BabyFollowAdult.java
+@@ -25,6 +25,14 @@ public class BabyFollowAdult {
+                         return false;
+                     } else {
+                         LivingEntity ageableMob = instance.get(nearestVisibleAdult); // CraftBukkit - type
++
++                        // Luminol start - Fix off world entity following which caused async issue
++                        if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(ageableMob)) {
++                            nearestVisibleAdult.erase();
++                            return true;
++                        }
++                        // Luminol end
++
+                         if (mob.closerThan(ageableMob, followRange.getMaxValue() + 1) && !mob.closerThan(ageableMob, followRange.getMinValue())) {
+                             // CraftBukkit start
+                             org.bukkit.event.entity.EntityTargetLivingEntityEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTargetLivingEvent(mob, ageableMob, org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER);
 diff --git a/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java b/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
 index 2664d72c3b6906d0505df2e63c0e5075eba9461b..f03c3c512ea48c2a89eebae62484922d28e4f831 100644
 --- a/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java

luminol-server/minecraft-patches/features/0022-Revert-RegionizedTaskQueue-referent-counter-changes.patch

@@ -1,381 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <mrhua269@gmail.com>
-Date: Thu, 20 Mar 2025 23:12:30 +0800
-Subject: [PATCH] Revert RegionizedTaskQueue referent counter changes
-
-
-diff --git a/io/papermc/paper/threadedregions/RegionizedTaskQueue.java b/io/papermc/paper/threadedregions/RegionizedTaskQueue.java
-index 745ab870310733b569681f5280895bb9798620a4..9b8d06c77aa71acbe25151d82777e5dfa4e4a5f7 100644
---- a/io/papermc/paper/threadedregions/RegionizedTaskQueue.java
-+++ b/io/papermc/paper/threadedregions/RegionizedTaskQueue.java
-@@ -24,7 +24,7 @@ public final class RegionizedTaskQueue {
- 
-     public PrioritisedExecutor.PrioritisedTask createChunkTask(final ServerLevel world, final int chunkX, final int chunkZ,
-                                                                final Runnable run) {
--        return this.createChunkTask(world, chunkX, chunkZ, run, Priority.NORMAL);
-+        return new PrioritisedQueue.ChunkBasedPriorityTask(world.taskQueueRegionData, chunkX, chunkZ, true, run, Priority.NORMAL);
-     }
- 
-     public PrioritisedExecutor.PrioritisedTask createChunkTask(final ServerLevel world, final int chunkX, final int chunkZ,
-@@ -34,7 +34,7 @@ public final class RegionizedTaskQueue {
- 
-     public PrioritisedExecutor.PrioritisedTask createTickTaskQueue(final ServerLevel world, final int chunkX, final int chunkZ,
-                                                                    final Runnable run) {
--        return this.createTickTaskQueue(world, chunkX, chunkZ, run, Priority.NORMAL);
-+        return new PrioritisedQueue.ChunkBasedPriorityTask(world.taskQueueRegionData, chunkX, chunkZ, false, run, Priority.NORMAL);
-     }
- 
-     public PrioritisedExecutor.PrioritisedTask createTickTaskQueue(final ServerLevel world, final int chunkX, final int chunkZ,
-@@ -73,7 +73,7 @@ public final class RegionizedTaskQueue {
-     public static final class WorldRegionTaskData {
-         private final ServerLevel world;
-         private final MultiThreadedQueue<Runnable> globalChunkTask = new MultiThreadedQueue<>();
--        private final ConcurrentLong2ReferenceChainedHashTable<ReferenceCountData> referenceCounters = new ConcurrentLong2ReferenceChainedHashTable<>();
-+        private final ConcurrentLong2ReferenceChainedHashTable<AtomicLong> referenceCounters = new ConcurrentLong2ReferenceChainedHashTable<>();
- 
-         public WorldRegionTaskData(final ServerLevel world) {
-             this.world = world;
-@@ -99,7 +99,7 @@ public final class RegionizedTaskQueue {
-         private PrioritisedQueue getQueue(final boolean synchronise, final int chunkX, final int chunkZ, final boolean isChunkTask) {
-             final ThreadedRegionizer<TickRegions.TickRegionData, TickRegions.TickRegionSectionData> regioniser = this.world.regioniser;
-             final ThreadedRegionizer.ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData> region
--                = synchronise ? regioniser.getRegionAtSynchronised(chunkX, chunkZ) : regioniser.getRegionAtUnsynchronised(chunkX, chunkZ);
-+                    = synchronise ? regioniser.getRegionAtSynchronised(chunkX, chunkZ) : regioniser.getRegionAtUnsynchronised(chunkX, chunkZ);
-             if (region == null) {
-                 return null;
-             }
-@@ -109,13 +109,13 @@ public final class RegionizedTaskQueue {
- 
-         private void removeTicket(final long coord) {
-             this.world.moonrise$getChunkTaskScheduler().chunkHolderManager.removeTicketAtLevel(
--                TASK_QUEUE_TICKET, coord, ChunkHolderManager.MAX_TICKET_LEVEL, Unit.INSTANCE
-+                    TASK_QUEUE_TICKET, coord, ChunkHolderManager.MAX_TICKET_LEVEL, Unit.INSTANCE
-             );
-         }
- 
-         private void addTicket(final long coord) {
-             this.world.moonrise$getChunkTaskScheduler().chunkHolderManager.addTicketAtLevel(
--                TASK_QUEUE_TICKET, coord, ChunkHolderManager.MAX_TICKET_LEVEL, Unit.INSTANCE
-+                    TASK_QUEUE_TICKET, coord, ChunkHolderManager.MAX_TICKET_LEVEL, Unit.INSTANCE
-             );
-         }
- 
-@@ -123,95 +123,96 @@ public final class RegionizedTaskQueue {
-             this.world.moonrise$getChunkTaskScheduler().chunkHolderManager.processTicketUpdates(CoordinateUtils.getChunkX(coord), CoordinateUtils.getChunkZ(coord));
-         }
- 
--        // note: only call on acquired referenceCountData
--        private void ensureTicketAdded(final long coord, final ReferenceCountData referenceCountData) {
--            if (!referenceCountData.addedTicket) {
--                // fine if multiple threads do this, no removeTicket may be called for this coord due to reference count inc
--                this.addTicket(coord);
--                this.processTicketUpdates(coord);
--                referenceCountData.addedTicket = true;
-+        private void decrementReference(final AtomicLong reference, final long coord) {
-+            final long val = reference.decrementAndGet();
-+            if (val == 0L) {
-+                final int chunkX = CoordinateUtils.getChunkX(coord);
-+                final int chunkZ = CoordinateUtils.getChunkZ(coord);
-+                final ca.spottedleaf.concurrentutil.lock.ReentrantAreaLock.Node ticketLock = this.world.moonrise$getChunkTaskScheduler().chunkHolderManager.ticketLockArea.lock(chunkX, chunkZ);
-+                try {
-+                    if (this.referenceCounters.remove(coord, reference) == reference) {
-+                        WorldRegionTaskData.this.removeTicket(coord);
-+                    } // else: race condition, something replaced our reference - not our issue anymore
-+                } finally {
-+                    this.world.moonrise$getChunkTaskScheduler().chunkHolderManager.ticketLockArea.unlock(ticketLock);
-+                }
-+            } else if (val < 0L) {
-+                throw new IllegalStateException("Reference count < 0: " + val);
-             }
-         }
- 
--        private void decrementReference(final ReferenceCountData referenceCountData, final long coord) {
--            if (!referenceCountData.decreaseReferenceCount()) {
--                return;
--            } // else: need to remove ticket
--
--            // note: it is possible that another thread increments and then removes the reference before we can, so
--            //       use ifPresent
--            this.referenceCounters.computeIfPresent(coord, (final long keyInMap, final ReferenceCountData valueInMap) -> {
--                if (valueInMap.referenceCount.get() != 0L) {
--                    return valueInMap;
--                }
--
--                // note: valueInMap may not be referenceCountData
--
--                // possible to invoke this outside of the compute call, but not required and requires additional logic
--                WorldRegionTaskData.this.removeTicket(keyInMap);
-+        private AtomicLong incrementReference(final long coord) {
-+            final AtomicLong ret = this.referenceCounters.get(coord);
-+            if (ret != null) {
-+                // try to fast acquire counter
-+                int failures = 0;
-+                for (long curr = ret.get();;) {
-+                    if (curr == 0L) {
-+                        // failed to fast acquire as reference expired
-+                        break;
-+                    }
- 
--                return null;
--            });
--        }
-+                    for (int i = 0; i < failures; ++i) {
-+                        ConcurrentUtil.backoff();
-+                    }
- 
--        private ReferenceCountData incrementReference(final long coord) {
--            ReferenceCountData referenceCountData = this.referenceCounters.get(coord);
-+                    if (curr == (curr = ret.compareAndExchange(curr, curr + 1L))) {
-+                        return ret;
-+                    }
- 
--            if (referenceCountData != null && referenceCountData.addCount()) {
--                this.ensureTicketAdded(coord, referenceCountData);
--                return referenceCountData;
-+                    ++failures;
-+                }
-             }
- 
--            referenceCountData = this.referenceCounters.compute(coord, (final long keyInMap, final ReferenceCountData valueInMap) -> {
-+            // slow acquire
-+            final int chunkX = CoordinateUtils.getChunkX(coord);
-+            final int chunkZ = CoordinateUtils.getChunkZ(coord);
-+            final ca.spottedleaf.concurrentutil.lock.ReentrantAreaLock.Node ticketLock = this.world.moonrise$getChunkTaskScheduler().chunkHolderManager.ticketLockArea.lock(chunkX, chunkZ);
-+            final AtomicLong ret2;
-+            final boolean processTicketUpdates;
-+            try {
-+                final AtomicLong replace = new AtomicLong(1L);
-+                final AtomicLong valueInMap = this.referenceCounters.putIfAbsent(coord, replace);
-                 if (valueInMap == null) {
--                    // sets reference count to 1
--                    return new ReferenceCountData();
--                }
--                // OK if we add from 0, the remove call will use compute() and catch this race condition
--                valueInMap.referenceCount.getAndIncrement();
--
--                return valueInMap;
--            });
--
--            this.ensureTicketAdded(coord, referenceCountData);
--
--            return referenceCountData;
--        }
--    }
--
--    private static final class ReferenceCountData {
--
--        public final AtomicLong referenceCount = new AtomicLong(1L);
--        public volatile boolean addedTicket;
-+                    // replaced, we should usually be here
-+                    this.addTicket(coord);
-+                    ret2 = replace;
-+                    processTicketUpdates = true;
-+                } else {
-+                    processTicketUpdates = false;
-+                    int failures = 0;
-+                    for (long curr = valueInMap.get();;) {
-+                        if (curr == 0L) {
-+                            // don't need to add ticket here, since ticket is only removed during the lock
-+                            // we just need to replace the value in the map so that the thread removing fails and doesn't
-+                            // remove the ticket (see decrementReference)
-+                            this.referenceCounters.put(coord, replace);
-+                            ret2 = replace;
-+                            break;
-+                        }
- 
--        // returns false if reference count is 0, otherwise increments ref count
--        public boolean addCount() {
--            int failures = 0;
--            for (long curr = this.referenceCount.get();;) {
--                for (int i = 0; i < failures; ++i) {
--                    Thread.onSpinWait();
--                }
-+                        for (int i = 0; i < failures; ++i) {
-+                            ConcurrentUtil.backoff();
-+                        }
- 
--                if (curr == 0L) {
--                    return false;
--                }
-+                        if (curr == (curr = valueInMap.compareAndExchange(curr, curr + 1L))) {
-+                            // acquired
-+                            ret2 = valueInMap;
-+                            break;
-+                        }
- 
--                if (curr == (curr = this.referenceCount.compareAndExchange(curr, curr + 1L))) {
--                    return true;
-+                        ++failures;
-+                    }
-                 }
--
--                ++failures;
-+            } finally {
-+                this.world.moonrise$getChunkTaskScheduler().chunkHolderManager.ticketLockArea.unlock(ticketLock);
-             }
--        }
- 
--        // returns true if new reference count is 0
--        public boolean decreaseReferenceCount() {
--            final long res = this.referenceCount.decrementAndGet();
--            if (res >= 0L) {
--                return res == 0L;
--            } else {
--                throw new IllegalStateException("Negative reference count");
-+            if (processTicketUpdates) {
-+                this.processTicketUpdates(coord);
-             }
-+
-+            return ret2;
-         }
-     }
- 
-@@ -240,10 +241,10 @@ public final class RegionizedTaskQueue {
-         void split(final ThreadedRegionizer<TickRegions.TickRegionData, TickRegions.TickRegionSectionData> regioniser,
-                    final Long2ReferenceOpenHashMap<ThreadedRegionizer.ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData>> into) {
-             this.tickTaskQueue.split(
--                false, regioniser, into
-+                    false, regioniser, into
-             );
-             this.chunkQueue.split(
--                true, regioniser, into
-+                    true, regioniser, into
-             );
-         }
- 
-@@ -340,7 +341,7 @@ public final class RegionizedTaskQueue {
-                           final ThreadedRegionizer<TickRegions.TickRegionData, TickRegions.TickRegionSectionData> regioniser,
-                           final Long2ReferenceOpenHashMap<ThreadedRegionizer.ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData>> into) {
-             final Reference2ReferenceOpenHashMap<ThreadedRegionizer.ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData>, ArrayDeque<ChunkBasedPriorityTask>[]>
--                split = new Reference2ReferenceOpenHashMap<>();
-+                    split = new Reference2ReferenceOpenHashMap<>();
-             final int shift = regioniser.sectionChunkShift;
-             synchronized (this) {
-                 this.isDestroyed = true;
-@@ -356,7 +357,7 @@ public final class RegionizedTaskQueue {
-                         final int sectionZ = task.chunkZ >> shift;
-                         final long sectionKey = CoordinateUtils.getChunkKey(sectionX, sectionZ);
-                         final ThreadedRegionizer.ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData>
--                            region = into.get(sectionKey);
-+                                region = into.get(sectionKey);
-                         if (region == null) {
-                             throw new IllegalStateException();
-                         }
-@@ -378,7 +379,7 @@ public final class RegionizedTaskQueue {
-                      iterator = split.reference2ReferenceEntrySet().fastIterator();
-                      iterator.hasNext();) {
-                     final Reference2ReferenceMap.Entry<ThreadedRegionizer.ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData>, ArrayDeque<ChunkBasedPriorityTask>[]>
--                        entry = iterator.next();
-+                            entry = iterator.next();
-                     final RegionTaskQueueData taskQueueData = entry.getKey().getData().getTaskQueueData();
-                     mergeInto(isChunkData ? taskQueueData.chunkQueue : taskQueueData.tickTaskQueue, entry.getValue());
-                 }
-@@ -408,7 +409,7 @@ public final class RegionizedTaskQueue {
-             final ArrayDeque<ChunkBasedPriorityTask>[] queues = this.queues;
-             final int max = Priority.IDLE.priority;
-             ChunkBasedPriorityTask task = null;
--            ReferenceCountData referenceCounter = null;
-+            AtomicLong referenceCounter = null;
-             synchronized (this) {
-                 if (this.isDestroyed) {
-                     throw new IllegalStateException("Attempting to poll from dead queue");
-@@ -440,10 +441,9 @@ public final class RegionizedTaskQueue {
- 
-         private static final class ChunkBasedPriorityTask implements PrioritisedExecutor.PrioritisedTask {
- 
--            private static final ReferenceCountData REFERENCE_COUNTER_NOT_SET = new ReferenceCountData();
--            static {
--                REFERENCE_COUNTER_NOT_SET.referenceCount.set((long)Integer.MIN_VALUE);
--            }
-+            private static final AtomicLong REFERENCE_COUNTER_NOT_SET = new AtomicLong(-1L);
-+
-+
- 
-             private final WorldRegionTaskData world;
-             private final int chunkX;
-@@ -451,8 +451,8 @@ public final class RegionizedTaskQueue {
-             private final long sectionLowerLeftCoord; // chunk coordinate
-             private final boolean isChunkTask;
- 
--            private volatile ReferenceCountData referenceCounter;
--            private static final VarHandle REFERENCE_COUNTER_HANDLE = ConcurrentUtil.getVarHandle(ChunkBasedPriorityTask.class, "referenceCounter", ReferenceCountData.class);
-+            private volatile AtomicLong referenceCounter;
-+            private static final VarHandle REFERENCE_COUNTER_HANDLE = ConcurrentUtil.getVarHandle(ChunkBasedPriorityTask.class, "referenceCounter", AtomicLong.class);
-             private Runnable run;
-             private volatile Priority priority;
-             private static final VarHandle PRIORITY_HANDLE = ConcurrentUtil.getVarHandle(ChunkBasedPriorityTask.class, "priority", Priority.class);
-@@ -489,16 +489,16 @@ public final class RegionizedTaskQueue {
-                 return (Priority)PRIORITY_HANDLE.compareAndExchange(this, expect, update);
-             }
- 
--            private void setReferenceCounterPlain(final ReferenceCountData value) {
-+            private void setReferenceCounterPlain(final AtomicLong value) {
-                 REFERENCE_COUNTER_HANDLE.set(this, value);
-             }
- 
--            private ReferenceCountData getReferenceCounterVolatile() {
--                return (ReferenceCountData)REFERENCE_COUNTER_HANDLE.get(this);
-+            private AtomicLong getReferenceCounterVolatile() {
-+                return (AtomicLong)REFERENCE_COUNTER_HANDLE.get(this);
-             }
- 
--            private ReferenceCountData compareAndExchangeReferenceCounter(final ReferenceCountData expect, final ReferenceCountData update) {
--                return (ReferenceCountData)REFERENCE_COUNTER_HANDLE.compareAndExchange(this, expect, update);
-+            private AtomicLong compareAndExchangeReferenceCounter(final AtomicLong expect, final AtomicLong update) {
-+                return (AtomicLong)REFERENCE_COUNTER_HANDLE.compareAndExchange(this, expect, update);
-             }
- 
-             private void executeInternal() {
-@@ -515,7 +515,7 @@ public final class RegionizedTaskQueue {
- 
-             private boolean tryComplete(final boolean cancel) {
-                 int failures = 0;
--                for (ReferenceCountData curr = this.getReferenceCounterVolatile();;) {
-+                for (AtomicLong curr = this.getReferenceCounterVolatile();;) {
-                     if (curr == null) {
-                         return false;
-                     }
-@@ -564,7 +564,7 @@ public final class RegionizedTaskQueue {
-                     return false;
-                 }
- 
--                final ReferenceCountData referenceCounter = this.world.incrementReference(this.sectionLowerLeftCoord);
-+                final AtomicLong referenceCounter = this.world.incrementReference(this.sectionLowerLeftCoord);
-                 if (this.compareAndExchangeReferenceCounter(REFERENCE_COUNTER_NOT_SET, referenceCounter) != REFERENCE_COUNTER_NOT_SET) {
-                     // we don't expect race conditions here, so it is OK if we have to needlessly reference count
-                     this.world.decrementReference(referenceCounter, this.sectionLowerLeftCoord);
-@@ -614,7 +614,7 @@ public final class RegionizedTaskQueue {
-                 }
-             }
- 
--            private ReferenceCountData trySetCompleting(final int minPriority) {
-+            private AtomicLong trySetCompleting(final int minPriority) {
-                 // first, try to set priority to EXECUTING
-                 for (Priority curr = this.getPriorityVolatile();;) {
-                     if (curr.isLowerPriority(minPriority)) {
-@@ -626,7 +626,7 @@ public final class RegionizedTaskQueue {
-                     } // else: continue
-                 }
- 
--                for (ReferenceCountData curr = this.getReferenceCounterVolatile();;) {
-+                for (AtomicLong curr = this.getReferenceCounterVolatile();;) {
-                     if (curr == null) {
-                         // something acquired before us
-                         return null;
-@@ -639,7 +639,6 @@ public final class RegionizedTaskQueue {
-                     if (curr != (curr = this.compareAndExchangeReferenceCounter(curr, null))) {
-                         continue;
-                     }
--
-                     return curr;
-                 }
-             }
-@@ -647,7 +646,7 @@ public final class RegionizedTaskQueue {
-             private void updatePriorityInQueue() {
-                 boolean synchronise = false;
-                 for (;;) {
--                    final ReferenceCountData referenceCount = this.getReferenceCounterVolatile();
-+                    final AtomicLong referenceCount = this.getReferenceCounterVolatile();
-                     if (referenceCount == REFERENCE_COUNTER_NOT_SET || referenceCount == null) {
-                         // cancelled or not queued
-                         return;

luminol-server/minecraft-patches/features/0024-Use-the-correct-list-length-while-generating-tick-re.patch

@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <mrhua269@gmail.com>
+Date: Sat, 22 Mar 2025 20:48:24 +0800
+Subject: [PATCH] Use the correct list length while generating tick report
+
+
+diff --git a/io/papermc/paper/threadedregions/TickData.java b/io/papermc/paper/threadedregions/TickData.java
+index 0383e4dcd611a7568597f46308060f3d7288a564..f53c37d047856f1569b6f637c54ebad03c42006e 100644
+--- a/io/papermc/paper/threadedregions/TickData.java
++++ b/io/papermc/paper/threadedregions/TickData.java
+@@ -178,7 +178,8 @@ public final class TickData {
+             } else {
+                 long totalTickTime = 0L;
+                 long totalCpuTime = 0L;
+-                for (int k = 0, len2 = collapsedData.size(); k < len2; ++k) {
++                //for (int k = 0, len2 = collapsedData.size(); k < len2; ++k) {
++                for (int k = 0, len2 = toCollapse.size(); k < len2; ++k) { // Luminol - Use the correct list length
+                     final TickRegionScheduler.TickTime time = toCollapse.get(k);
+                     totalTickTime += time.tickLength();
+                     totalCpuTime += time.supportCPUTime() ? time.tickCpuTime() : 0L;

luminol-server/minecraft-patches/features/0025-Try-rewriting-update-queue-polling.patch

@@ -0,0 +1,124 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <mrhua269@gmail.com>
+Date: Sun, 23 Mar 2025 15:51:35 +0800
+Subject: [PATCH] Try rewriting update queue polling
+
+
+diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ThreadedTicketLevelPropagator.java b/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ThreadedTicketLevelPropagator.java
+index 310a8f80debadd64c2d962ebf83b7d0505ce6e42..59d77f04fd0f1c7b7af0314e533b72e1858a7e21 100644
+--- a/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ThreadedTicketLevelPropagator.java
++++ b/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ThreadedTicketLevelPropagator.java
+@@ -151,6 +151,15 @@ public abstract class ThreadedTicketLevelPropagator {
+     private boolean performUpdate(final Section section, final UpdateQueue.UpdateQueueNode node, final Propagator propagator,
+                                   final ReentrantAreaLock ticketLock, final ReentrantAreaLock schedulingLock,
+                                   final List<ChunkProgressionTask> scheduledTasks, final List<NewChunkHolder> changedFullStatus) {
++        // Luminol - Try rewriting update queue polling
++        if (section == null) {
++            if (node != null) {
++                this.updateQueue.remove(node);
++            }
++            return false;
++        }
++        // Luminol end
++
+         final int sectionX = section.sectionX;
+         final int sectionZ = section.sectionZ;
+ 
+@@ -334,6 +343,7 @@ public abstract class ThreadedTicketLevelPropagator {
+ 
+         // finished
+         if (node != null) {
++            node.releaseUpdating(); // Luminol - Try rewriting update queue polling
+             this.updateQueue.remove(node);
+         }
+ 
+@@ -468,7 +478,8 @@ public abstract class ThreadedTicketLevelPropagator {
+             }
+         }
+ 
+-        public UpdateQueueNode acquireNextOrWait(final long maxOrder) {
++        // Luminol start - Try rewriting update queue polling
++        /*public UpdateQueueNode acquireNextOrWait(final long maxOrder) {
+             final List<UpdateQueueNode> blocking = new ArrayList<>();
+ 
+             node_search:
+@@ -502,8 +513,63 @@ public abstract class ThreadedTicketLevelPropagator {
+                 await(blocking.get(0));
+             }
+ 
++            return null;
++        }*/
++
++        public UpdateQueueNode acquireNextOrWait(final long maxOrder) {
++            UpdateQueueNode firstConflict = null;
++            UpdateQueueNode prevProcessed = null;
++
++            for (UpdateQueueNode curr = this.getHeadAcquire(); curr != null && curr.order <= maxOrder; curr = curr.getNextVolatile()) {
++                if (curr.getSectionVolatile() == null) {
++                    continue;
++                }
++
++                if (!curr.tryAcquireUpdating()) {
++                    continue;
++                }
++
++                if (curr.getSectionVolatile() == null) {
++                    curr.releaseUpdating();
++                    continue;
++                }
++
++                boolean hasConflict = false;
++                for (UpdateQueueNode checked = prevProcessed; checked != null; checked = checked.getNextVolatile()) {
++                    if (checked != curr && curr.intersects(checked)) {
++                        hasConflict = true;
++                        break;
++                    }
++                }
++
++                if (hasConflict) {
++                    if (firstConflict == null) {
++                        firstConflict = curr;
++                    }
++                    curr.releaseUpdating();
++                    continue;
++                }
++
++                if (firstConflict != null) {
++                    this.append(firstConflict);
++                }
++
++                if (prevProcessed == null) {
++                    prevProcessed = curr;
++                } else {
++                    prevProcessed.setNextPlain(curr);
++                }
++
++                return curr;
++            }
++
++            if (firstConflict != null) {
++                this.append(firstConflict);
++            }
++
+             return null;
+         }
++        // Luminol end
+ 
+         public UpdateQueueNode peek() {
+             for (UpdateQueueNode head = this.getHeadOpaque(), curr = head;;) {
+@@ -689,6 +755,15 @@ public abstract class ThreadedTicketLevelPropagator {
+             private final boolean getAndSetUpdatingVolatile(final boolean value) {
+                 return (boolean)UPDATING_HANDLE.getAndSet(this, value);
+             }
++            // Luminol - Try rewriting update queue polling
++            public final boolean tryAcquireUpdating() {
++                return (boolean) UPDATING_HANDLE.compareAndSet(this, false, true);
++            }
++
++            public final void releaseUpdating() {
++                UPDATING_HANDLE.setVolatile(this, false);
++            }
++            // Luminol end
+         }
+     }
+ 

luminol-server/minecraft-patches/features/0028-Kaiiju-Entity-tick-and-removal-limiter.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Kaiiju Entity tick and removal limiter
 
 
 diff --git a/io/papermc/paper/threadedregions/RegionizedWorldData.java b/io/papermc/paper/threadedregions/RegionizedWorldData.java
-index c6e487a4c14e6b82533881d01f32349b9ae28728..2c747cb8a724cd25c9d724908f92b320741600de 100644
+index b8f1f042342d3fed5fa26df0de07e8e2b0937130..4d9837f11da4dc59fdb945fdb4849c4d1519f5dc 100644
 --- a/io/papermc/paper/threadedregions/RegionizedWorldData.java
 +++ b/io/papermc/paper/threadedregions/RegionizedWorldData.java
-@@ -354,6 +354,7 @@ public final class RegionizedWorldData {
+@@ -358,6 +358,7 @@ public final class RegionizedWorldData {
      private final IteratorSafeOrderedReferenceSet<Mob> navigatingMobs = new IteratorSafeOrderedReferenceSet<>();
      public final ReferenceList<Entity> trackerEntities = new ReferenceList<>(EMPTY_ENTITY_ARRAY); // Moonrise - entity tracker
      public final ReferenceList<Entity> trackerUnloadedEntities = new ReferenceList<>(EMPTY_ENTITY_ARRAY); // Moonrise - entity tracker

luminol-server/minecraft-patches/features/0029-Purpur-Use-alternative-keep-alive.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur Use alternative keep alive
 
 
 diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 6eca15223b92aedac74233db886e2c1248750e2c..7507f32b5f0f7fbbf35eeaaf03bf9d99694c1683 100644
+index f7f89695f40e4aff39d324e6a7948a8a3a8c04b3..bceef2e8cd9a84ca32f17085839dff0232f2ee31 100644
 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -41,6 +41,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -16,7 +16,7 @@ index 6eca15223b92aedac74233db886e2c1248750e2c..7507f32b5f0f7fbbf35eeaaf03bf9d99
      private int latency;
      private volatile boolean suspendFlushingOnServerThread = false;
      // CraftBukkit start
-@@ -130,6 +131,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -131,6 +132,16 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
  
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
@@ -33,7 +33,7 @@ index 6eca15223b92aedac74233db886e2c1248750e2c..7507f32b5f0f7fbbf35eeaaf03bf9d99
          if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
              int i = (int)(Util.getMillis() - this.keepAliveTime);
              this.latency = (this.latency * 3 + i) / 4;
-@@ -250,7 +261,22 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -255,7 +266,22 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
          // Paper start - give clients a longer time to respond to pings as per pre 1.12.2 timings
          // This should effectively place the keepalive handling back to "as it was" before 1.12.2
          final long elapsedTime = millis - this.keepAliveTime;
@@ -57,7 +57,7 @@ index 6eca15223b92aedac74233db886e2c1248750e2c..7507f32b5f0f7fbbf35eeaaf03bf9d99
              if (this.keepAlivePending) {
                  if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                      this.disconnect(TIMEOUT_DISCONNECTION_MESSAGE, org.bukkit.event.player.PlayerKickEvent.Cause.TIMEOUT); // Paper - kick event cause
-@@ -263,6 +289,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -268,6 +294,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
                  this.send(new ClientboundKeepAlivePacket(this.keepAliveChallenge));
              }
          }

luminol-server/minecraft-patches/features/0031-Purpur-Barrels-and-enderchests-6-rows.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur-Barrels-and-enderchests-6-rows
 
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 9bf6e8240bf15f08b037b18cfeae15ebb8ea934d..79e7fcb7949fbc8e3794d481e41d5164dea0b273 100644
+index 751b011701d6ae373099226ea63ffbafcd24ce6a..e5e946462da9e56344428139768075b7bd228ec0 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -1103,6 +1103,10 @@ public abstract class PlayerList {
@@ -20,7 +20,7 @@ index 9bf6e8240bf15f08b037b18cfeae15ebb8ea934d..79e7fcb7949fbc8e3794d481e41d5164
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index ad34d0e1ab16fb269b3cec2842bfc2f2c29b452e..40b91234fd2e4f4f134d309590ea6b605f764e83 100644
+index ae049c5c3593525b991d865fec695c00ad408a59..c6252a245e9701f69db1fe167f6590095237553a 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
 @@ -200,6 +200,7 @@ public abstract class Player extends LivingEntity {

luminol-server/minecraft-patches/features/0043-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Leaf Remove useless creating stats json bases on player name
 
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 548f7a2b0b020ff7fff27396942cc0bc9e755afe..9bf6e8240bf15f08b037b18cfeae15ebb8ea934d 100644
+index e5e946462da9e56344428139768075b7bd228ec0..9777a5b7ba9916e426ba87d6ee7cd56f0e43c195 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -1411,6 +1411,8 @@ public abstract class PlayerList {
+@@ -1420,6 +1420,8 @@ public abstract class PlayerList {
          if (serverStatsCounter == null) {
              File file = this.server.getWorldPath(LevelResource.PLAYER_STATS_DIR).toFile();
              File file1 = new File(file, uuid + ".json");
@@ -18,7 +18,7 @@ index 548f7a2b0b020ff7fff27396942cc0bc9e755afe..9bf6e8240bf15f08b037b18cfeae15eb
              if (!file1.exists()) {
                  File file2 = new File(file, displayName + ".json"); // CraftBukkit
                  Path path = file2.toPath();
-@@ -1418,6 +1420,8 @@ public abstract class PlayerList {
+@@ -1427,6 +1429,8 @@ public abstract class PlayerList {
                      file2.renameTo(file1);
                  }
              }

luminol-server/minecraft-patches/features/0044-Leaves-Revert-raid-changes.patch

@@ -1,70 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Suisuroru <qwertyuiop14077@qq.com>
-Date: Thu, 20 Feb 2025 23:56:44 +0800
-Subject: [PATCH] Leaves-Revert-raid-changes
-
-
-diff --git a/net/minecraft/world/effect/BadOmenMobEffect.java b/net/minecraft/world/effect/BadOmenMobEffect.java
-index 80f17f33f670018240c854df589cf90cdeab6e70..7976b9ae6688b9a07b2ad19d1af3670fe06a0b63 100644
---- a/net/minecraft/world/effect/BadOmenMobEffect.java
-+++ b/net/minecraft/world/effect/BadOmenMobEffect.java
-@@ -22,6 +22,11 @@ class BadOmenMobEffect extends MobEffect {
-             && !serverPlayer.isSpectator()
-             && level.getDifficulty() != Difficulty.PEACEFUL
-             && level.isVillage(serverPlayer.blockPosition())) {
-+            // Leaves start - Revert raid changes
-+            if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.trigger) {
-+                return level.getRaids().createOrExtendRaid(serverPlayer, serverPlayer.blockPosition()) != null;
-+            }
-+            // Leaves end - Revert raid changes
-             Raid raidAt = level.getRaidAt(serverPlayer.blockPosition());
-             if (raidAt == null || raidAt.getRaidOmenLevel() < raidAt.getMaxRaidOmenLevel()) {
-                 serverPlayer.addEffect(new MobEffectInstance(MobEffects.RAID_OMEN, 600, amplifier));
-diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
-index 7c385baae81b9a987c0e1e4deb017884600331bc..c2afe945d6a9780ba5f8ac5d6f0b4b2d692fdd51 100644
---- a/net/minecraft/world/entity/raid/Raider.java
-+++ b/net/minecraft/world/entity/raid/Raider.java
-@@ -125,6 +125,43 @@ public abstract class Raider extends PatrollingMonster {
- 
-                 currentRaid.removeFromRaid(this, false);
-             }
-+
-+            // Leaves start - Revert raid changes
-+            if (this.level() instanceof ServerLevel serverLevel) {
-+                if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.effect && raid == null && serverLevel.getRaidAt(this.blockPosition()) == null) {
-+                    ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
-+                    net.minecraft.world.entity.player.Player entityhuman = null;
-+                    if (entity instanceof net.minecraft.world.entity.player.Player player) {
-+                        entityhuman = player;
-+                    } else if (entity instanceof net.minecraft.world.entity.animal.Wolf wolf) {
-+                            LivingEntity entityliving = wolf.getOwner();
-+                            if (wolf.isTame() && entityliving instanceof net.minecraft.world.entity.player.Player player) {
-+                                entityhuman = player;
-+                            }
-+                    }
-+
-+                    if (entityhuman != null && !itemstack.isEmpty() && this.isCaptain()) {
-+                        net.minecraft.world.effect.MobEffectInstance mobeffect = entityhuman.getEffect(net.minecraft.world.effect.MobEffects.BAD_OMEN);
-+                        int i = 1;
-+
-+                        if (mobeffect != null) {
-+                            i += mobeffect.getAmplifier();
-+                            entityhuman.removeEffectNoUpdate(net.minecraft.world.effect.MobEffects.BAD_OMEN);
-+                            } else {
-+                            --i;
-+                        }
-+
-+                        i = net.minecraft.util.Mth.clamp(i, 0, 4);
-+                        net.minecraft.world.effect.MobEffectInstance mobeffect1 = new net.minecraft.world.effect.MobEffectInstance(net.minecraft.world.effect.MobEffects.BAD_OMEN, 120000, i, false, false, true);
-+
-+                        if (!serverLevel.getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_DISABLE_RAIDS)) {
-+                            entityhuman.addEffect(mobeffect1, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN); // CraftBukkit
-+                        }
-+                        this.setPatrolLeader(false);
-+                    }
-+                }
-+            }
-+            // Leaves end - Revert raid changes
-         }
- 
-         super.die(cause);

luminol-server/minecraft-patches/features/0047-Add-missing-teleportation-apis-for-folia.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add missing teleportation apis for folia
 
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 9fd3fe181df2ce6dbe695f6463d3940ac4c01167..822d401150d3764004b2570da828b4f69f19dcec 100644
+index b17ace9118c94a756fa2901621c6b2b9bd9e5764..8a728a3af515da522cd5fab1e731bbc0607f0596 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -1653,6 +1653,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1660,6 +1660,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
                      if (respawnComplete != null) {
                          respawnComplete.accept(ServerPlayer.this);
                      }

luminol-server/minecraft-patches/features/0048-Leaves-Disable-moved-wrongly-threshold.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Disable moved wrongly threshold
 
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a2fe9286d432909ba0cb3731a166514af768dc37..d60721767f94336eaba09b9bdb12a1420c264e49 100644
+index a107d9ee24d0e39ce3e3e09bf27af1ea4ae35b96..225045400f152a9a8f030d6fe367764b00d99b24 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -581,7 +581,7 @@ public class ServerGamePacketListenerImpl

luminol-server/minecraft-patches/features/0050-Raytracing-tracker-experiment.patch

@@ -93,10 +93,10 @@ index d9cc1d7e56c37d5ce92544edc10e89dbc89dd15d..39e7689be243b9c99b507d665f659135
      public EntityType(
          EntityType.EntityFactory<T> factory,
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index ae049c5c3593525b991d865fec695c00ad408a59..ad34d0e1ab16fb269b3cec2842bfc2f2c29b452e 100644
+index c6252a245e9701f69db1fe167f6590095237553a..40b91234fd2e4f4f134d309590ea6b605f764e83 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
-@@ -210,6 +210,25 @@ public abstract class Player extends LivingEntity {
+@@ -211,6 +211,25 @@ public abstract class Player extends LivingEntity {
          return (org.bukkit.craftbukkit.entity.CraftHumanEntity) super.getBukkitEntity();
      }
      // CraftBukkit end
@@ -122,7 +122,7 @@ index ae049c5c3593525b991d865fec695c00ad408a59..ad34d0e1ab16fb269b3cec2842bfc2f2
  
      public Player(Level level, BlockPos pos, float yRot, GameProfile gameProfile) {
          super(EntityType.PLAYER, level);
-@@ -262,6 +281,26 @@ public abstract class Player extends LivingEntity {
+@@ -263,6 +282,26 @@ public abstract class Player extends LivingEntity {
  
      @Override
      public void tick() {
@@ -149,7 +149,7 @@ index ae049c5c3593525b991d865fec695c00ad408a59..ad34d0e1ab16fb269b3cec2842bfc2f2
          this.noPhysics = this.isSpectator();
          if (this.isSpectator() || this.isPassenger()) {
              this.setOnGround(false);
-@@ -1504,6 +1543,7 @@ public abstract class Player extends LivingEntity {
+@@ -1505,6 +1544,7 @@ public abstract class Player extends LivingEntity {
          if (this.containerMenu != null && this.hasContainerOpen()) {
              this.doCloseContainer();
          }

luminol-server/minecraft-patches/features/0051-Correct-isWatched-method-in-ScheduledTaskThreadPool.patch

@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <mrhua269@gmail.com>
+Date: Fri, 4 Apr 2025 08:17:32 +0800
+Subject: [PATCH] Correct isWatched method in ScheduledTaskThreadPool
+
+
+diff --git a/io/papermc/paper/threadedregions/ScheduledTaskThreadPool.java b/io/papermc/paper/threadedregions/ScheduledTaskThreadPool.java
+index 5c591b0d6eac45d6094ce44bf62ad976bf995e66..287d8b929d1c0802705a7ff276e4146682203061 100644
+--- a/io/papermc/paper/threadedregions/ScheduledTaskThreadPool.java
++++ b/io/papermc/paper/threadedregions/ScheduledTaskThreadPool.java
+@@ -1229,7 +1229,7 @@ public final class ScheduledTaskThreadPool {
+         }
+ 
+         public boolean isWatched() {
+-            return (boolean)TAKEN_HANDLE.getVolatile(this);
++            return (boolean)WATCHED_HANDLE.getVolatile(this); // Luminol - Try fixing scheduling call issue
+         }
+ 
+         public long getLastTaskNotify() {

luminol-server/minecraft-patches/features/0052-Leaves-Revert-raid-changes.patch

@@ -0,0 +1,105 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Fri, 11 Apr 2025 16:53:57 +0800
+Subject: [PATCH] Leaves-Revert-raid-changes
+
+
+diff --git a/net/minecraft/world/effect/BadOmenMobEffect.java b/net/minecraft/world/effect/BadOmenMobEffect.java
+index 80f17f33f670018240c854df589cf90cdeab6e70..8672757a4d5fb5c247599782fece6b8d7d6ec921 100644
+--- a/net/minecraft/world/effect/BadOmenMobEffect.java
++++ b/net/minecraft/world/effect/BadOmenMobEffect.java
+@@ -22,6 +22,11 @@ class BadOmenMobEffect extends MobEffect {
+             && !serverPlayer.isSpectator()
+             && level.getDifficulty() != Difficulty.PEACEFUL
+             && level.isVillage(serverPlayer.blockPosition())) {
++            // Leaves start - Revert raid changes
++            if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.trigger) {
++                return level.getRaids().createOrExtendRaid(serverPlayer, serverPlayer.blockPosition()) == null;
++            }
++            // Leaves end - Revert raid changes
+             Raid raidAt = level.getRaidAt(serverPlayer.blockPosition());
+             if (raidAt == null || raidAt.getRaidOmenLevel() < raidAt.getMaxRaidOmenLevel()) {
+                 serverPlayer.addEffect(new MobEffectInstance(MobEffects.RAID_OMEN, 600, amplifier));
+diff --git a/net/minecraft/world/entity/raid/Raid.java b/net/minecraft/world/entity/raid/Raid.java
+index 2f45befbb50645f1bfb5961ad725f3670ff0d592..84c6eb2c27510938f590f6c6baa5a94c4c08c4ad 100644
+--- a/net/minecraft/world/entity/raid/Raid.java
++++ b/net/minecraft/world/entity/raid/Raid.java
+@@ -674,7 +674,7 @@ public class Raid {
+             int i2 = this.center.getX() + Mth.floor(Mth.cos(f2) * 32.0F * f) + this.level.random.nextInt(3) * Mth.floor(f);
+             int i3 = this.center.getZ() + Mth.floor(Mth.sin(f2) * 32.0F * f) + this.level.random.nextInt(3) * Mth.floor(f);
+             int height = this.level.getHeight(Heightmap.Types.WORLD_SURFACE, i2, i3);
+-            if (Mth.abs(height - this.center.getY()) <= 96) {
++            if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.height_check || Mth.abs(height - this.center.getY()) <= 96) { // Disable height check
+                 mutableBlockPos.set(i2, height, i3);
+                 if (!this.level.isVillage(mutableBlockPos) || i <= 7) {
+                     int i4 = 10;
+diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
+index 7c385baae81b9a987c0e1e4deb017884600331bc..a0d86c3cc86da734a3cd10d554aaecb5c0b82e59 100644
+--- a/net/minecraft/world/entity/raid/Raider.java
++++ b/net/minecraft/world/entity/raid/Raider.java
+@@ -125,6 +125,43 @@ public abstract class Raider extends PatrollingMonster {
+ 
+                 currentRaid.removeFromRaid(this, false);
+             }
++
++            // Leaves start - Revert raid changes
++            if (this.level() instanceof ServerLevel serverLevel) {
++                if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.effect && !this.hasRaid()) {
++                    ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
++                    net.minecraft.world.entity.player.Player entityhuman = null;
++                    if (entity instanceof net.minecraft.world.entity.player.Player player) {
++                        entityhuman = player;
++                    } else if (entity instanceof net.minecraft.world.entity.animal.Wolf wolf) {
++                        LivingEntity entityliving = wolf.getOwner();
++                        if (wolf.isTame() && entityliving instanceof net.minecraft.world.entity.player.Player player) {
++                            entityhuman = player;
++                        }
++                    }
++
++                    if (entityhuman != null && !itemstack.isEmpty() && this.isCaptain()) {
++                        net.minecraft.world.effect.MobEffectInstance mobeffect = entityhuman.getEffect(net.minecraft.world.effect.MobEffects.BAD_OMEN);
++                        int i = 1;
++
++                        if (mobeffect != null) {
++                            i += mobeffect.getAmplifier();
++                            entityhuman.removeEffectNoUpdate(net.minecraft.world.effect.MobEffects.BAD_OMEN);
++                            } else {
++                            --i;
++                        }
++
++                        i = net.minecraft.util.Mth.clamp(i, 0, 4);
++                        net.minecraft.world.effect.MobEffectInstance mobeffect1 = new net.minecraft.world.effect.MobEffectInstance(net.minecraft.world.effect.MobEffects.BAD_OMEN, me.earthme.luminol.config.modules.misc.RaidChangesConfig.infinite ? net.minecraft.world.effect.MobEffectInstance.INFINITE_DURATION : 120000, i, false, false, true);
++
++                        if (!serverLevel.getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_DISABLE_RAIDS)) {
++                            entityhuman.addEffect(mobeffect1, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN); // CraftBukkit
++                        }
++                        this.setPatrolLeader(false);
++                    }
++                }
++            }
++            // Leaves end - Revert raid changes
+         }
+ 
+         super.die(cause);
+diff --git a/net/minecraft/world/item/component/OminousBottleAmplifier.java b/net/minecraft/world/item/component/OminousBottleAmplifier.java
+index 318f24d67be4daf6993ba547da0540be9c221a75..9a6820fce3977419fd81d802720c318ac15d07c4 100644
+--- a/net/minecraft/world/item/component/OminousBottleAmplifier.java
++++ b/net/minecraft/world/item/component/OminousBottleAmplifier.java
+@@ -28,7 +28,7 @@ public record OminousBottleAmplifier(int value) implements ConsumableListener, T
+ 
+     @Override
+     public void onConsume(Level level, LivingEntity entity, ItemStack stack, Consumable consumable) {
+-        entity.addEffect(new MobEffectInstance(MobEffects.BAD_OMEN, 120000, this.value, false, false, true)); // Paper - properly resend entities - diff on change for below
++        entity.addEffect(new MobEffectInstance(MobEffects.BAD_OMEN, me.earthme.luminol.config.modules.misc.RaidChangesConfig.infinite ? net.minecraft.world.effect.MobEffectInstance.INFINITE_DURATION : 120000, this.value, false, false, true)); // Paper - properly resend entities - diff on change for below
+     }
+ 
+     // Paper start - properly resend entities - collect packets for bundle
+@@ -40,7 +40,7 @@ public record OminousBottleAmplifier(int value) implements ConsumableListener, T
+ 
+     @Override
+     public void addToTooltip(Item.TooltipContext context, Consumer<Component> tooltipAdder, TooltipFlag tooltipFlag) {
+-        List<MobEffectInstance> list = List.of(new MobEffectInstance(MobEffects.BAD_OMEN, 120000, this.value, false, false, true));
++        List<MobEffectInstance> list = List.of(new MobEffectInstance(MobEffects.BAD_OMEN, me.earthme.luminol.config.modules.misc.RaidChangesConfig.infinite ? net.minecraft.world.effect.MobEffectInstance.INFINITE_DURATION : 120000, this.value, false, false, true));
+         PotionContents.addPotionTooltip(list, tooltipAdder, 1.0F, context.tickRate());
+     }
+ }

luminol-server/minecraft-patches/features/0053-Disable-Heightmap-Warning.patch

@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 13 Apr 2025 11:07:04 +0800
+Subject: [PATCH] Disable Heightmap Warning
+
+
+diff --git a/net/minecraft/world/level/levelgen/Heightmap.java b/net/minecraft/world/level/levelgen/Heightmap.java
+index 3b27bcfbbe0529d1526adc30760c846b4011645f..95747ae41cea0d4b577c58ef44959a18e0a46672 100644
+--- a/net/minecraft/world/level/levelgen/Heightmap.java
++++ b/net/minecraft/world/level/levelgen/Heightmap.java
+@@ -123,7 +123,8 @@ public class Heightmap {
+         if (raw.length == data.length) {
+             System.arraycopy(data, 0, raw, 0, data.length);
+         } else {
+-            LOGGER.warn("Ignoring heightmap data for chunk " + chunk.getPos() + ", size does not match; expected: " + raw.length + ", got: " + data.length);
++            if (!me.earthme.luminol.config.modules.misc.DisableHeightmapWarnConfig.enabled)
++                LOGGER.warn("Ignoring heightmap data for chunk " + chunk.getPos() + ", size does not match; expected: " + raw.length + ", got: " + data.length);
+             primeHeightmaps(chunk, EnumSet.of(type));
+         }
+     }

luminol-server/minecraft-patches/sources/net/minecraft/server/Main.java.patch

@@ -1,10 +0,0 @@
---- a/net/minecraft/server/Main.java
-+++ b/net/minecraft/server/Main.java
-@@ -108,6 +_,7 @@
-                 JvmProfiler.INSTANCE.start(Environment.SERVER);
-             }
- 
-+            me.earthme.luminol.config.LuminolConfig.preLoadConfig(); // Luminol - Luminol config
-             io.papermc.paper.plugin.PluginInitializerManager.load(optionSet); // Paper
-             Bootstrap.bootStrap();
-             Bootstrap.validate();

luminol-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch

@@ -1,11 +0,0 @@
---- a/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -212,6 +_,8 @@
-         this.paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
-         this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
-         // Paper end - initialize global and world-defaults configuration
-+        me.earthme.luminol.config.LuminolConfig.finalizeLoadConfig(); //Luminol - load config file
-+        me.earthme.luminol.config.LuminolConfig.setupLatch(); //Luminol - load config file
-         this.server.spark.enableEarlyIfRequested(); // Paper - spark
-         // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
-         if (this.convertOldUsers()) {

luminol-server/paper-patches/features/0004-Add-tpsbar-with-chunkhot-membar-and-region-bar.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <wangxyper@163.com>
-Date: Tue, 11 Feb 2025 11:57:22 +0800
+From: MrHua269 <mrhua269@gmail.com>
+Date: Sat, 22 Mar 2025 09:24:55 +0800
 Subject: [PATCH] Add tpsbar with chunkhot membar and region bar
 
 
@@ -22,10 +22,10 @@ index de8b9048c8395c05b8688bc9d984b8ad680f15b3..f42692cd4f0154705c3d5b030d281cfc
 +    // KioCG end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c9afcd46f6a1b74b82ed68f1df6188369cf53a73..7cb95021f547c94eae7cef0bf5b2d8dff0a04937 100644
+index 512ef437119041b33b62ef4675bdd1b27fd9a403..628211a282ef0553a0229b6cadacd2727d967873 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2404,6 +2404,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2442,6 +2442,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  handle.expToDrop = data.getInt("expToDrop");
                  handle.keepLevel = data.getBoolean("keepLevel");
              }
@@ -41,7 +41,7 @@ index c9afcd46f6a1b74b82ed68f1df6188369cf53a73..7cb95021f547c94eae7cef0bf5b2d8df
          }
      }
  
-@@ -2425,6 +2434,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2463,6 +2472,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          data.putLong("lastPlayed", System.currentTimeMillis());
          data.putString("lastKnownName", handle.getScoreboardName());
  
@@ -57,9 +57,9 @@ index c9afcd46f6a1b74b82ed68f1df6188369cf53a73..7cb95021f547c94eae7cef0bf5b2d8df
          // Paper start - persist for use in offline save data
          if (!nbttagcompound.contains("Paper")) {
              nbttagcompound.put("Paper", new CompoundTag());
-@@ -3618,4 +3636,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     public void setDeathScreenScore(final int score) {
-         getHandle().setScore(score);
+@@ -3672,4 +3690,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+     public void setSimplifyContainerDesyncCheck(final boolean simplifyContainerDesyncCheck) {
+         this.simplifyContainerDesyncCheck = simplifyContainerDesyncCheck;
      }
 +
 +    // KioCG start - ChunkHot

luminol-server/paper-patches/features/0005-Force-disable-builtin-spark-plugin.patch

@@ -18,7 +18,7 @@ index a0b84535a9d3833d4df692b85b272f145559dd80..c2ba46408b5ad727d7a17f21d47b2898
              return;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6c2d9c9621f665412f1a8ccc41083fb0e3a07ed5..fb0ba43c8102a205d1402f53d47823672d2edfbe 100644
+index 935ac76cec67ea661a392ff02396aa7aefd56268..58275b09c75b9913c2249c5c8190027143121070 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -314,7 +314,7 @@ public final class CraftServer implements Server {

luminol-server/paper-patches/features/0008-SparklyPaper-Optimize-canSee-checks.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] SparklyPaper Optimize canSee checks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7cb95021f547c94eae7cef0bf5b2d8dff0a04937..b80795605a61cb0d7aa9fa7eec960d9a13d8c030 100644
+index 628211a282ef0553a0229b6cadacd2727d967873..583c2acc6d620b4411c65c2b285d323d7c9c1b98 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -214,7 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -210,7 +210,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private boolean hasPlayedBefore = false;
      private final ConversationTracker conversationTracker = new ConversationTracker();
      private final Set<String> channels = new HashSet<String>();
@@ -17,7 +17,7 @@ index 7cb95021f547c94eae7cef0bf5b2d8dff0a04937..b80795605a61cb0d7aa9fa7eec960d9a
      private final Set<UUID> unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player
      private static final WeakHashMap<Plugin, WeakReference<Plugin>> pluginWeakReferences = new WeakHashMap<>();
      private int hash = 0;
-@@ -2268,9 +2268,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2306,9 +2306,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(org.bukkit.entity.Entity entity) {

luminol-server/paper-patches/features/0010-Leaf-Secure-seed-and-matter-seed-command.patch

@@ -23,7 +23,7 @@ index f42692cd4f0154705c3d5b030d281cfc333803ed..39cc976f65f826a00e2e637c139f9134
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fb0ba43c8102a205d1402f53d47823672d2edfbe..d8627561b5ffec33e0c42974aa5e3d421c8cfac2 100644
+index 58275b09c75b9913c2249c5c8190027143121070..cb406334c316aaf7fc66060b90781eaace883c01 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1423,7 +1423,11 @@ public final class CraftServer implements Server {

luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/DisableHeightmapWarnConfig.java.patch

@@ -0,0 +1,25 @@
+--- /dev/null
++++ b/src/main/java/me/earthme/luminol/config/modules/misc/DisableHeightmapWarnConfig.java
+@@ -1,0 +_,22 @@
++package me.earthme.luminol.config.modules.misc;
++
++import me.earthme.luminol.config.ConfigInfo;
++import me.earthme.luminol.config.EnumConfigCategory;
++import me.earthme.luminol.config.IConfigModule;
++
++public class DisableHeightmapWarnConfig implements IConfigModule {
++    @ConfigInfo(baseName = "enabled", comments =
++            """
++                    Disable heightmap-check's warning""")
++    public static boolean enabled = false;
++
++    @Override
++    public EnumConfigCategory getCategory() {
++        return EnumConfigCategory.MISC;
++    }
++
++    @Override
++    public String getBaseName() {
++        return "heightmap_warn_disable";
++    }
++}

luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java.patch

@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java
-@@ -1,0 +_,31 @@
+@@ -1,0 +_,41 @@
 +package me.earthme.luminol.config.modules.misc;
 +
 +import me.earthme.luminol.config.ConfigInfo;
@@ -11,7 +11,7 @@
 +    @ConfigInfo(baseName = "allow-bad-omen-trigger-raid", comments =
 +            """
 +                    Allow players with ominous signs to\s
-+                    skip a 30 second cooldown and trigger\s
++                    skip a 30-second cooldown and trigger\s
 +                    attacks directly""")
 +    public static boolean trigger = false;
 +
@@ -20,7 +20,17 @@
 +                    Enable players to obtain an ominous\s
 +                    omen effect when killing the patrol\s
 +                    team captain""")
-+    public static boolean effect = false;;
++    public static boolean effect = false;
++
++    @ConfigInfo(baseName = "bad-omen-infinite", comments =
++            """
++                    Enable bad omen effect infinite time.""")
++    public static boolean infinite = false;
++
++    @ConfigInfo(baseName = "skip-height-check", comments =
++            """
++                    Disable y <= 96 check.""")
++    public static boolean height_check = false;
 +
 +    @Override
 +    public EnumConfigCategory getCategory() {

scripts/SetENV.sh

@@ -11,13 +11,10 @@ grdversion=$(prop version)
 preVersion=$(prop preVersion)
 release_tag="$mcversion-$commitid"
 jarName="$project_id-$mcversion-paperclip.jar"
-jarName_bundler="$project_id-$mcversion-bundler.jar"
 jarName_dir="luminol-server/build/libs/$jarName"
-jarName_bundler_dir="luminol-server/build/libs/$jarName_bundler"
 make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true")
 
 mv luminol-server/build/libs/$project_id-paperclip-$grdversion-mojmap.jar $jarName_dir
-mv luminol-server/build/libs/$project_id-bundler-$grdversion-mojmap.jar $jarName_bundler_dir
 
 echo "project_id=$project_id" >> $GITHUB_ENV
 echo "project_id_b=$project_id_b" >> $GITHUB_ENV
@@ -28,5 +25,4 @@ echo "pre=$preVersion" >> $GITHUB_ENV
 echo "tag=$release_tag" >> $GITHUB_ENV
 echo "jar=$jarName" >> $GITHUB_ENV
 echo "jar_dir=$jarName_dir" >> $GITHUB_ENV
-echo "jar_dir_bundler=$jarName_bundler_dir" >> $GITHUB_ENV
 echo "make_latest=$make_latest" >> $GITHUB_ENV