feat: move up some patches to downstream - lophine

luminol-server/minecraft-patches/features/0001-Add-config-for-command-block-command-execution.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <wangxyper@163.com>
-Date: Sun, 12 Jan 2025 10:36:31 +0800
-Subject: [PATCH] Add config for command block command execution
-
-
-diff --git a/net/minecraft/world/level/BaseCommandBlock.java b/net/minecraft/world/level/BaseCommandBlock.java
-index 91e30f9c83259abc0589f4ee69c429cd4305d6ea..21a22d6fca111dd6a8cd4c7a6f994aa87d06feb4 100644
---- a/net/minecraft/world/level/BaseCommandBlock.java
-+++ b/net/minecraft/world/level/BaseCommandBlock.java
-@@ -102,7 +102,7 @@ public abstract class BaseCommandBlock implements CommandSource {
-     }
- 
-     public boolean performCommand(Level level) {
--        if (true) return false; // Folia - region threading
-+        if (!me.earthme.luminol.config.modules.experiment.CommandBlockConfig.enabled) return false; // Folia - region threading // Luminol
-         if (level.isClientSide || level.getGameTime() == this.lastExecution) {
-             return false;
-         } else if ("Searge".equalsIgnoreCase(this.command)) {

luminol-server/minecraft-patches/features/0007-Add-config-for-vanilla-random.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for vanilla random
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 414be522896c63c34100199177788d71e8f2d326..bf177d9f7e5d9f643d13fcb9ea23686fd0f32dc5 100644
+index 8357e4a3f381014b976067d8ed06fc073d23db44..b5838a0320c729778f27f0d6a623eed4ef7c3a52 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -261,7 +261,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

luminol-server/minecraft-patches/features/0010-Add-config-to-disable-end-crystal-check.patch

@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Wed, 21 May 2025 13:04:00 +0800
-Subject: [PATCH] Add config to disable end crystal check
-
-
-diff --git a/net/minecraft/world/level/dimension/end/EndDragonFight.java b/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 4fa8371c212dcc02b8cf5fd267b736e1cf3f50c1..e80afd034eba10c9adaa5df776c728253e874af4 100644
---- a/net/minecraft/world/level/dimension/end/EndDragonFight.java
-+++ b/net/minecraft/world/level/dimension/end/EndDragonFight.java
-@@ -547,6 +547,8 @@ public class EndDragonFight {
- 
-                 blockPos = this.portalLocation;
-             }
-+            // Luminol start - Disable end crystal check
-+            if (!me.earthme.luminol.config.modules.misc.DisableEndCrystalCheckConfig.disableEndCrystalCheck) {
-             // Paper start - Perf: Do crystal-portal proximity check before entity lookup
-             if (placedEndCrystalPos != null) {
-                 // The end crystal must be 0 or 1 higher than the portal origin
-@@ -562,6 +564,7 @@ public class EndDragonFight {
-                 }
-             }
-             // Paper end - Perf: Do crystal-portal proximity check before entity lookup
-+            } // Luminol end - Disable end crystal check
- 
- 
-             List<EndCrystal> list = Lists.newArrayList();

luminol-server/minecraft-patches/features/0013-Add-config-to-enable-tick-command.patch

@@ -1,167 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Thu, 1 May 2025 22:43:08 +0800
-Subject: [PATCH] Add config to enable tick command
-
-
-diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java
-index 8e91ec81128bdbd5f78e1f04fe17bcbd6e5dc280..55476f0d4898c67e433dcee769a5cf8bd6109930 100644
---- a/io/papermc/paper/threadedregions/RegionizedServer.java
-+++ b/io/papermc/paper/threadedregions/RegionizedServer.java
-@@ -299,6 +299,11 @@ public final class RegionizedServer {
-         this.randomWalk();
-          */
-         ++this.tickCount;
-+        // Luminol start - Add a config to enable tick command
-+        if (me.earthme.luminol.config.modules.experiment.CommandTickConfig.enabled) {
-+            MinecraftServer.tickRateManager.tick();
-+        }
-+        // Luminol end - Add a config to enable tick command
-         // expire invalid click command callbacks
-         io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue((int)this.tickCount);
- 
-@@ -321,6 +326,13 @@ public final class RegionizedServer {
-             this.globalTick(world, tickCount);
-         }
- 
-+        // Luminol start - Add a config to enable tick command
-+        if (me.earthme.luminol.config.modules.experiment.CommandTickConfig.enabled) {
-+            MinecraftServer.tickRateManager.reduceSprintTicks();
-+            MinecraftServer.tickRateManager.endTickWork();
-+        }
-+        // Luminol end - Add a config to enable tick command
-+
-         // tick connections
-         this.tickConnections();
- 
-@@ -454,7 +466,7 @@ public final class RegionizedServer {
-     }
- 
-     private void tickTime(final ServerLevel world, final int tickCount) {
--        if (world.tickTime) {
-+        if ((!me.earthme.luminol.config.modules.experiment.CommandTickConfig.enabled || world.tickRateManager().runsNormally()) && world.tickTime) { // Luminol - Add a config to enable tick command
-             if (world.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
-                 world.setDayTime(world.levelData.getDayTime() + (long)tickCount);
-             }
-diff --git a/io/papermc/paper/threadedregions/TickRegionScheduler.java b/io/papermc/paper/threadedregions/TickRegionScheduler.java
-index 7123b3eb2f2e52946b8ef9de993a6828eb0bb6f7..82948984404a183711588932a4a026dc4c241feb 100644
---- a/io/papermc/paper/threadedregions/TickRegionScheduler.java
-+++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java
-@@ -31,8 +31,8 @@ public final class TickRegionScheduler {
-         }
-     }
- 
--    public static final int TICK_RATE = 20;
--    public static final long TIME_BETWEEN_TICKS = 1_000_000_000L / TICK_RATE; // ns
-+    public static float TICK_RATE = 20; // Luminol - Add tick command support
-+    public static long TIME_BETWEEN_TICKS = (long) (1_000_000_000L / TICK_RATE); // ns // Luminol - Add tick command support
- 
-     // Folia start - watchdog
-     public static final FoliaWatchdogThread WATCHDOG_THREAD = new FoliaWatchdogThread();
-@@ -375,8 +375,23 @@ public final class TickRegionScheduler {
-             final long cpuStart = MEASURE_CPU_TIME ? THREAD_MX_BEAN.getCurrentThreadCpuTime() : 0L;
-             final long tickStart = System.nanoTime();
- 
--            // use max(), don't assume that tickStart >= scheduledStart
--            final int tickCount = Math.max(1, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
-+            // Luminol start - Add a config to enable tick command
-+            final int tickCount;
-+            if (me.earthme.luminol.config.modules.experiment.CommandTickConfig.enabled) {
-+                if (MinecraftServer.tickRateManager.isSprinting() && MinecraftServer.tickRateManager.checkShouldSprintThisTick()) {
-+                    TICK_RATE = net.minecraft.server.commands.TickCommand.MAX_TICKRATE;
-+                    TIME_BETWEEN_TICKS = (long) (1_000_000_000L / TICK_RATE);
-+                    tickCount = 1;
-+                } else {
-+                    TICK_RATE = MinecraftServer.tickRateManager.tickrate();
-+                    TIME_BETWEEN_TICKS = (long) (1_000_000_000L / TICK_RATE);
-+                    tickCount = Math.max(1, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
-+                }
-+            } else {
-+                // use max(), don't assume that tickStart >= scheduledStart
-+                tickCount = Math.max(1, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
-+            }
-+            // Luminol end - Add tick command support
- 
-             if (!this.tryMarkTicking()) {
-                 if (!this.cancelled.get()) {
-@@ -416,6 +431,11 @@ public final class TickRegionScheduler {
-             try {
-                 // next start isn't updated until the end of this tick
-                 this.tickRegion(tickCount, tickStart, scheduledEnd);
-+                // Luminol start - Add a config to enable tick command
-+                if (me.earthme.luminol.config.modules.experiment.CommandTickConfig.enabled) {
-+                    MinecraftServer.tickRateManager.endTickWork();
-+                }
-+                // Luminol end - Add a config to enable tick command
-             } catch (final Throwable thr) {
-                 this.scheduler.regionFailed(this, false, thr);
-                 // regionFailed will schedule a shutdown, so we should avoid letting this region tick further
-diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index 4e3bfa25ec4917d2bca594b050e38be3bdea077b..fca716bf52e114b196c7617f352e9394c7185271 100644
---- a/net/minecraft/commands/Commands.java
-+++ b/net/minecraft/commands/Commands.java
-@@ -212,7 +212,11 @@ public class Commands {
-         TeleportCommand.register(this.dispatcher);
-         TellRawCommand.register(this.dispatcher, context);
-         //TestCommand.register(this.dispatcher, context); // Folia - region threading
--        //TickCommand.register(this.dispatcher); // Folia - region threading - TODO later
-+        // Luminol start - Add a config to enable tick command
-+        if (me.earthme.luminol.config.modules.experiment.CommandTickConfig.enabled) {
-+            TickCommand.register(this.dispatcher); // Folia - region threading - TODO later
-+        }
-+        // Luminol end - Add a config to enable tick command
-         TimeCommand.register(this.dispatcher);
-         TitleCommand.register(this.dispatcher, context);
-         //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
-diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index db435869dd2a2dfe0c36c62e46e5389170cfb0cd..a90ac07eaea956cb7c50b66a27dd47c955f98feb 100644
---- a/net/minecraft/server/MinecraftServer.java
-+++ b/net/minecraft/server/MinecraftServer.java
-@@ -266,7 +266,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     private String serverId;
-     public MinecraftServer.ReloadableResources resources;
-     private final StructureTemplateManager structureTemplateManager;
--    private final ServerTickRateManager tickRateManager;
-+    public static ServerTickRateManager tickRateManager; // Luminol - Add tick command support
-     protected WorldData worldData;
-     public PotionBrewing potionBrewing;
-     private FuelValues fuelValues;
-diff --git a/net/minecraft/server/ServerTickRateManager.java b/net/minecraft/server/ServerTickRateManager.java
-index 40338efd1c0e56d869d03f1d0687e7ff0fcbf11a..d0d90a25a10bbecfffceee1992af88c60d14fd87 100644
---- a/net/minecraft/server/ServerTickRateManager.java
-+++ b/net/minecraft/server/ServerTickRateManager.java
-@@ -105,7 +105,7 @@ public class ServerTickRateManager extends TickRateManager {
-             return false;
-         } else if (this.remainingSprintTicks > 0L) {
-             this.sprintTickStartTime = System.nanoTime();
--            this.remainingSprintTicks--;
-+            // this.remainingSprintTicks--; // Luminol - Add tick command support
-             return true;
-         } else {
-             this.finishTickSprint();
-@@ -113,6 +113,12 @@ public class ServerTickRateManager extends TickRateManager {
-         }
-     }
- 
-+    // Luminol start - Add tick command support
-+    public void reduceSprintTicks() {
-+        this.remainingSprintTicks--;
-+    }
-+    // Luminol end - Add tick command support
-+
-     public void endTickWork() {
-         this.sprintTimeSpend = this.sprintTimeSpend + (System.nanoTime() - this.sprintTickStartTime);
-     }
-diff --git a/net/minecraft/server/commands/TickCommand.java b/net/minecraft/server/commands/TickCommand.java
-index 6b6c8ce49eda6806c8288d70848dd143ba2c4703..5d09d2c8bb45cc10b2a13100793249adc7b5a7e9 100644
---- a/net/minecraft/server/commands/TickCommand.java
-+++ b/net/minecraft/server/commands/TickCommand.java
-@@ -14,7 +14,7 @@ import net.minecraft.server.ServerTickRateManager;
- import net.minecraft.util.TimeUtil;
- 
- public class TickCommand {
--    private static final float MAX_TICKRATE = 10000.0F;
-+    public static final float MAX_TICKRATE = 10000.0F; // Luminol - Add tick command support
-     private static final String DEFAULT_TICKRATE = String.valueOf(20);
- 
-     public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {

luminol-server/minecraft-patches/features/0013-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 a90ac07eaea956cb7c50b66a27dd47c955f98feb..ecf185fce582a542c65a9544388b84835643978b 100644
+index db435869dd2a2dfe0c36c62e46e5389170cfb0cd..b437132634f636f4c1d76c86146f377090b5fdb2 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -978,10 +978,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

luminol-server/minecraft-patches/features/0015-Add-config-to-revert-raid-changes.patch

@@ -1,204 +0,0 @@
-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] Add config to 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 dbb207c638a64b733dc21704033ff55ca1f44f1d..8401b3e9968e48c7a936386f3290315091501d4f 100644
---- a/net/minecraft/world/entity/raid/Raid.java
-+++ b/net/minecraft/world/entity/raid/Raid.java
-@@ -340,7 +340,20 @@ public class Raid {
-                         }
- 
-                         if (flag1) {
--                            this.waveSpawnPos = this.getValidSpawnPos(level);
-+                            // Luminol Start - Raid revert
-+                            if (!me.earthme.luminol.config.modules.misc.RaidChangesConfig.posRevert) {
-+                                this.waveSpawnPos = this.getValidSpawnPos(level);
-+                            } else {
-+                                int n4 = 0;
-+                                if (this.raidCooldownTicks < 100) {
-+                                    n4 = 1;
-+                                }
-+                                if (this.raidCooldownTicks < 40) {
-+                                    n4 = 2;
-+                                }
-+                                this.waveSpawnPos = this.getValidSpawnPos(level, n4);
-+                            }
-+                            // Luminol End - Raid revert
-                         }
- 
-                         if (this.raidCooldownTicks == 300 || this.raidCooldownTicks % 20 == 0) {
-@@ -375,7 +388,14 @@ public class Raid {
-                 int i = 0;
- 
-                 while (this.shouldSpawnGroup()) {
--                    BlockPos blockPos = this.waveSpawnPos.orElseGet(() -> this.findRandomSpawnPos(level, 20));
-+                    // Luminol Start - Raid revert
-+                    BlockPos blockPos;
-+                    if (!me.earthme.luminol.config.modules.misc.RaidChangesConfig.posRevert) {
-+                        blockPos = this.waveSpawnPos.orElseGet(() -> this.findRandomSpawnPos(level, 20));
-+                    } else {
-+                        blockPos = this.waveSpawnPos.isPresent() ? this.waveSpawnPos.get() : this.findRandomSpawnPos(level, i, 20);
-+                    }
-+                    // Luminol End - Raid revert
-                     if (blockPos != null) {
-                         this.started = true;
-                         this.spawnGroup(level, blockPos);
-@@ -387,7 +407,7 @@ public class Raid {
-                         i++;
-                     }
- 
--                    if (i > 5) {
-+                    if (i > (me.earthme.luminol.config.modules.misc.RaidChangesConfig.posRevert ? 3 : 5)) { // Luminol - Raid revert
-                         org.bukkit.craftbukkit.event.CraftEventFactory.callRaidStopEvent(level, this, org.bukkit.event.raid.RaidStopEvent.Reason.UNSPAWNABLE); // CraftBukkit
-                         this.stop();
-                         break;
-@@ -458,6 +478,17 @@ public class Raid {
-         return blockPos != null ? Optional.of(blockPos) : Optional.empty();
-     }
- 
-+    // Luminol Start - Raid revert
-+    private Optional<BlockPos> getValidSpawnPos(ServerLevel level, int n) {
-+        for (int i = 0; i < 3; ++i) {
-+            BlockPos blockPos = this.findRandomSpawnPos(level, n, 1);
-+            if (blockPos == null) continue;
-+            return Optional.of(blockPos);
-+        }
-+        return Optional.empty();
-+    }
-+    // Luminol End - Raid revert
-+
-     private boolean hasMoreWaves() {
-         return this.hasBonusWave() ? !this.hasSpawnedBonusWave() : !this.isFinalWave();
-     }
-@@ -683,7 +714,7 @@ public class Raid {
-             int i2 = this.center.getX() + Mth.floor(Mth.cos(f2) * 32.0F * f) + level.random.nextInt(3) * Mth.floor(f);
-             int i3 = this.center.getZ() + Mth.floor(Mth.sin(f2) * 32.0F * f) + level.random.nextInt(3) * Mth.floor(f);
-             int height = level.getHeight(Heightmap.Types.WORLD_SURFACE, i2, i3);
--            if (Mth.abs(height - this.center.getY()) <= 96) {
-+            if (me.earthme.luminol.config.modules.misc.RaidChangesConfig.heightCheck || Mth.abs(height - this.center.getY()) <= 96) { // Leaves - Disable height check
-                 mutableBlockPos.set(i2, height, i3);
-                 if (!level.isVillage(mutableBlockPos) || i <= 7) {
-                     int i4 = 10;
-@@ -702,6 +733,26 @@ public class Raid {
-         return null;
-     }
- 
-+    // Luminol Start - Raid revert
-+    @Nullable
-+    private BlockPos findRandomSpawnPos(ServerLevel level, int n, int n2) {
-+        int n3 = 2 - n;
-+        BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
-+        SpawnPlacementType spawnPlacementType = SpawnPlacements.getPlacementType(EntityType.RAVAGER);
-+        for (int i = 0; i < n2; ++i) {
-+            float f = level.random.nextFloat() * ((float)Math.PI * 2);
-+            int n4 = this.center.getX() + Mth.floor(Mth.cos(f) * 32.0f * (float)n3) + level.random.nextInt(5);
-+            int n5 = this.center.getZ() + Mth.floor(Mth.sin(f) * 32.0f * (float)n3) + level.random.nextInt(5);
-+            int n6 = level.getHeight(Heightmap.Types.WORLD_SURFACE, n4, n5);
-+            mutableBlockPos.set(n4, n6, n5);
-+            if (level.isVillage(mutableBlockPos) && n < 2) continue;
-+            if (!level.hasChunksAt(mutableBlockPos.getX() - 10, mutableBlockPos.getZ() - 10, mutableBlockPos.getX() + 10, mutableBlockPos.getZ() + 10) || !level.isPositionEntityTicking(mutableBlockPos) || !spawnPlacementType.isSpawnPositionOk(level, mutableBlockPos, EntityType.RAVAGER) && (!level.getBlockState(mutableBlockPos.below()).is(Blocks.SNOW) || !level.getBlockState(mutableBlockPos).isAir())) continue;
-+            return mutableBlockPos;
-+        }
-+        return null;
-+    }
-+    // Luminol End - Raid revert
-+
-     private boolean addWaveMob(ServerLevel level, int wave, Raider raider) {
-         // Folia start - make raids thread-safe
-         if (!this.ownsRaid(level)) {
-diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
-index f6f36c15120da6c57c0cbea3743a0819252cb6cc..cb537b243b16876e7922cd732ab8dad8d046a450 100644
---- a/net/minecraft/world/entity/raid/Raider.java
-+++ b/net/minecraft/world/entity/raid/Raider.java
-@@ -127,6 +127,41 @@ public abstract class Raider extends PatrollingMonster {
- 
-                 currentRaid.removeFromRaid(serverLevel, this, false);
-             }
-+
-+            // Leaves start - Revert raid changes
-+            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 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, entityhuman, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN, true); // CraftBukkit
-+                    }
-+                    this.setPatrolLeader(false);
-+                }
-+            }
-+            // Leaves end - Revert raid changes
-         }
- 
-         super.die(cause);
-@@ -155,7 +190,7 @@ public abstract class Raider extends PatrollingMonster {
-     }
- 
-     public boolean hasRaid() {
--        return this.level() instanceof ServerLevel serverLevel && (this.getCurrentRaid() != null || serverLevel.getRaidAt(this.blockPosition()) != null);
-+        return !me.earthme.luminol.config.modules.misc.RaidChangesConfig.selfCheck && (this.level() instanceof ServerLevel serverLevel && (this.getCurrentRaid() != null || serverLevel.getRaidAt(this.blockPosition()) != null)); // Leaves - Disable raid self check
-     }
- 
-     public boolean hasActiveRaid() {
-diff --git a/net/minecraft/world/item/component/OminousBottleAmplifier.java b/net/minecraft/world/item/component/OminousBottleAmplifier.java
-index 33907bb190ffa22ccf9ea424b1e536297878711a..ee8f7d840520b113036e7d2e5e36f626651e1fa5 100644
---- a/net/minecraft/world/item/component/OminousBottleAmplifier.java
-+++ b/net/minecraft/world/item/component/OminousBottleAmplifier.java
-@@ -29,7 +29,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 // Luminol - Raid effect infinite
-     }
- 
-     // Paper start - properly resend entities - collect packets for bundle
-@@ -41,7 +41,7 @@ public record OminousBottleAmplifier(int value) implements ConsumableListener, T
- 
-     @Override
-     public void addToTooltip(Item.TooltipContext context, Consumer<Component> tooltipAdder, TooltipFlag flag, DataComponentGetter componentGetter) {
--        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)); // Luminol - Raid effect infinite
-         PotionContents.addPotionTooltip(list, tooltipAdder, 1.0F, context.tickRate());
-     }
- }

luminol-server/minecraft-patches/features/0015-Add-force-the-data-command-to-be-enabled-config.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add force the data command to be enabled config
 
 
 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index fca716bf52e114b196c7617f352e9394c7185271..5a275b9ac7e706012ae5d8a12ee8a3f00f129f93 100644
+index 4e3bfa25ec4917d2bca594b050e38be3bdea077b..ea50e3c0c4044f03dc8257680814f808fbf3a177 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
 @@ -162,7 +162,9 @@ public class Commands {

luminol-server/minecraft-patches/features/0017-Add-config-to-enable-Cross-Region-Damage-trace.patch

@@ -1,154 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Tue, 29 Apr 2025 23:03:56 +0800
-Subject: [PATCH] Add config to enable Cross Region Damage trace
-
-
-diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index f90defbc0d06b48bdfd6bdfa1a2bf4a6267a45d2..d42f4375952239ecc53a8fbca449120d8a1c52a6 100644
---- a/net/minecraft/server/level/ServerPlayer.java
-+++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -1289,6 +1289,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-             this.awardStat(Stats.ENTITY_KILLED_BY.get(killCredit.getType()));
-             killCredit.awardKillScore(this, cause);
-             this.createWitherRose(killCredit);
-+        // Luminol Start - Cross Region Damage trace
-+        } else if (me.earthme.luminol.config.modules.experiment.EntityDamageSourceTraceConfig.enabled) {
-+            final LivingEntity entitylivingnew = this.getKillCreditOrigin();
-+            if (entitylivingnew != null) {
-+                this.damageTransferToAsync(entitylivingnew, cause);
-+            }
-+        // Luminol End - Cross Region Damage trace
-         }
- 
-         this.level().broadcastEntityEvent(this, (byte)3);
-@@ -1303,6 +1310,24 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-         this.setClientLoaded(false);
-     }
- 
-+    // Luminol Start - Cross Region Damage trace
-+    private void damageTransferToAsync(LivingEntity entity, DamageSource cause) {
-+        // Operations running on current entity
-+        this.awardStat(Stats.ENTITY_KILLED_BY.get(entity.getType()));
-+        this.createWitherRose(entity);
-+
-+        // the entity might be in another tickregion sometimes, so we need to schedule the task onto the entity
-+        // to ensure thread safe
-+        entity.getBukkitEntity().taskScheduler.schedule((LivingEntity nmsEntity) -> {
-+            try {
-+                nmsEntity.awardKillScore(this, cause);
-+            } catch (Throwable ex) {
-+                LOGGER.error(ex.getMessage(), ex);
-+            }
-+        }, null, 1L );
-+    }
-+    // Luminol End - Cross Region Damage trace
-+
-     private void tellNeutralMobsThatIDied() {
-         AABB aabb = new AABB(this.blockPosition()).inflate(32.0, 10.0, 32.0);
-         this.level()
-diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 6102493315f1db2695478ecd7a346cc3f371ebe0..c1d53987991a0808733eac3b500d5d5a0f5d7ac2 100644
---- a/net/minecraft/world/entity/LivingEntity.java
-+++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -1190,6 +1190,29 @@ public abstract class LivingEntity extends Entity implements Attackable {
-         }
-     }
- 
-+    // Luminol Start - raid revert adapt Cross Region Damage trace
-+    public boolean addEffect(MobEffectInstance effectInstance, @Nullable Entity entity, EntityPotionEffectEvent.Cause cause, boolean fireEvent, boolean async) {
-+        if (ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(entity)) {
-+            return addEffect(effectInstance, entity, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN, true);
-+        } else if (me.earthme.luminol.config.modules.experiment.EntityDamageSourceTraceConfig.enabled) {
-+            postToEntityThreadAddEffect(effectInstance, entity, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN, true);
-+            return true;
-+        }
-+        return false;
-+    }
-+
-+    private void postToEntityThreadAddEffect(MobEffectInstance effectInstance, @Nullable Entity entity, EntityPotionEffectEvent.Cause cause, boolean fireEvent) {
-+        if (entity != null)
-+            entity.getBukkitEntity().taskScheduler.schedule((Entity nmsEntity) -> {
-+                try {
-+                    addEffect(effectInstance, nmsEntity, cause, fireEvent);
-+                } catch (Throwable ex) {
-+                    LOGGER.error(ex.getMessage(), ex);
-+                }
-+            }, null, 1L );
-+    }
-+    // Luminol End - raid revert adapt Cross Region Damage trace
-+
-     public boolean canBeAffected(MobEffectInstance effectInstance) {
-         if (this.getType().is(EntityTypeTags.IMMUNE_TO_INFESTED)) {
-             return !effectInstance.is(MobEffects.INFESTED);
-@@ -1914,6 +1937,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
-             final LivingEntity killer = this.getKillCredit();
-             if (killer != null) {
-                 killer.awardKillScore(this, damageSource);
-+            // Luminol Start - Cross Region Damage trace
-+            } else if (me.earthme.luminol.config.modules.experiment.EntityDamageSourceTraceConfig.enabled) {
-+                final LivingEntity killernew = this.getKillCreditOrigin();
-+                if (killernew != null) {
-+                    this.damageTransferToAsync(killernew, damageSource);
-+                }
-+            // Luminol End - Cross Region Damage trace
-             }
-         }); // Paper end
-         this.postDeathDropItems(deathEvent); // Paper
-@@ -1924,6 +1954,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
-         return deathEvent; // Paper
-     }
- 
-+    // Luminol Start - Cross Region Damage trace
-+    private void damageTransferToAsync(LivingEntity entity, DamageSource damageSource) {
-+        entity.getBukkitEntity().taskScheduler.schedule((LivingEntity nmsEntity) -> {
-+            try {
-+                nmsEntity.awardKillScore(this, damageSource);
-+            } catch (Throwable ex) {
-+                LOGGER.error(ex.getMessage(), ex);
-+            }
-+        }, null, 1L );
-+    }
-+    // Luminol End - Cross Region Damage trace
-+
-     protected void dropEquipment(ServerLevel level) {
-     }
-     protected void postDeathDropItems(org.bukkit.event.entity.EntityDeathEvent event) {} // Paper - method for post death logic that cannot be ran before the event is potentially cancelled
-@@ -2508,6 +2550,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
-         }
-     }
- 
-+    // Luminol Start - Cross Region Damage trace
-+    @Nullable
-+    public LivingEntity getKillCreditOrigin() {
-+        if (this.lastHurtByPlayer != null) {
-+            return this.lastHurtByPlayer.getEntity(this.level(), Player.class);
-+        } else if (this.lastHurtByMob != null) {
-+            return this.lastHurtByMob.getEntity(this.level(), LivingEntity.class);
-+        }
-+        return null;
-+    }
-+    // Luminol End - Cross Region Damage trace
-+
-     public final float getMaxHealth() {
-         return (float)this.getAttributeValue(Attributes.MAX_HEALTH);
-     }
-diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
-index cb537b243b16876e7922cd732ab8dad8d046a450..c25f4b6bb3e11cc13d2de6f2d123d8c7d5a58649 100644
---- a/net/minecraft/world/entity/raid/Raider.java
-+++ b/net/minecraft/world/entity/raid/Raider.java
-@@ -156,7 +156,13 @@ public abstract class Raider extends PatrollingMonster {
-                     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, entityhuman, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN, true); // CraftBukkit
-+                        if (me.earthme.luminol.config.modules.experiment.EntityDamageSourceTraceConfig.enabled) {
-+                            // Luminol start - Raid changes adapt DamageSource trace
-+                            entityhuman.addEffect(mobeffect1, entityhuman, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN, true, true);
-+                        } else {
-+                            entityhuman.addEffect(mobeffect1, entityhuman, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN, true); // CraftBukkit
-+                        }
-+                        // Luminol end - Raid changes adapt DamageSource trace
-                     }
-                     this.setPatrolLeader(false);
-                 }

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

@@ -17,7 +17,7 @@ index bd3ce123652af11974be4cbf8d2e96f1b2ee0a68..5f26fd89704aa3fd9c37a1d68a7c4c65
      }
  
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index ecf185fce582a542c65a9544388b84835643978b..12062e37c0e832f27ba52844739d0e8d5519a30a 100644
+index b437132634f636f4c1d76c86146f377090b5fdb2..6fbdff0eeed6e37aaa7650708c7b0164795f8d0b 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -1663,7 +1663,46 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -120,7 +120,7 @@ index 94fb1c99baefbdde91dc5fcf103683c7ffda6baf..b4fdbdba579fa7c7de4928c259b5ff16
      }
  
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 111f2f05d0ad3f290dab97f231caf8516821e030..047279cce3ff3a9eedd54db370b8fa6754d85ee4 100644
+index d2ab8110871ecf8af9d35f8b47f1d67888e15df3..ec4047312cf17f3ba91348ac8d71f747202bef87 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -420,7 +420,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -187,14 +187,15 @@ index bfd904e468bbf2cc1a5b3353d3a69ad5087c81ae..116933975ac975bb5a801be81e1c0e9b
 +    // KioCG end
  }
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index e9ea86d77395975afbe189993ee0dbbd066c3536..0228471a16805042f13158b86379a77371600489 100644
+index b5838a0320c729778f27f0d6a623eed4ef7c3a52..9122a78d08863cbc7321b7f7f2b6614e70dca846 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -6000,5 +6000,4 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-             return false;
-         return this.outOfCamera;
+@@ -5957,4 +5957,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+         return ((ServerLevel) this.level()).isPositionEntityTicking(this.blockPosition());
      }
--
+     // Paper end - Expose entity id counter
++
++    public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG
  }
 diff --git a/net/minecraft/world/entity/LightningBolt.java b/net/minecraft/world/entity/LightningBolt.java
 index c1c63c77598786d86b4aa4475cc4d36e60955085..27dd86d1d94959cbe8376ee714e3306732151105 100644
@@ -261,10 +262,10 @@ index 70cc20483905d3877e2ffb51afb4902bd59f0cd0..fff3965d892e20a3ad9c84fad2c2df2f
 +    // KioCG end
  }
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index 5af32286092222f09ad2b54dd2fa6bd9ad3a8f40..0d774fd4be1cdcf03e76db8b17309bbf01bafc55 100644
+index aed525af488eb839d31d6bec0673b7e128ca4068..543750bee43bfaaaf33f2cec53eb0de05e7a1dd2 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
-@@ -1521,6 +1521,13 @@ public abstract class Player extends LivingEntity {
+@@ -1481,6 +1481,13 @@ public abstract class Player extends LivingEntity {
          return true;
      }
  

luminol-server/minecraft-patches/features/0018-Add-config-to-enable-Raytracing-tracker.patch

@@ -1,160 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MrHua269 <wangxyper@163.com>
-Date: Wed, 5 Feb 2025 15:22:19 +0800
-Subject: [PATCH] Add config to enable Raytracing tracker
-
-
-diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
-index d0c03dc51c8ad4997963b244ada855827a4c4065..99a8b9a8ee2032107be03bbc13d0275a337faf7b 100644
---- a/net/minecraft/server/level/ChunkMap.java
-+++ b/net/minecraft/server/level/ChunkMap.java
-@@ -1278,7 +1278,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-                 double d1 = vec3_dx * vec3_dx + vec3_dz * vec3_dz; // Paper
-                 double d2 = d * d;
-                 // Paper start - Configurable entity tracking range by Y
--                boolean flag = d1 <= d2;
-+                boolean flag = d1 <= d2 && !entity.isCulled(); // Luminol - Ray tracing entity tracker
-                 if (flag && level.paperConfig().entities.trackingRangeY.enabled) {
-                     double rangeY = level.paperConfig().entities.trackingRangeY.get(this.entity, -1);
-                     if (rangeY != -1) {
-diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index b5838a0320c729778f27f0d6a623eed4ef7c3a52..e9ea86d77395975afbe189993ee0dbbd066c3536 100644
---- a/net/minecraft/world/entity/Entity.java
-+++ b/net/minecraft/world/entity/Entity.java
-@@ -140,7 +140,7 @@ import net.minecraft.world.scores.ScoreHolder;
- import net.minecraft.world.scores.Team;
- import org.jetbrains.annotations.Contract;
- 
--public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess, ScoreHolder, DataComponentGetter, ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity, ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity { // Paper - rewrite chunk system // Paper - optimise entity tracker
-+public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess, ScoreHolder, DataComponentGetter, ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity, ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity, dev.tr7zw.entityculling.versionless.access.Cullable { // Paper - rewrite chunk system // Paper - optimise entity tracker // Luminol - Ray tracing entity tracker
-     // CraftBukkit start
-     private static final org.slf4j.Logger LOGGER = com.mojang.logging.LogUtils.getLogger();
-     private static final int CURRENT_LEVEL = 2;
-@@ -5957,4 +5957,48 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-         return ((ServerLevel) this.level()).isPositionEntityTicking(this.blockPosition());
-     }
-     // Paper end - Expose entity id counter
-+
-+    public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG
-+
-+    private long lasttime = 0;
-+    private boolean culled = false;
-+    private boolean outOfCamera = false;
-+
-+    @Override
-+    public void setTimeout() {
-+        this.lasttime = System.currentTimeMillis() + 1000;
-+    }
-+
-+    @Override
-+    public boolean isForcedVisible() {
-+        return this.lasttime > System.currentTimeMillis();
-+    }
-+
-+    @Override
-+    public void setCulled(boolean value) {
-+        this.culled = value;
-+        if (!value) {
-+            setTimeout();
-+        }
-+    }
-+
-+    @Override
-+    public boolean isCulled() {
-+        if (!me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.enabled)
-+            return false;
-+        return this.culled;
-+    }
-+
-+    @Override
-+    public void setOutOfCamera(boolean value) {
-+        this.outOfCamera = value;
-+    }
-+
-+    @Override
-+    public boolean isOutOfCamera() {
-+        if (!me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.enabled)
-+            return false;
-+        return this.outOfCamera;
-+    }
-+
- }
-diff --git a/net/minecraft/world/entity/EntityType.java b/net/minecraft/world/entity/EntityType.java
-index 6b72ab233508e6df1eca34360ce76d102ee25a41..f39ee4605cc15102d6560afd1dad5f56dd53cf4e 100644
---- a/net/minecraft/world/entity/EntityType.java
-+++ b/net/minecraft/world/entity/EntityType.java
-@@ -1109,6 +1109,9 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
-     public final int passengerTickTimerId;
-     public final int passengerInactiveTickTimerId;
-     // Folia end - profiler
-+    // Luminol - Raytracing entity tracker
-+    public boolean skipRaytracningCheck = false;
-+    // Luminol end
- 
-     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 aed525af488eb839d31d6bec0673b7e128ca4068..5af32286092222f09ad2b54dd2fa6bd9ad3a8f40 100644
---- a/net/minecraft/world/entity/player/Player.java
-+++ b/net/minecraft/world/entity/player/Player.java
-@@ -220,6 +220,25 @@ public abstract class Player extends LivingEntity {
-         return (org.bukkit.craftbukkit.entity.CraftHumanEntity) super.getBukkitEntity();
-     }
-     // CraftBukkit end
-+    // Luminol start - Raytracing entity tracker
-+    public dev.tr7zw.entityculling.CullTask cullTask;
-+    {
-+        if (!me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.enabled) {
-+            this.cullTask = null;
-+        }else {
-+            final com.logisticscraft.occlusionculling.OcclusionCullingInstance culling = new com.logisticscraft.occlusionculling.OcclusionCullingInstance(
-+                    me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.tracingDistance,
-+                    new dev.tr7zw.entityculling.DefaultChunkDataProvider(this.level())
-+            );
-+
-+            this.cullTask = new dev.tr7zw.entityculling.CullTask(
-+                    culling, this,
-+                    me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.hitboxLimit,
-+                    me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.checkIntervalMs
-+            );
-+        }
-+    }
-+    // Luminol end
- 
-     public Player(Level level, BlockPos pos, float yRot, GameProfile gameProfile) {
-         super(EntityType.PLAYER, level);
-@@ -277,6 +296,26 @@ public abstract class Player extends LivingEntity {
- 
-     @Override
-     public void tick() {
-+        // Luminol start - Ray tracing entity tracker
-+        if (!me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.enabled) {
-+            if (this.cullTask != null) this.cullTask.signalStop();
-+            this.cullTask = null;
-+        }else {
-+            final com.logisticscraft.occlusionculling.OcclusionCullingInstance culling = new com.logisticscraft.occlusionculling.OcclusionCullingInstance(
-+                    me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.tracingDistance,
-+                    new dev.tr7zw.entityculling.DefaultChunkDataProvider(this.level())
-+            );
-+
-+            this.cullTask = new dev.tr7zw.entityculling.CullTask(
-+                    culling, this,
-+                    me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.hitboxLimit,
-+                    me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.checkIntervalMs
-+            );
-+        }
-+        if (this.cullTask != null) this.cullTask.setup();
-+        if (this.cullTask != null) this.cullTask.requestCullSignal(); // Luminol - Ray tracing entity tracker
-+        // Luminol end
-+
-         this.noPhysics = this.isSpectator();
-         if (this.isSpectator() || this.isPassenger()) {
-             this.setOnGround(false);
-@@ -1415,6 +1454,7 @@ public abstract class Player extends LivingEntity {
-         if (this.containerMenu != null && this.hasContainerOpen()) {
-             this.doCloseContainer();
-         }
-+        if (this.cullTask != null) this.cullTask.signalStop(); // Luminol - Ray tracing entity tracker
-     }
- 
-     @Override

luminol-server/minecraft-patches/features/0018-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 047279cce3ff3a9eedd54db370b8fa6754d85ee4..bcc0c3cfa5be4daeec6e95a1b63a6cd38890f04d 100644
+index ec4047312cf17f3ba91348ac8d71f747202bef87..56d00caf9db21798fdcbd6ec2cd84a841a5dfd99 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -1631,6 +1631,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1606,6 +1606,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
                      if (respawnComplete != null) {
                          respawnComplete.accept(ServerPlayer.this);
                      }
@@ -19,7 +19,7 @@ index 047279cce3ff3a9eedd54db370b8fa6754d85ee4..bcc0c3cfa5be4daeec6e95a1b63a6cd3
              );
          });
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 0228471a16805042f13158b86379a77371600489..9d945f615187f86913be8a9b83b1aada3a1336b6 100644
+index b5838a0320c729778f27f0d6a623eed4ef7c3a52..18b04e13d0347935888b3f01fe35a39aeb49d94a 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -4108,6 +4108,31 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

luminol-server/minecraft-patches/features/0021-Gale-Skip-entity-move-if-movement-is-zero.patch

@@ -10,7 +10,7 @@ VMP (https://github.com/RelativityMC/VMP-fabric)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 9d945f615187f86913be8a9b83b1aada3a1336b6..06496237f947af4849cb7f364eacf11d53736e3d 100644
+index 18b04e13d0347935888b3f01fe35a39aeb49d94a..97ef9c15618168a9b4f169a03f15d4e3e326f4f6 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1081,7 +1081,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

luminol-server/minecraft-patches/features/0026-Leaf-Secure-seed-and-matter-seed-command.patch

@@ -53,7 +53,7 @@ index f6518e29f805018c72222f5aaa7b662071665b65..8d082996a0f361cfd12af6a2138efd70
              this.get("generator-settings", property -> GsonHelper.parse(!property.isEmpty() ? property : "{}"), new JsonObject()),
              this.get("level-type", property -> property.toLowerCase(Locale.ROOT), WorldPresets.NORMAL.location().toString())
 diff --git a/net/minecraft/server/level/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java
-index 357d81d42f187fb1c52584e6c9cfe611fe755aba..6dc5b1a8bdba998e11bcdf352bcc0fc7161a484c 100644
+index 977fefea7f81d69b40dca46f72b9629f8c491c44..f8322334fb6a0cea38c4d1981862ba673fd1b100 100644
 --- a/net/minecraft/server/level/ServerChunkCache.java
 +++ b/net/minecraft/server/level/ServerChunkCache.java
 @@ -674,6 +674,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon

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

@@ -8,7 +8,7 @@ As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/f553c53e4230aa032e54
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 77546196289bccbbc0c40c2d69ff9ddd2bc98ffe..d6a284bcdd9cb6b7442f99f9c7e9f2293fa0a218 100644
+index d60a1d4c4c8bd7650170775e37e8ca76b46a1588..4fc3c9f2b04711569c12a0efa027601fdd0a40b5 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -573,7 +573,7 @@ public class ServerGamePacketListenerImpl

luminol-server/minecraft-patches/features/0030-Leaves-Fix-SculkCatalyst-exp-skip.patch

@@ -8,7 +8,7 @@ As part of: Leaves (https://github.com/LeavesMC/Leaves/blob/f553c53e4230aa032e54
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index bcc0c3cfa5be4daeec6e95a1b63a6cd38890f04d..e83c6a81e318a05580f5c811cb2543a83435f04c 100644
+index 56d00caf9db21798fdcbd6ec2cd84a841a5dfd99..4c811d989382f9b04f2c978ea5d1b845a55cc000 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -1285,7 +1285,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -20,9 +20,9 @@ index bcc0c3cfa5be4daeec6e95a1b63a6cd38890f04d..e83c6a81e318a05580f5c811cb2543a8
          // we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory.
          if (!event.getKeepInventory()) {
              // Paper start - PlayerDeathEvent#getItemsToKeep
-@@ -1357,6 +1357,15 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1332,6 +1332,15 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+         this.setClientLoaded(false);
      }
-     // Luminol End - Cross Region Damage trace
  
 +    // Leaves start - exp fix
 +    private boolean shouldDropExperience(boolean eventResult, boolean forceUseEvent) {
@@ -37,7 +37,7 @@ index bcc0c3cfa5be4daeec6e95a1b63a6cd38890f04d..e83c6a81e318a05580f5c811cb2543a8
          AABB aabb = new AABB(this.blockPosition()).inflate(32.0, 10.0, 32.0);
          this.level()
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index c1d53987991a0808733eac3b500d5d5a0f5d7ac2..dcec5d26950bc654f67e7de7688c074cc502e486 100644
+index 6102493315f1db2695478ecd7a346cc3f371ebe0..99a0f521c2a327121f20821188356e2e415bc380 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -264,6 +264,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -48,7 +48,7 @@ index c1d53987991a0808733eac3b500d5d5a0f5d7ac2..dcec5d26950bc654f67e7de7688c074c
      public List<DefaultDrop> drops = new java.util.ArrayList<>(); // Paper - Restore vanilla drops behavior
      public final org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
      public boolean collides = true;
-@@ -1870,6 +1871,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1847,6 +1848,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                          entity.killedEntity((ServerLevel) this.level(), this);
                      }
                      this.gameEvent(GameEvent.ENTITY_DIE);
@@ -56,7 +56,7 @@ index c1d53987991a0808733eac3b500d5d5a0f5d7ac2..dcec5d26950bc654f67e7de7688c074c
                  } else {
                      this.dead = false;
                      this.setHealth((float) deathEvent.getReviveHealth());
-@@ -1950,7 +1952,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1920,7 +1922,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          this.drops = new java.util.ArrayList<>();
          // this.dropEquipment(level); // CraftBukkit - moved up
          // CraftBukkit end

luminol-server/minecraft-patches/features/0032-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch

@@ -12,10 +12,10 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
 Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index dcec5d26950bc654f67e7de7688c074cc502e486..0a06dc4b7fac7c7d63996553e2cb2a38ddb5f195 100644
+index 99a0f521c2a327121f20821188356e2e415bc380..9d10ca1808ba66a792f41ed4484897607d037303 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -2746,6 +2746,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2692,6 +2692,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      protected void updateSwingTime() {
@@ -23,7 +23,7 @@ index dcec5d26950bc654f67e7de7688c074cc502e486..0a06dc4b7fac7c7d63996553e2cb2a38
          int currentSwingDuration = this.getCurrentSwingDuration();
          if (this.swinging) {
              this.swingTime++;
-@@ -3629,6 +3630,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3575,6 +3576,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      protected void updateFallFlying() {
          this.checkSlowFallDistance();
          if (!this.level().isClientSide) {

luminol-server/minecraft-patches/features/0035-Kaiiju-Vanilla-end-portal-teleportation.patch

@@ -8,7 +8,7 @@ As part of: Kaiiju (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2e
 Licensed under: GPL-3.0 (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/LICENSE)
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 06496237f947af4849cb7f364eacf11d53736e3d..af793516943582d92fe02a222b8c73f759ee8aae 100644
+index 97ef9c15618168a9b4f169a03f15d4e3e326f4f6..96790ead67c29013302341422fd23d2cefd720bf 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -4273,14 +4273,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

luminol-server/minecraft-patches/features/0038-Pufferfish-Cache-climbing-check-for-activation.patch

@@ -21,10 +21,10 @@ index aec5370b285d4648280b3e1c4c2fcaa501376739..21ca0737d07e4edb5c9f52a703ba1ea0
              }
              if (entity instanceof final Mob mob && mob.getTarget() != null) {
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 0a06dc4b7fac7c7d63996553e2cb2a38ddb5f195..ae83447f99f483e1b509c52060353bd13ddbc458 100644
+index 9d10ca1808ba66a792f41ed4484897607d037303..5b5e63c4dc10076ba33a8ddf0ebae96643b1161f 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -2156,6 +2156,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2114,6 +2114,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return this.lastClimbablePos;
      }
  

luminol-server/minecraft-patches/features/0042-SparklyPaper-Optimize-canSee-checks.patch

@@ -7,7 +7,7 @@ Co-authored by: MrPowerGamerBR <git@mrpowergamerbr.com>
 As part of: SparklyPaper (https://github.com/SparklyPower/SparklyPaper/blob/a69d3690472c9967772ffd4d4bd1f41403b7ea6f/sparklypaper-server/paper-patches/features/0005-Optimize-canSee-checks.patch)
 
 diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
-index 99a8b9a8ee2032107be03bbc13d0275a337faf7b..607091ecbd4a7261f2c0d839ee4dd1d27fa2190a 100644
+index d0c03dc51c8ad4997963b244ada855827a4c4065..ee53f78396f4377d3e5c2998826f231208066ef6 100644
 --- a/net/minecraft/server/level/ChunkMap.java
 +++ b/net/minecraft/server/level/ChunkMap.java
 @@ -1294,7 +1294,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider

luminol-server/minecraft-patches/features/0044-Correct-player-respawn-place.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Correct player respawn place
 
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index e83c6a81e318a05580f5c811cb2543a83435f04c..2f2726ed97658732751032b21752840702da233e 100644
+index 4c811d989382f9b04f2c978ea5d1b845a55cc000..c3201cb0ba6f928f658d4c74a1ef2b7e8900b1f6 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -492,8 +492,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Force disable builtin spark plugin
 The spark passed down from paper has some memory leaking issue, so we fully removed it from the code to prevent that memory leaking issue.
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 12062e37c0e832f27ba52844739d0e8d5519a30a..87625b365e04ce05fa2b6cdf2003c839255c4393 100644
+index 6fbdff0eeed6e37aaa7650708c7b0164795f8d0b..33d596c0f07d076886c0dd8eb93e901cdb56e438 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -781,8 +781,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

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

@@ -1,175 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Thu, 20 Feb 2025 01:00:28 +0800
-Subject: [PATCH] Purpur: Barrels and enderchests 6 rows
-
-Co-authored by: William Blake Galbreath <Blake.Galbreath@GMail.com>
-As part of: Purpur (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch)
-Licensed under: MIT (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/LICENSE)
-
-diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 001483b7098523f3645a95c81fcf0e38b551705e..8a32580897c6814ca7cbc7cdfc3a3e41b4ce788f 100644
---- a/net/minecraft/server/players/PlayerList.java
-+++ b/net/minecraft/server/players/PlayerList.java
-@@ -1116,6 +1116,10 @@ public abstract class PlayerList {
-         player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
-         this.server.getCommands().sendCommands(player);
-         } // Paper - Add sendOpLevel API
-+
-+        // Purpur start - Barrels and enderchests 6 rows
-+        player.enderChestSlotCount = me.earthme.luminol.config.modules.misc.ContainerExpansionConfig.enderchestRows < 7 && me.earthme.luminol.config.modules.misc.ContainerExpansionConfig.enderchestRows > 0 ? 9 * me.earthme.luminol.config.modules.misc.ContainerExpansionConfig.enderchestRows : 27;
-+        // Purpur end - Barrels and enderchests 6 rows
-     }
- 
-     public boolean isWhiteListed(GameProfile profile) {
-diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index 0d774fd4be1cdcf03e76db8b17309bbf01bafc55..1230effe955a627ff24866fdac4c55bff45cc241 100644
---- a/net/minecraft/world/entity/player/Player.java
-+++ b/net/minecraft/world/entity/player/Player.java
-@@ -210,6 +210,7 @@ public abstract class Player extends LivingEntity {
-     private int currentImpulseContextResetGraceTime = 0;
-     public boolean affectsSpawning = true; // Paper - Affects Spawning API
-     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
-+    public int enderChestSlotCount = -1; // Purpur - Barrels and enderchests 6 rows
- 
-     // CraftBukkit start
-     public boolean fauxSleeping;
-diff --git a/net/minecraft/world/inventory/ChestMenu.java b/net/minecraft/world/inventory/ChestMenu.java
-index 0fffa384f928ab84451331380968fb4650eafe26..d84a10396395939149da88bcb01be59e220c340e 100644
---- a/net/minecraft/world/inventory/ChestMenu.java
-+++ b/net/minecraft/world/inventory/ChestMenu.java
-@@ -66,10 +66,30 @@ public class ChestMenu extends AbstractContainerMenu {
-         return new ChestMenu(MenuType.GENERIC_9x6, containerId, playerInventory, 6);
-     }
- 
-+    // Purpur start - Barrels and enderchests 6 rows
-+    public static ChestMenu oneRow(int syncId, Inventory playerInventory, Container inventory) {
-+        return new ChestMenu(MenuType.GENERIC_9x1, syncId, playerInventory, inventory, 1);
-+        }
-+
-+    public static ChestMenu twoRows(int syncId, Inventory playerInventory, Container inventory) {
-+        return new ChestMenu(MenuType.GENERIC_9x2, syncId, playerInventory, inventory, 2);
-+        }
-+    // Purpur end - Barrels and enderchests 6 rows
-+
-     public static ChestMenu threeRows(int containerId, Inventory playerInventory, Container container) {
-         return new ChestMenu(MenuType.GENERIC_9x3, containerId, playerInventory, container, 3);
-     }
- 
-+    // Purpur start - Barrels and enderchests 6 rows
-+    public static ChestMenu fourRows(int syncId, Inventory playerInventory, Container inventory) {
-+        return new ChestMenu(MenuType.GENERIC_9x4, syncId, playerInventory, inventory, 4);
-+    }
-+
-+    public static ChestMenu fiveRows(int syncId, Inventory playerInventory, Container inventory) {
-+        return new ChestMenu(MenuType.GENERIC_9x5, syncId, playerInventory, inventory, 5);
-+    }
-+    // Purpur end - Barrels and enderchests 6 rows
-+
-     public static ChestMenu sixRows(int containerId, Inventory playerInventory, Container container) {
-         return new ChestMenu(MenuType.GENERIC_9x6, containerId, playerInventory, container, 6);
-     }
-diff --git a/net/minecraft/world/inventory/PlayerEnderChestContainer.java b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-index bc2b95973192069fc64581b59583b19df876f55d..72b8532acd7838e94e2cc0e2085d2ad84ba56f5e 100644
---- a/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-+++ b/net/minecraft/world/inventory/PlayerEnderChestContainer.java
-@@ -25,11 +25,18 @@ public class PlayerEnderChestContainer extends SimpleContainer {
-     }
- 
-     public PlayerEnderChestContainer(Player owner) {
--        super(27);
-+        super(me.earthme.luminol.config.modules.misc.ContainerExpansionConfig.enderchestRows < 7 && me.earthme.luminol.config.modules.misc.ContainerExpansionConfig.enderchestRows > 0 ? 9 * me.earthme.luminol.config.modules.misc.ContainerExpansionConfig.enderchestRows : 27);
-         this.owner = owner;
-         // CraftBukkit end
-     }
- 
-+    // Purpur start - Barrels and enderchests 6 rows
-+        @Override
-+    public int getContainerSize() {
-+        return owner.enderChestSlotCount < 0 ? super.getContainerSize() : owner.enderChestSlotCount;
-+    }
-+    // Purpur end - Barrels and enderchests 6 rows
-+
-     public void setActiveChest(EnderChestBlockEntity enderChestBlockEntity) {
-         this.activeChest = enderChestBlockEntity;
-     }
-diff --git a/net/minecraft/world/level/block/EnderChestBlock.java b/net/minecraft/world/level/block/EnderChestBlock.java
-index 5077a9ff7b78801bdc53536a37aee07b8d86ee4d..17b43a2c793dff0576a26e6ac3764b87faf4112e 100644
---- a/net/minecraft/world/level/block/EnderChestBlock.java
-+++ b/net/minecraft/world/level/block/EnderChestBlock.java
-@@ -85,8 +85,14 @@ public class EnderChestBlock extends AbstractChestBlock<EnderChestBlockEntity> i
-                 enderChestInventory.setActiveChest(enderChestBlockEntity); // Needs to happen before ChestMenu.threeRows as it is required for opening animations
-                 if (level instanceof ServerLevel serverLevel && player.openMenu(
-                     new SimpleMenuProvider(
--                        (containerId, playerInventory, player1) -> ChestMenu.threeRows(containerId, playerInventory, enderChestInventory), CONTAINER_TITLE
--                    )
-+                            (containerId, playerInventory, player1) -> switch (me.earthme.luminol.config.modules.misc.ContainerExpansionConfig.enderchestRows) {
-+                    case 6 -> ChestMenu.sixRows(containerId, playerInventory, enderChestInventory);
-+                    case 5 -> ChestMenu.fiveRows(containerId, playerInventory, enderChestInventory);
-+                    case 4 -> ChestMenu.fourRows(containerId, playerInventory, enderChestInventory);
-+                    case 2 -> ChestMenu.twoRows(containerId, playerInventory, enderChestInventory);
-+                    case 1 -> ChestMenu.oneRow(containerId, playerInventory, enderChestInventory);
-+                    default -> ChestMenu.threeRows(containerId, playerInventory, enderChestInventory);
-+                }, CONTAINER_TITLE) // Purpur - Barrels and enderchests 6 rows
-                 ).isPresent()) {
-                 // Paper end - Fix InventoryOpenEvent cancellation - moved up;
-                     player.awardStat(Stats.OPEN_ENDERCHEST);
-diff --git a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-index 027502d0af5512c31878978c4d05c52fa3029cca..2724b762bfb44e48619d4449560cf968a8fa7dee 100644
---- a/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-+++ b/net/minecraft/world/level/block/entity/BarrelBlockEntity.java
-@@ -56,7 +56,17 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
-     }
-     // CraftBukkit end
- 
--    private NonNullList<ItemStack> items = NonNullList.withSize(27, ItemStack.EMPTY);
-+    // Purpur start - Barrels and enderchests 6 rows
-+    private NonNullList<ItemStack> items = NonNullList.withSize(switch (me.earthme.luminol.config.modules.misc.ContainerExpansionConfig.barrelRows) {
-+        case 6 -> 54;
-+        case 5 -> 45;
-+        case 4 -> 36;
-+        case 2 -> 18;
-+        case 1 -> 9;
-+        default -> 27;
-+        }, ItemStack.EMPTY);
-+    // Purpur end - Barrels and enderchests 6 rows
-+
-     public final ContainerOpenersCounter openersCounter = new ContainerOpenersCounter() {
-         @Override
-         protected void onOpen(Level level, BlockPos pos, BlockState state) {
-@@ -108,7 +118,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
- 
-     @Override
-     public int getContainerSize() {
--        return 27;
-+        // Purpur start - Barrels and enderchests 6 rows
-+        return switch (me.earthme.luminol.config.modules.misc.ContainerExpansionConfig.barrelRows) {
-+            case 6 -> 54;
-+            case 5 -> 45;
-+            case 4 -> 36;
-+            case 2 -> 18;
-+            case 1 -> 9;
-+            default -> 27;
-+        };
-+    // Purpur end - Barrels and enderchests 6 rows
-     }
- 
-     @Override
-@@ -128,7 +147,16 @@ public class BarrelBlockEntity extends RandomizableContainerBlockEntity {
- 
-     @Override
-     protected AbstractContainerMenu createMenu(int id, Inventory player) {
--        return ChestMenu.threeRows(id, player, this);
-+        // Purpur start - Barrels and enderchests 6 rows
-+        return switch (me.earthme.luminol.config.modules.misc.ContainerExpansionConfig.barrelRows) {
-+            case 6 -> ChestMenu.sixRows(id, player, this);
-+            case 5 -> ChestMenu.fiveRows(id, player, this);
-+            case 4 -> ChestMenu.fourRows(id, player, this);
-+            case 2 -> ChestMenu.twoRows(id, player, this);
-+            case 1 -> ChestMenu.oneRow(id, player, this);
-+            default -> ChestMenu.threeRows(id, player, this);
-+        };
-+        // Purpur end - Barrels and enderchests 6 rows
-     }
- 
-     @Override

luminol-server/minecraft-patches/features/0050-Fix-entity-portal-teleport-speed.patch

@@ -46,7 +46,7 @@ index 8329bc0cf531a1317ff8e213e948019d28df1eea..84a6bf575902676fc06211562b578064
          } else {entity.inactiveTick();} // Paper - EAR 2
          profilerFiller.pop();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index af793516943582d92fe02a222b8c73f759ee8aae..9f1d0c85631a585e00a8b20f3536f1f61b011201 100644
+index 96790ead67c29013302341422fd23d2cefd720bf..416d096cb4dfafeea625e70cdb420669442fdea9 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -350,6 +350,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

luminol-server/minecraft-patches/features/0051-Fix-off-tickregion-sync-teleport.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix off tickregion sync teleport
 Folis's teleportAsync implementation has some checks missing during the sync teleportation checks, if we are teleport to the edge of the tickregion, it is still asserting that we are in the same tickregion and moved us directly, but there is actually some logics is already touching the stuff out of current tickregion.So we added some new edge checks to the sync teleportation checks which will check the tickregion belonging in a shape of cycle which is in min(entity's bounding box + simulate distance, 6) of radius to fix that issue
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 9f1d0c85631a585e00a8b20f3536f1f61b011201..87e22d1fed087886ac845f6e816be5bf20fac9fb 100644
+index 416d096cb4dfafeea625e70cdb420669442fdea9..dbc8d2729782dd073a03682d4e8c96c4e03ce1e6 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -4024,6 +4024,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

luminol-server/minecraft-patches/features/0053-Teleport-async-if-entity-was-moving-to-another-regio.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Teleport async if entity was moving to another region at once
 On folia, entity usually cannot move out of the tickregion, but sometimes it actually does(like some end pearl gun that can shoot an end pearl to the block faraway than 10000 blocks even more). To fix this, we added a temporary fix which teleport these entities to the destination instead running its move logics so that we could ensure anything is under control.But one thing need to consider is that teleportAsync is actually calling halfway of the entity tick and there is still something running when teleportAsync called, which is actually modified the entity in another thread, so there is still need an improvement
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 87e22d1fed087886ac845f6e816be5bf20fac9fb..b163c43f5398b9f38c75ae7af6a3015b686624ce 100644
+index dbc8d2729782dd073a03682d4e8c96c4e03ce1e6..a33994df200a93d7b9721cbe13d898d96af70844 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1084,6 +1084,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

luminol-server/paper-patches/features/0011-Leaves-Fix-SculkCatalyst-exp-skip.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Fix SculkCatalyst exp skip
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ee8fcf73665de82fa3968e0998b3221d9088647b..7bb22db40f18be2dbc3ca33a0cb864cf8389ac1e 100644
+index 77871ce6d0eb0005893ea10b17e711ce87d7bfdd..9c8a4d90974a8cf45a24aca00bf36cebd352b507 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -851,7 +851,7 @@ public class CraftEventFactory {

luminol-server/paper-patches/features/0011-Purpur-Barrels-and-enderchests-6-rows.patch

@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Suisuroru <qwertyuiop14077@qq.com>
-Date: Thu, 20 Feb 2025 01:00:29 +0800
-Subject: [PATCH] Purpur-Barrels-and-enderchests-6-rows
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-index c00ddfe41439954fa0fd87c0933f274c8a752eb6..f60e3896411ff8342639e3f3422d551c84d5871e 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
-@@ -150,9 +150,26 @@ public class CraftContainer extends AbstractContainerMenu {
-             case PLAYER:
-             case CHEST:
-             case ENDER_CHEST:
--            case BARREL:
--                this.delegate = new ChestMenu(net.minecraft.world.inventory.MenuType.GENERIC_9x3, windowId, bottom, top, top.getContainerSize() / 9);
-+                // Purpur start - Barrels and enderchests 6 rows
-+                this.delegate = new ChestMenu(switch (me.earthme.luminol.config.modules.misc.ContainerExpansionConfig.enderchestRows) {
-+                    case 6 -> net.minecraft.world.inventory.MenuType.GENERIC_9x6;
-+                    case 5 -> net.minecraft.world.inventory.MenuType.GENERIC_9x5;
-+                    case 4 -> net.minecraft.world.inventory.MenuType.GENERIC_9x4;
-+                    case 2 -> net.minecraft.world.inventory.MenuType.GENERIC_9x2;
-+                    case 1 -> net.minecraft.world.inventory.MenuType.GENERIC_9x1;
-+                    default -> net.minecraft.world.inventory.MenuType.GENERIC_9x3;
-+                }, windowId, bottom, top, top.getContainerSize() / 9);
-                 break;
-+            case BARREL:
-+                this.delegate = new ChestMenu(switch (me.earthme.luminol.config.modules.misc.ContainerExpansionConfig.barrelRows) {
-+                    case 6 -> net.minecraft.world.inventory.MenuType.GENERIC_9x6;
-+                    case 5 -> net.minecraft.world.inventory.MenuType.GENERIC_9x5;
-+                    case 4 -> net.minecraft.world.inventory.MenuType.GENERIC_9x4;
-+                    case 2 -> net.minecraft.world.inventory.MenuType.GENERIC_9x2;
-+                    case 1 -> net.minecraft.world.inventory.MenuType.GENERIC_9x1;
-+                    default -> net.minecraft.world.inventory.MenuType.GENERIC_9x3;
-+                    }, windowId, bottom, top, top.getContainerSize() / 9);
-+                // Purpur end - Barrels and enderchests 6 rows
-             case DISPENSER:
-             case DROPPER:
-                 this.delegate = new DispenserMenu(windowId, bottom, top);
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index f850e6cea92edc87ed54cf54488b5ebb606913ed..f4db38de4348fb03db0b769bd5b5993184dd4abb 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -84,7 +84,7 @@ public class CraftInventory implements Inventory {
- 
-     @Override
-     public void setContents(ItemStack[] items) {
--        Preconditions.checkArgument(items.length <= this.getSize(), "Invalid inventory size (%s); expected %s or less", items.length, this.getSize());
-+    // Preconditions.checkArgument(items.length <= this.getSize(), "Invalid inventory size (%s); expected %s or less", items.length, this.getSize()); // Purpur - Barrels and enderchests 6 rows
- 
-         for (int i = 0; i < this.getSize(); i++) {
-             if (i >= items.length) {

luminol-server/paper-patches/files/src/main/java/dev/tr7zw/entityculling/CullTask.java.patch

@@ -1,155 +0,0 @@
---- /dev/null
-+++ b/src/main/java/dev/tr7zw/entityculling/CullTask.java
-@@ -1,0 +_,152 @@
-+package dev.tr7zw.entityculling;
-+
-+import java.util.concurrent.CompletableFuture;
-+import java.util.concurrent.Executor;
-+import java.util.concurrent.Executors;
-+import java.util.concurrent.TimeUnit;
-+
-+import ca.spottedleaf.moonrise.common.util.TickThread;
-+import com.logisticscraft.occlusionculling.OcclusionCullingInstance;
-+import com.logisticscraft.occlusionculling.util.Vec3d;
-+
-+import dev.tr7zw.entityculling.versionless.access.Cullable;
-+import me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig;
-+import net.minecraft.world.entity.Entity;
-+import net.minecraft.world.entity.decoration.ArmorStand;
-+import net.minecraft.world.entity.player.Player;
-+import net.minecraft.world.phys.AABB;
-+import net.minecraft.world.phys.Vec3;
-+
-+public class CullTask implements Runnable {
-+
-+    private volatile boolean requestCull = false;
-+    private volatile boolean scheduleNext = true;
-+    private volatile boolean inited = false;
-+
-+    private final OcclusionCullingInstance culling;
-+    private final Player checkTarget;
-+
-+    private final int hitboxLimit;
-+
-+    public long lastCheckedTime = 0;
-+
-+    // reused preallocated vars
-+    private final Vec3d lastPos = new Vec3d(0, 0, 0);
-+    private final Vec3d aabbMin = new Vec3d(0, 0, 0);
-+    private final Vec3d aabbMax = new Vec3d(0, 0, 0);
-+
-+    private static final Executor backgroundWorker = Executors.newCachedThreadPool(task -> {
-+        final TickThread worker = new TickThread("EntityCulling") {
-+            @Override
-+            public void run() {
-+                task.run();
-+            }
-+        };
-+
-+        worker.setDaemon(true);
-+
-+        return worker;
-+    });
-+
-+    private final Executor worker;
-+
-+    public CullTask(
-+            OcclusionCullingInstance culling,
-+            Player checkTarget,
-+            int hitboxLimit,
-+            long checkIntervalMs
-+    ) {
-+        this.culling = culling;
-+        this.checkTarget = checkTarget;
-+        this.hitboxLimit = hitboxLimit;
-+        this.worker = CompletableFuture.delayedExecutor(checkIntervalMs, TimeUnit.MILLISECONDS, backgroundWorker);
-+    }
-+
-+    public void requestCullSignal() {
-+        this.requestCull = true;
-+    }
-+
-+    public void signalStop() {
-+        this.scheduleNext = false;
-+    }
-+
-+    public void setup() {
-+        if (!this.inited)
-+            this.inited = true;
-+        else
-+            return;
-+        this.worker.execute(this);
-+    }
-+
-+    @Override
-+    public void run() {
-+        try {
-+            if (this.checkTarget.tickCount > 10) {
-+                // getEyePosition can use a fixed delta as its debug only anyway
-+                Vec3 cameraMC = this.checkTarget.getEyePosition(0);
-+                if (requestCull || !(cameraMC.x == lastPos.x && cameraMC.y == lastPos.y && cameraMC.z == lastPos.z)) {
-+                    long start = System.currentTimeMillis();
-+
-+                    requestCull = false;
-+
-+                    lastPos.set(cameraMC.x, cameraMC.y, cameraMC.z);
-+                    culling.resetCache();
-+
-+                    cullEntities(cameraMC, lastPos);
-+
-+                    lastCheckedTime = (System.currentTimeMillis() - start);
-+                }
-+            }
-+        }finally {
-+            if (this.scheduleNext) {
-+                this.worker.execute(this);
-+            }
-+        }
-+    }
-+
-+    private void cullEntities(Vec3 cameraMC, Vec3d camera) {
-+        for (Entity entity : this.checkTarget.level().getEntities().getAll()) {
-+            if (!(entity instanceof Cullable cullable)) {
-+                continue; // Not sure how this could happen outside from mixin screwing up the inject into
-+                // Entity
-+            }
-+
-+            if (entity.getType().skipRaytracningCheck) {
-+                continue;
-+            }
-+
-+            if (!cullable.isForcedVisible()) {
-+                if (entity.isCurrentlyGlowing() || isSkippableArmorstand(entity)) {
-+                    cullable.setCulled(false);
-+                    continue;
-+                }
-+
-+                if (!entity.position().closerThan(cameraMC, me.earthme.luminol.config.modules.experiment.RayTrackingEntityTrackerConfig.tracingDistance)) {
-+                    cullable.setCulled(false); // If your entity view distance is larger than tracingDistance just
-+                    // render it
-+                    continue;
-+                }
-+
-+                AABB boundingBox = entity.getBoundingBox();
-+                if (boundingBox.getXsize() > hitboxLimit || boundingBox.getYsize() > hitboxLimit
-+                        || boundingBox.getZsize() > hitboxLimit) {
-+                    cullable.setCulled(false); // To big to bother to cull
-+                    continue;
-+                }
-+
-+                aabbMin.set(boundingBox.minX, boundingBox.minY, boundingBox.minZ);
-+                aabbMax.set(boundingBox.maxX, boundingBox.maxY, boundingBox.maxZ);
-+
-+                boolean visible = culling.isAABBVisible(aabbMin, aabbMax, camera);
-+
-+                cullable.setCulled(!visible);
-+            }
-+        }
-+    }
-+
-+    private boolean isSkippableArmorstand(Entity entity) {
-+        if (!RayTrackingEntityTrackerConfig.skipMarkerArmorStands)
-+            return false;
-+        return entity instanceof ArmorStand && entity.isInvisible();
-+    }
-+}

luminol-server/paper-patches/files/src/main/java/dev/tr7zw/entityculling/DefaultChunkDataProvider.java.patch

@@ -1,46 +0,0 @@
---- /dev/null
-+++ b/src/main/java/dev/tr7zw/entityculling/DefaultChunkDataProvider.java
-@@ -1,0 +_,43 @@
-+package dev.tr7zw.entityculling;
-+
-+import com.logisticscraft.occlusionculling.DataProvider;
-+import net.minecraft.core.BlockPos;
-+import net.minecraft.world.level.Level;
-+import net.minecraft.world.level.block.Blocks;
-+import net.minecraft.world.level.chunk.ChunkAccess;
-+import net.minecraft.world.level.chunk.status.ChunkStatus;
-+
-+public class DefaultChunkDataProvider implements DataProvider {
-+    private final Level level;
-+
-+    public DefaultChunkDataProvider(Level level) {
-+        this.level = level;
-+    }
-+
-+    @Override
-+    public boolean prepareChunk(int chunkX, int chunkZ) {
-+        return this.level.getChunkIfLoaded(chunkX, chunkZ) != null;
-+    }
-+
-+    @Override
-+    public boolean isOpaqueFullCube(int x, int y, int z) {
-+        BlockPos pos = new BlockPos(x, y, z);
-+
-+        final ChunkAccess access = this.level.getChunkIfLoaded(pos);
-+        if (access == null) {
-+            return false;
-+        }
-+
-+        if (this.level.isOutsideBuildHeight(pos)) {
-+            return Blocks.VOID_AIR.defaultBlockState().isSolidRender();
-+        } else {
-+            return access.getBlockState(pos).isSolidRender();// 好孩子不要学坏叔叔这样绕过异步拦截()
-+        }
-+    }
-+
-+    @Override
-+    public void cleanup() {
-+        DataProvider.super.cleanup();
-+    }
-+
-+}

luminol-server/paper-patches/files/src/main/java/dev/tr7zw/entityculling/versionless/access/Cullable.java.patch

@@ -1,20 +0,0 @@
---- /dev/null
-+++ b/src/main/java/dev/tr7zw/entityculling/versionless/access/Cullable.java
-@@ -1,0 +_,17 @@
-+package dev.tr7zw.entityculling.versionless.access;
-+
-+public interface Cullable {
-+
-+    public void setTimeout();
-+
-+    public boolean isForcedVisible();
-+
-+    public void setCulled(boolean value);
-+
-+    public boolean isCulled();
-+
-+    public void setOutOfCamera(boolean value);
-+
-+    public boolean isOutOfCamera();
-+
-+}

luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/config/LuminolConfig.java.patch

@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/LuminolConfig.java
-@@ -1,0 +_,378 @@
+@@ -1,0 +_,379 @@
 +package me.earthme.luminol.config;
 +
 +import com.electronwill.nightconfig.core.UnmodifiableConfig;
@@ -167,6 +167,7 @@
 +                            if (!removed && configFileInstance.get(fullConfigKeyName) != null) break;
 +                        }
 +                    }
++                    if (removed) continue;
 +                    if (configFileInstance.get(fullConfigKeyName) != null) continue;
 +                    if (currentValue == null) {
 +                        throw new UnsupportedOperationException("Config " + singleConfigModule.getBaseName() + "tried to add an null default value!");

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

@@ -1,23 +0,0 @@
---- /dev/null
-+++ b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandBlockConfig.java
-@@ -1,0 +_,20 @@
-+package me.earthme.luminol.config.modules.experiment;
-+
-+import me.earthme.luminol.config.EnumConfigCategory;
-+import me.earthme.luminol.config.IConfigModule;
-+import me.earthme.luminol.config.flags.ConfigInfo;
-+
-+public class CommandBlockConfig implements IConfigModule {
-+    @ConfigInfo(baseName = "enable")
-+    public static boolean enabled = false;
-+
-+    @Override
-+    public EnumConfigCategory getCategory() {
-+        return EnumConfigCategory.EXPERIMENT;
-+    }
-+
-+    @Override
-+    public String getBaseName() {
-+        return "force_enable_command_block_execution";
-+    }
-+}

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

@@ -1,25 +0,0 @@
---- /dev/null
-+++ b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandTickConfig.java
-@@ -1,0 +_,22 @@
-+package me.earthme.luminol.config.modules.experiment;
-+
-+import me.earthme.luminol.config.EnumConfigCategory;
-+import me.earthme.luminol.config.IConfigModule;
-+import me.earthme.luminol.config.flags.ConfigInfo;
-+
-+public class CommandTickConfig implements IConfigModule {
-+    @ConfigInfo(baseName = "enabled", comments =
-+            """
-+                    Allow to use tick command""")
-+    public static boolean enabled = false;
-+
-+    @Override
-+    public EnumConfigCategory getCategory() {
-+        return EnumConfigCategory.EXPERIMENT;
-+    }
-+
-+    @Override
-+    public String getBaseName() {
-+        return "enable_tick_command";
-+    }
-+}

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

@@ -1,27 +0,0 @@
---- /dev/null
-+++ b/src/main/java/me/earthme/luminol/config/modules/experiment/EntityDamageSourceTraceConfig.java
-@@ -1,0 +_,24 @@
-+package me.earthme.luminol.config.modules.experiment;
-+
-+import me.earthme.luminol.config.EnumConfigCategory;
-+import me.earthme.luminol.config.IConfigModule;
-+import me.earthme.luminol.config.flags.ConfigInfo;
-+import me.earthme.luminol.config.flags.TransformedConfig;
-+
-+public class EntityDamageSourceTraceConfig implements IConfigModule {
-+    @TransformedConfig(name = "enabled", category = {"experiment", "entity-damage-source-trace"})
-+    @ConfigInfo(baseName = "enabled", comments =
-+            """
-+                    Allow trace damage source cross different Region Scheduler.""")
-+    public static boolean enabled = false;
-+
-+    @Override
-+    public EnumConfigCategory getCategory() {
-+        return EnumConfigCategory.EXPERIMENT;
-+    }
-+
-+    @Override
-+    public String getBaseName() {
-+        return "entity_damage_source_trace";
-+    }
-+}

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

@@ -1,31 +0,0 @@
---- /dev/null
-+++ b/src/main/java/me/earthme/luminol/config/modules/experiment/RayTrackingEntityTrackerConfig.java
-@@ -1,0 +_,28 @@
-+package me.earthme.luminol.config.modules.experiment;
-+
-+import me.earthme.luminol.config.EnumConfigCategory;
-+import me.earthme.luminol.config.IConfigModule;
-+import me.earthme.luminol.config.flags.ConfigInfo;
-+
-+public class RayTrackingEntityTrackerConfig implements IConfigModule {
-+    @ConfigInfo(baseName = "enabled")
-+    public static boolean enabled = false;
-+    @ConfigInfo(baseName = "skip_marker_armor_stands")
-+    public static boolean skipMarkerArmorStands = true;
-+    @ConfigInfo(baseName = "check_interval_ms")
-+    public static int checkIntervalMs = 10;
-+    @ConfigInfo(baseName = "tracing_distance")
-+    public static int tracingDistance = 48;
-+    @ConfigInfo(baseName = "hitbox_limit")
-+    public static int hitboxLimit = 50;
-+
-+    @Override
-+    public EnumConfigCategory getCategory() {
-+        return EnumConfigCategory.EXPERIMENT;
-+    }
-+
-+    @Override
-+    public String getBaseName() {
-+        return "ray_tracking_entity_tracker";
-+    }
-+}

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

@@ -1,30 +0,0 @@
---- /dev/null
-+++ b/src/main/java/me/earthme/luminol/config/modules/misc/ContainerExpansionConfig.java
-@@ -1,0 +_,27 @@
-+package me.earthme.luminol.config.modules.misc;
-+
-+import me.earthme.luminol.config.EnumConfigCategory;
-+import me.earthme.luminol.config.IConfigModule;
-+import me.earthme.luminol.config.flags.ConfigInfo;
-+
-+public class ContainerExpansionConfig implements IConfigModule {
-+    @ConfigInfo(baseName = "barrel_rows", comments =
-+            """
-+                    range: 1~6\s""")
-+    public static int barrelRows = 3;
-+
-+    @ConfigInfo(baseName = "enderchest_rows", comments =
-+            """
-+                    range: 1~6\s""")
-+    public static int enderchestRows = 3;
-+
-+    @Override
-+    public EnumConfigCategory getCategory() {
-+        return EnumConfigCategory.MISC;
-+    }
-+
-+    @Override
-+    public String getBaseName() {
-+        return "container_expansion";
-+    }
-+}

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

@@ -1,26 +0,0 @@
---- /dev/null
-+++ b/src/main/java/me/earthme/luminol/config/modules/misc/DisableEndCrystalCheckConfig.java
-@@ -1,0 +_,23 @@
-+package me.earthme.luminol.config.modules.misc;
-+
-+import me.earthme.luminol.config.EnumConfigCategory;
-+import me.earthme.luminol.config.IConfigModule;
-+import me.earthme.luminol.config.flags.ConfigInfo;
-+
-+public class DisableEndCrystalCheckConfig implements IConfigModule {
-+    @ConfigInfo(baseName = "disable_end_crystal_check", comments =
-+            """
-+                    Disable paper's End Crystal position check.
-+                    It reverts to vanilla respawn dragon logic.""")
-+    public static boolean disableEndCrystalCheck = false;
-+
-+    @Override
-+    public EnumConfigCategory getCategory() {
-+        return EnumConfigCategory.MISC;
-+    }
-+
-+    @Override
-+    public String getBaseName() {
-+        return "end_crystal";
-+    }
-+}

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

@@ -1,64 +0,0 @@
---- /dev/null
-+++ b/src/main/java/me/earthme/luminol/config/modules/misc/RaidChangesConfig.java
-@@ -1,0 +_,61 @@
-+package me.earthme.luminol.config.modules.misc;
-+
-+import me.earthme.luminol.config.EnumConfigCategory;
-+import me.earthme.luminol.config.IConfigModule;
-+import me.earthme.luminol.config.flags.ConfigInfo;
-+import me.earthme.luminol.config.flags.TransformedConfig;
-+
-+public class RaidChangesConfig implements IConfigModule {
-+    @TransformedConfig(name = "allow-bad-omen-trigger-raid", category = {"misc", "revert-raid-changes"})
-+    @ConfigInfo(baseName = "allow_bad_omen_trigger_raid", comments =
-+            """
-+                    Allow players with ominous signs to skip a\s
-+                    30-second cooldown and trigger attacks directly""")
-+    public static boolean trigger = false;
-+
-+    @TransformedConfig(name = "give-bad-omen-when-kill-patrol-leader", category = {"misc", "revert-raid-changes"})
-+    @ConfigInfo(baseName = "give_bad_omen_when_kill_patrol_leader", comments =
-+            """
-+                    Enable players to obtain an ominous omen\s
-+                    effect when killing the patrol team captain""")
-+    public static boolean effect = false;
-+
-+    @TransformedConfig(name = "bad-omen-infinite", category = {"misc", "revert-raid-changes"})
-+    @ConfigInfo(baseName = "bad_omen_infinite", comments =
-+            """
-+                    Enable bad omen effect infinite time
-+                        --- this config is not old version's function""")
-+    public static boolean infinite = false;
-+
-+    @TransformedConfig(name = "skip-height-check", category = {"misc", "revert-raid-changes"})
-+    @ConfigInfo(baseName = "skip_height_check", comments =
-+            """
-+                    Disable y <= 96 check.
-+                    If you enabled revert_274911, this config will useless
-+                    and always behavior of enabled""")
-+    public static boolean heightCheck = false;
-+
-+    @TransformedConfig(name = "skip-self-raid-check", category = {"misc", "revert-raid-changes"})
-+    @ConfigInfo(baseName = "skip_self_raid_check", comments =
-+            """
-+                    Disable raid self check\s
-+                        --- this config is not old version's function""")
-+    public static boolean selfCheck = false;
-+
-+    @TransformedConfig(name = "revert-274911", category = {"misc", "revert-raid-changes"})
-+    @ConfigInfo(baseName = "revert_274911", comments =
-+            """
-+                    Revert Old raid's find spawn position logic
-+                        --- This revert MC-274911""")
-+    public static boolean posRevert = false;
-+
-+    @Override
-+    public EnumConfigCategory getCategory() {
-+        return EnumConfigCategory.MISC;
-+    }
-+
-+    @Override
-+    public String getBaseName() {
-+        return "revert_raid_changes";
-+    }
-+}

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

@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/modules/removed/RemovedConfig.java
-@@ -1,0 +_,26 @@
+@@ -1,0 +_,41 @@
 +package me.earthme.luminol.config.modules.removed;
 +
 +import me.earthme.luminol.config.EnumConfigCategory;
@@ -10,8 +10,23 @@
 +import me.earthme.luminol.config.flags.TransformedConfig;
 +
 +public class RemovedConfig implements IConfigModule {
-+    @TransformedConfig(name = "example", category = {"removed", "example"}, transform = false)
-+    @DoNotLoad
++    @TransformedConfig(name = "enabled", category = {"experiment", "force_enable_command_block_execution"}, transform = false)
++    @TransformedConfig(name = "enabled", category = {"experiment", "enable_tick_command"}, transform = false)
++    @TransformedConfig(name = "barrel_rows", category = {"misc", "container_expansion"}, transform = false)
++    @TransformedConfig(name = "enderchest_rows", category = {"misc", "container_expansion"}, transform = false)
++    @TransformedConfig(name = "disable_end_crystal_check", category = {"misc", "end_crystal"}, transform = false)
++    @TransformedConfig(name = "enabled", category = {"experiment", "entity_damage_source_trace"}, transform = false)
++    @TransformedConfig(name = "allow_bad_omen_trigger_raid", category = {"misc", "revert_raid_changes"}, transform = false)
++    @TransformedConfig(name = "give_bad_omen_when_kill_patrol_leader", category = {"misc", "revert_raid_changes"}, transform = false)
++    @TransformedConfig(name = "bad_omen_infinite", category = {"misc", "revert_raid_changes"}, transform = false)
++    @TransformedConfig(name = "skip_height_check", category = {"misc", "revert_raid_changes"}, transform = false)
++    @TransformedConfig(name = "skip_self_raid_check", category = {"misc", "revert_raid_changes"}, transform = false)
++    @TransformedConfig(name = "revert_274911", category = {"misc", "revert_raid_changes"}, transform = false)
++    @TransformedConfig(name = "enabled", category = {"experiment", "ray_tracking_entity_tracker"}, transform = false)
++    @TransformedConfig(name = "skip_marker_armor_stands", category = {"experiment", "ray_tracking_entity_tracker"}, transform = false)
++    @TransformedConfig(name = "check_interval_ms", category = {"experiment", "ray_tracking_entity_tracker"}, transform = false)
++    @TransformedConfig(name = "tracing_distance", category = {"experiment", "ray_tracking_entity_tracker"}, transform = false)
++    @TransformedConfig(name = "hitbox_limit", category = {"experiment", "ray_tracking_entity_tracker"}, transform = false)
 +    @ConfigInfo(baseName = "removed", comments =
 +            """
 +                    RemovedConfig redirect to here, no any function.""")