Update Luminol

Modify merge ItemEntity logic
Add followTickSequenceMerge to modify merge items, due to Paper's modification of the merge radius, when the merge radius is large and stacks containing many items get stuck in an unexpected position, individual items may never reach their destination. This configuration option is added to fix this behavior.
2025-10-06 14:20:14 +08:00 · 2025-10-04 01:15:49 +08:00 · 2025-10-03 18:24:30 +08:00 · 2025-10-03 17:03:37 +08:00 · 2025-10-02 16:51:47 +08:00 · 2025-10-01 23:21:57 +08:00
60 changed files with 617 additions and 361 deletions
@@ -7,6 +7,20 @@ on:
  pull_request:
    branches:
      - "**"
+  workflow_dispatch:
+    inputs:
+      force-release:
+        description: "Force release if you enter 1, default release if not released else skip release"
+        required: false
+        default: "0"
+      force-push:
+        description: "Push to repo if you enter 1, default push if not released else skip push repo"
+        required: false
+        default: "0"
+      comments:
+        description: "Add comments to release"
+        required: false
+        default: ""

 permissions: write-all

@@ -18,14 +32,14 @@ jobs:
      - name: Checkout Git Repository
        uses: actions/checkout@v5

-      - name: Set up JDK
+      - name: Set Up JDK
        uses: actions/setup-java@v5
        with:
          distribution: zulu
          java-version: 21

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5

      - name: Grant execute permission for gradlew
        run: chmod +x gradlew
@@ -49,20 +63,51 @@ jobs:
        if: github.event_name != 'pull_request'
        run: sh scripts/SetENV.sh

+      - name: Check If Release Exists
+        if: github.event_name != 'pull_request' && env.flag_release == 'true'
+        run: |
+          git fetch --tags
+          if [ -n "$(git tag -l "${{ env.tag }}")" ]; then
+            echo "Release already exists"
+            release_exists=true
+          else
+            echo "Release does not exist"
+            release_exists=false
+          fi
+          if [ "$release_exists" == "true" ]; then
+            counter=1
+            while [ -n "$(git tag -l "${{ env.tag }}-${counter}")" ]; do
+              counter=$((counter + 1))
+            done
+            echo "tag=${{ env.tag }}-${counter}" >> $GITHUB_ENV
+            echo "release_count= - ${counter}" >> $GITHUB_ENV
+          fi
+          echo "release_exists=${release_exists}" >> $GITHUB_ENV
+
      - name: Publish to repo
-        if: github.event_name != 'pull_request' && env.flag_release == 'true' && false # do not push to any repo
+        if: (( github.event_name != 'pull_request' && env.flag_release == 'true' && env.release_exists != 'true' ) || ( env.release_exists == 'true' && inputs.force-push == '1' )) && false # do not push to any repo
        continue-on-error: true
        run: ./gradlew --refresh-dependencies generateDevelopmentBundle publish -PpublishDevBundle=true
        env:
          PRIVATE_MAVEN_REPO_PASSWORD: ${{ secrets.PRIVATE_MAVEN_REPO_PASSWORD }}
          PRIVATE_MAVEN_REPO_USERNAME: ${{ secrets.PRIVATE_MAVEN_REPO_USERNAME }}

-      - name: Create Release
-        if: github.event_name != 'pull_request' && env.flag_release == 'true'
+      - name: Create Release - Pre Process
+        if: ( github.event_name != 'pull_request' && env.flag_release == 'true' && env.release_exists != 'true' ) || ( env.release_exists == 'true' && inputs.force-release == '1' )
+        run: |
+          if [ ${{ inputs.comments }} == "" ]; then
+          echo "No comments provided"
+          echo "flag_comment=true" >> $GITHUB_ENV
+          else
+          echo "flag_comment=false" >> $GITHUB_ENV
+          fi
+
+      - name: Create Release - No Comment
+        if: env.flag_comment == 'false'
        uses: ncipollo/release-action@v1
        with:
          tag: ${{ env.tag }}
-          name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}
+          name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}${{ env.release_count }}
          body: |
            📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LuminolMC/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LuminolMC/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }})
            This release is automatically compiled by GitHub Actions
@@ -75,3 +120,24 @@ jobs:
          prerelease: ${{ env.pre }}
          makeLatest: ${{ env.make_latest }}
          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create Release - With Comment
+        if: env.flag_comment == 'true'
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ env.tag }}
+          name: ${{ env.project_id_b }} ${{ env.mcversion }} - ${{ env.commit_id }}${{ env.release_count }}
+          body: |
+            📦Version: `${{ env.mcversion }}` | Commit ${{ env.commit_id }} [![download](https://img.shields.io/github/downloads/LuminolMC/${{ env.project_id }}/${{ env.tag }}/total?color=red&style=flat-square)](https://github.com/LuminolMC/${{ env.project_id }}/releases/download/${{ env.tag }}/${{ env.jar }})
+            This release is automatically compiled by GitHub Actions
+            ### Comments
+            > ${{ inputs.comments }}
+            ### Branch Info
+            > ${{ github.ref_name }}
+            ### Commit Message
+            ${{ env.commit_msg }}
+          artifacts: ${{ env.jar_dir }}
+          generateReleaseNotes: true
+          prerelease: ${{ env.pre }}
+          makeLatest: ${{ env.make_latest }}
+          token: ${{ secrets.GITHUB_TOKEN }}
@@ -4,7 +4,7 @@ mcVersion=1.21.8
 release=2
 # 0 for skip release, 1 for pre-release, 2 for release

-luminolRef=0bf42dcc8d6c09fab78d1bdc5335cb38d7a1f5dc
+luminolRef=69a48ce9b98318ea72d4a8f2f8720831f5554a5d

 org.gradle.configuration-cache=true
 org.gradle.caching=true
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -51,7 +51,7 @@
     // Luminol start - Dependenices insert
     implementation("com.electronwill.night-config:toml:3.8.2") // Night config
     implementation("com.github.luben:zstd-jni:1.5.4-1")
-@@ -276,14 +_,14 @@
+@@ -275,14 +_,14 @@
         val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
         attributes(
             "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -70,7 +70,7 @@
             "Build-Number" to (build ?: ""),
             "Build-Time" to buildTime.toString(),
             "Git-Branch" to gitBranch,
-@@ -447,7 +_,7 @@
+@@ -446,7 +_,7 @@
 }
 
 fill {
@@ -5,27 +5,27 @@ Subject: [PATCH] Rebrand to Lophine


 diff --git a/src/main/java/me/earthme/luminol/config/ConfigManager.java b/src/main/java/me/earthme/luminol/config/ConfigManager.java
-index 5e341cdc1c6ff75552140ab16bc9ccd237d896d0..a780214137d10f2faa92042b2f32c77a6598fa8d 100644
+index d8066afd5f3f2ea9a5dff87d853562e22268785c..f8b2364fa162a41304a99a4993354e33528ab801 100644
 --- a/src/main/java/me/earthme/luminol/config/ConfigManager.java
 +++ b/src/main/java/me/earthme/luminol/config/ConfigManager.java
-@@ -22,6 +22,7 @@ public class ConfigManager {
+@@ -21,6 +21,7 @@ public class ConfigManager {
 
     public static void initConfigs() {
-         configfiles.put("luminol", ConfigsInstance.of(new File("luminol_config"), "luminol", "me.earthme.luminol.config.modules"));
-+        configfiles.put("lophine", ConfigsInstance.of(new File("lophine_config"), "lophine", "fun.bm.lophine.config.modules")); // add lophine config to global config
+         configfiles.put("luminol", ConfigsInstance.of("luminol", "me.earthme.luminol.config.modules"));
+        configfiles.put("lophine", ConfigsInstance.of("lophine", "fun.bm.lophine.config.modules")); // add lophine config to global config
         preLoad();
     }
 
 diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java
-index f164e41975adee8b68dbcb400007681c0b66a4f8..4e76fb3b1274f2fde734089b20458f6561c39700 100644
+index df5d926fb4401dd93d658fe14ae4d9d58cff68f9..b6d84fea596cfa78032151ab2f206b6b3d5dd197 100644
 --- a/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java
 +++ b/src/main/java/me/earthme/luminol/config/modules/misc/ServerModNameConfig.java
@@ -8,7 +8,7 @@ import me.earthme.luminol.enums.EnumConfigCategory;
- @ConfigClassInfo(configAttribution = EnumConfigCategory.MISC, mainName = "server_mod_name")
+ @ConfigClassInfo(category = EnumConfigCategory.MISC, name = "server_mod_name")
 public class ServerModNameConfig implements IConfigModule {
-     @ConfigInfo(baseName = "name")
+     @ConfigInfo(name = "name")
 -    public static String serverModName = "Luminol";
 +    public static String serverModName = "Lophine";
 
-     @ConfigInfo(baseName = "vanilla_spoof")
+     @ConfigInfo(name = "vanilla_spoof")
     public static boolean fakeVanilla = false;
@@ -5,26 +5,26 @@ Subject: [PATCH] Transformed Configs


 diff --git a/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java
-index 4e906e8e0ebd57b9f7000e4194280e3e3636e52c..14eefd162c9facd54a53718a7a0b1b0266e1ada8 100644
+index 66ae993896ba38a7fa5302d4ff88a52e4a0bb72c..c6d53d720437f43a713469049de3d90d1082cd2e 100644
 --- a/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java
 +++ b/src/main/java/me/earthme/luminol/config/modules/experiment/CommandConfig.java
@@ -11,6 +11,7 @@ public class CommandConfig implements IConfigModule {
-     @TransformedConfig(name = "enable", category = {"experiment", "force_the_data_command_to_be_enabled"})
-     @ConfigInfo(baseName = "enable_data_command")
+     @TransformedConfig(name = "enable", directory = {"experiment", "force_the_data_command_to_be_enabled"})
+     @ConfigInfo(name = "enable_data_command")
     public static boolean data = false;
-+    @TransformedConfig(name = "command_block_enabled", category = {"experiment", "command"}, originInstance = "lophine")
-     @TransformedConfig(name = "enabled", category = {"experiment", "force_enable_command_block_command_execution"})
-     @ConfigInfo(baseName = "enable_command_block")
+    @TransformedConfig(name = "command_block_enabled", directory = {"experiment", "command"}, originInstance = "lophine")
+     @TransformedConfig(name = "enabled", directory = {"experiment", "force_enable_command_block_command_execution"})
+     @ConfigInfo(name = "enable_command_block")
     public static boolean commandBlock = false;
 diff --git a/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java b/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java
-index 192a67360db810934d02a15c955af3579e6f6b20..fbafc5a8aa2581301e62e12adb22169ab7fd8e19 100644
+index 35e6014f04093050a9a62b895b43e5c5d8c6a28e..11abfb884f972fd73ca4c13a6e309de1bcd23fd5 100644
 --- a/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java
 +++ b/src/main/java/me/earthme/luminol/config/modules/optimizations/PaperPacketLimiterConfig.java
@@ -8,6 +8,7 @@ import me.earthme.luminol.enums.EnumConfigCategory;
 
- @ConfigClassInfo(configAttribution = EnumConfigCategory.OPTIMIZATIONS, mainName = "force_disable_packet_limiter_of_paper")
+ @ConfigClassInfo(category = EnumConfigCategory.OPTIMIZATIONS, name = "force_disable_packet_limiter_of_paper")
 public class PaperPacketLimiterConfig implements IConfigModule {
-+    @TransformedConfig(name = "unlimit-packet", category = {"misc", "network"}, originInstance = "lophine")
-     @TransformedConfig(name = "force_disable", category = {"misc", "force_disable_packet_limiter_of_paper"})
-     @ConfigInfo(baseName = "force_disable")
+    @TransformedConfig(name = "unlimit-packet", directory = {"misc", "network"}, originInstance = "lophine")
+     @TransformedConfig(name = "force_disable", directory = {"misc", "force_disable_packet_limiter_of_paper"})
+     @ConfigInfo(name = "force_disable")
     public static boolean forceDisable = false;
@@ -8,7 +8,7 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/d93e9766d3797d130
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java b/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java
-index 102de78be0eb82d6898b4104fad1bf5e8366f993..0f8c9d4932c8bbd619f21d4aa28b890e14439b46 100644
+index 3a6314ed7f62c6473ce9ddc9deeee2a32b9d2893..23a0f8100eb3162331161635e8051981c4e34aed 100644
 --- a/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java
 +++ b/src/main/java/org/leavesmc/leaves/util/ItemOverstackUtils.java
@@ -17,12 +17,173 @@
@@ -185,4 +185,3 @@ index 102de78be0eb82d6898b4104fad1bf5e8366f993..0f8c9d4932c8bbd619f21d4aa28b890e
 +        }
 +    }
 }
-\ No newline at end of file
@@ -48,7 +48,7 @@ index 11e6197dec541b28733715f0d7eaa4c7b834d632..de1263404395c28209234a556347284f
         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 567d63ae589705e13403814b36e35d00c241a69e..3f4b1c54f9207ba1854a8c8da965cbaca5ea517d 100644
+index 0c6d48363cd65cd22b4cc0ab97be977e133b64be..e94687b3aa960f9c630f459fedc17bc01846eaf7 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
@@ -1948,6 +1948,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -18,7 +18,7 @@ index 6868b915bf3deb85783a638d4441a15fea6da2dc..70740381c6501c1a518c52b24381edd1
                     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 8ec753fe9c84ffe1188f7e7ebb6895cf4bba9e39..ee4a459700d75676eae3422d4a0e10be73c45871 100644
+index 90c36bb87a761119edb376f3bd425d48d29bf36f..a720d8db40ca56c997a4eeae14ebbc6fe764892c 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -147,7 +147,7 @@ import net.minecraft.world.waypoints.WaypointTransmitter;
@@ -30,7 +30,7 @@ index 8ec753fe9c84ffe1188f7e7ebb6895cf4bba9e39..ee4a459700d75676eae3422d4a0e10be
     // CraftBukkit start
     private static final int CURRENT_LEVEL = 2;
     public boolean preserveMotion = true; // Paper - Fix Entity Teleportation and cancel velocity if teleported; keep initial motion on first snapTo
-@@ -6472,4 +6472,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -6474,4 +6474,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
     // Paper end - Expose entity id counter
 
     public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Mon, 29 Sep 2025 22:56:03 +0800
+Subject: [PATCH] Add config to enable scoreboard command
+
+
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
+index e0e9fcf3224f55f2ef31c8afca3154a5992f761b..6633af3cff77bcd4bcc591c032d647b7a850dced 100644
+--- a/net/minecraft/commands/Commands.java
+++ b/net/minecraft/commands/Commands.java
+@@ -231,7 +231,11 @@ public class Commands {
+         //RotateCommand.register(this.dispatcher); // Folia - region threading - TODO later
+         SayCommand.register(this.dispatcher);
+         //ScheduleCommand.register(this.dispatcher); // Folia - region threading
+-        //ScoreboardCommand.register(this.dispatcher, context); // Folia - region threading
+        // Lophine start - Add a config to enable scoreboard command
+        if (fun.bm.lophine.config.modules.experiment.CommandConfig.scoreboard) {
+            ScoreboardCommand.register(this.dispatcher, context); // Folia - region threading
+        }
+        // Lophine start - Add a config to enable scoreboard command
+         SeedCommand.register(this.dispatcher, selection != Commands.CommandSelection.INTEGRATED);
+         VersionCommand.register(this.dispatcher, selection != Commands.CommandSelection.INTEGRATED);
+         SetBlockCommand.register(this.dispatcher, context);
@@ -97,10 +97,10 @@ index c485d5b3ba95f2a969bdf0dab9654ac284976f8d..b957585cf7cf7f845e20f59c7b355722
                 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 e0e9fcf3224f55f2ef31c8afca3154a5992f761b..a5b59eb79c014ef7a48ff305ed554fc33a184d87 100644
+index 6633af3cff77bcd4bcc591c032d647b7a850dced..dc5a558c72a5a7ab8a650262c6a1a2dc5142b8fc 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -247,7 +247,11 @@ public class Commands {
+@@ -251,7 +251,11 @@ public class Commands {
         TeleportCommand.register(this.dispatcher);
         TellRawCommand.register(this.dispatcher, context);
         //TestCommand.register(this.dispatcher, context); // Folia - region threading
@@ -114,7 +114,7 @@ index e0e9fcf3224f55f2ef31c8afca3154a5992f761b..a5b59eb79c014ef7a48ff305ed554fc3
         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 d08a5b553f4e5932d960fbcdeb6a43419730e32a..a0f1db50adf5163a671d3d9e9df7adb7de4250c6 100644
+index b4b3ff86f7c4afb94fc4da5133746391a078a7fb..b156b5c635f931a3d4abc0584591f90476d011a6 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
@@ -267,7 +267,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -5,10 +5,10 @@ Subject: [PATCH] Add config to enable waypoint command & bar


 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index a5b59eb79c014ef7a48ff305ed554fc33a184d87..e8c7cc10f10fc013100fa66f3489ac98b3a29227 100644
+index dc5a558c72a5a7ab8a650262c6a1a2dc5142b8fc..9eee09ecc18abcc5972f65938ba8607dfeede026 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -255,7 +255,11 @@ public class Commands {
+@@ -259,7 +259,11 @@ public class Commands {
         TimeCommand.register(this.dispatcher);
         TitleCommand.register(this.dispatcher, context);
         //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
@@ -0,0 +1,59 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 28 Sep 2025 13:21:30 +0800
+Subject: [PATCH] Rewrite tickCount support
+
+
+diff --git a/io/papermc/paper/threadedregions/TickRegionScheduler.java b/io/papermc/paper/threadedregions/TickRegionScheduler.java
+index b957585cf7cf7f845e20f59c7b355722880f3b4e..9b279d003eb9f780ed2723c98b28d9f4d6e3a281 100644
+--- a/io/papermc/paper/threadedregions/TickRegionScheduler.java
+++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java
+@@ -412,6 +412,8 @@ public final class TickRegionScheduler {
+             }
+             // Luminol end - Add tick command support
+ 
+            MinecraftServer.getServer().handleTickCount(tickCount); // Lophine - reuse tick count
+
+             if (!this.tryMarkTicking()) {
+                 if (!this.cancelled.get()) {
+                     throw new IllegalStateException("Scheduled region should be acquirable");
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index b156b5c635f931a3d4abc0584591f90476d011a6..ef0b401affa58077e8dd32b52063202a1c7e0bb6 100644
+--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
+@@ -305,6 +305,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ 
+     // Folia start - regionised ticking
+     public final io.papermc.paper.threadedregions.RegionizedServer regionizedServer = new io.papermc.paper.threadedregions.RegionizedServer();
+    private int tickCount; // Lophine - reuse tick count
+    private int lastTickCount;
+ 
+     @Override
+     public <V> CompletableFuture<V> submit(java.util.function.Supplier<V> task) {
+@@ -2227,9 +2229,25 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         return false;
+     }
+ 
+    // Lophine start - reuse tick count
+     public int getTickCount() {
+-        throw new UnsupportedOperationException(); // Folia - region threading
+        return tickCount;
+    }
+
+    public boolean checkTickCount(int period) {
+        if (tickCount % period == 0) {
+            return true;
+        }
+
+        int nextPeriodTick = ((lastTickCount / period) + 1) * period;
+        return nextPeriodTick < tickCount;
+    }
+
+    public void handleTickCount(int tickCount) {
+        this.lastTickCount = this.tickCount;
+        this.tickCount += tickCount;
+     }
+    // Lophine end - reuse tick count
+ 
+     public int getSpawnProtectionRadius() {
+         return 16;
@@ -8,27 +8,18 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/ea91106ae57fc4cc1
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java
-index 8405157ec35a443e238fa6866772c839621d73d7..4edb6e6e6287f232f7eef45c747554264ec05319 100644
+index 8405157ec35a443e238fa6866772c839621d73d7..67f3454e6479abb241a7d94699d4f7bec22da56b 100644
 --- a/io/papermc/paper/threadedregions/RegionizedServer.java
 +++ b/io/papermc/paper/threadedregions/RegionizedServer.java
@@ -334,6 +334,8 @@ public final class RegionizedServer {
         }
         // Luminol end - Add a config to enable tick command
 
-+        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(tickCount); // Leaves - protocol
+        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // Leaves - protocol
 +
         // tick connections
         this.tickConnections();
 
-@@ -443,6 +445,8 @@ public final class RegionizedServer {
- 
-         world.updateTickData();
- 
-+        MinecraftServer.getServer().handleTickCount(tickCount); // Lophine - reuse tick count
-+
-         world.moonrise$getChunkTaskScheduler().chunkHolderManager.processTicketUpdates(); // required to eventually process ticket updates
-     }
- 
 diff --git a/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java b/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
 index fb263fa1f30a7dfcb7ec2656abfb38e5fe88eac9..56fd1ed7ccaf96e7eedea60fbdbf7f934939d563 100644
 --- a/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
@@ -57,36 +48,6 @@ index fb263fa1f30a7dfcb7ec2656abfb38e5fe88eac9..56fd1ed7ccaf96e7eedea60fbdbf7f93
             }
         };
     }
-diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index b156b5c635f931a3d4abc0584591f90476d011a6..0b7c014114f1f8648824fe7c9b75fde3ea79162a 100644
--- a/net/minecraft/server/MinecraftServer.java
-+++ b/net/minecraft/server/MinecraftServer.java
-@@ -305,6 +305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     // Folia start - regionised ticking
-     public final io.papermc.paper.threadedregions.RegionizedServer regionizedServer = new io.papermc.paper.threadedregions.RegionizedServer();
-+    private int tickCount;
- 
-     @Override
-     public <V> CompletableFuture<V> submit(java.util.function.Supplier<V> task) {
-@@ -2227,9 +2228,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         return false;
-     }
- 
-+    // Lophine start - reuse tick count
-     public int getTickCount() {
-        throw new UnsupportedOperationException(); // Folia - region threading
-+        if (false) throw new UnsupportedOperationException(); // Folia - region threading
-+        return this.tickCount;
-+    }
-+
-+    public void handleTickCount(int tickCount1) {
-+        tickCount = tickCount1;
-     }
-+    // Lophine end - reuse tick count
- 
-     public int getSpawnProtectionRadius() {
-         return 16;
 diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 index 8150b16c196edcb226be9268ea6e0012e44517fa..c54bf0429c0ca3a35a730658c7b1b3ddc776bf9e 100644
 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
@@ -446,10 +446,10 @@ index 10b2cc20bbf3b70e4e09dbbe14b90506e6366158..1535bb8cec8692e8d26eaff090288f1b
     }
 
 diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 4b634dbb45dfb0823e7b21cf2354f89e5a6331e9..ef32bf1351aa28953bfc625d7a7d5175181a7acc 100644
+index aca3303a043144894ae20ddc43abc55790db44ad..55cbf9b4cc568fb9b418433f597ed6b64e4409b0 100644
 --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-@@ -145,7 +145,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+@@ -148,7 +148,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
     public void setItem(int index, ItemStack stack) {
         this.unpackLootTable(null);
         this.getItems().set(index, stack);
@@ -7,25 +7,6 @@ Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
 As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/79d9ef74c2684eb49060f07e1ab31c827326c9a5/leaves-server/minecraft-patches/features/0009-Redstone-Shears-Wrench.patch)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

-diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java
-index 6db566adf2d0df1d26221eda04aa01738df6d3d2..24ebfdf98e343a7892af621d032c35819156deec 100644
--- a/net/minecraft/world/item/BlockItem.java
-+++ b/net/minecraft/world/item/BlockItem.java
-@@ -56,6 +56,14 @@ public class BlockItem extends Item {
-             if (blockPlaceContext == null) {
-                 return InteractionResult.FAIL;
-             } else {
-+                // Leaves start - shears wrench
-+                if (org.leavesmc.leaves.util.ShearsWrenchUtil.shouldSkipPlace(context)) {
-+                    if (context.getPlayer() != null) {
-+                        context.getPlayer().containerMenu.forceHeldSlot(blockPlaceContext.getHand());
-+                    }
-+                    return InteractionResult.FAIL;
-+                }
-+                // Leaves end - shears wrench
-                 BlockState placementState = this.getPlacementState(blockPlaceContext);
-                 // CraftBukkit start - special case for handling block placement with water lilies and snow buckets
-                 org.bukkit.block.BlockState bukkitState = null;
 diff --git a/net/minecraft/world/item/ShearsItem.java b/net/minecraft/world/item/ShearsItem.java
 index 8cf3e51e12f9cf98836657e722edb23943f9e866..5fd5e9fd4e1a79dd1a9d62a5cf0c308805979420 100644
 --- a/net/minecraft/world/item/ShearsItem.java
@@ -6,7 +6,7 @@ Subject: [PATCH] Compatibility fix for Raid Revert and Cross Region Damage


 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 3f4b1c54f9207ba1854a8c8da965cbaca5ea517d..a8348a073682eec31990e9ab963b11ad32cf8bf8 100644
+index e94687b3aa960f9c630f459fedc17bc01846eaf7..f4f4f886b6558d39d292a45665953f497f84be53 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
@@ -1216,6 +1216,29 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -5,10 +5,18 @@ Subject: [PATCH] I18n support


 diff --git a/net/minecraft/locale/Language.java b/net/minecraft/locale/Language.java
-index 7b9e2a1a208b46a69c16e6afd8b502259893574f..db46a31ea8a36562e548eb07f0c4cf9b9e8c3360 100644
+index 7b9e2a1a208b46a69c16e6afd8b502259893574f..c300ae4363298fecef8fa9bf739f01c0a11e145f 100644
 --- a/net/minecraft/locale/Language.java
 +++ b/net/minecraft/locale/Language.java
-@@ -65,7 +65,7 @@ public abstract class Language {
+@@ -36,6 +36,7 @@ public abstract class Language {
+         Map<String, String> map = new HashMap<>();
+         BiConsumer<String, String> biConsumer = map::put;
+         parseTranslations(biConsumer, "/assets/minecraft/lang/en_us.json");
+        fun.bm.lophine.utils.ServerI18nUtil.loadLophineI18nDefault(biConsumer);
+         deprecatedTranslationsInfo.applyToMap(map);
+         final Map<String, String> map1 = Map.copyOf(map);
+         return new Language() {
+@@ -65,7 +66,7 @@ public abstract class Language {
         };
     }
 
@@ -33,10 +33,10 @@ index 66ec0424a46dcd49cf44467357d80b1a2d84d3b2..04ae8de63af0a8abe578f14c8ef85fd4
     private DisconnectionDetails disconnectionDetails;
     private boolean encrypted;
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 0b7c014114f1f8648824fe7c9b75fde3ea79162a..384b121df8bfc72b21b607e8fa4ae90efcc6f3e8 100644
+index ef0b401affa58077e8dd32b52063202a1c7e0bb6..c461ab6c6ab21008be893f84913f0e6f9cf6d336 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -348,6 +348,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -349,6 +349,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     }
     // Folia end - regionised ticking
 
@@ -45,15 +45,19 @@ index 0b7c014114f1f8648824fe7c9b75fde3ea79162a..384b121df8bfc72b21b607e8fa4ae90e
     public static <S extends MinecraftServer> S spin(Function<Thread, S> threadFunction) {
         ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.init(); // Paper - rewrite data converter system
         AtomicReference<S> atomicReference = new AtomicReference<>();
-@@ -1039,6 +1041,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1040,6 +1042,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     // Folia end - region threading
 
     public void stopServer() {
-+        this.getBotList().removeAll(); // Leaves - save or remove bot
+        // Leaves end - save or remove bot
+        if (!this.getBotList().forceShutdown && !this.getBotList().removeAll()) {
+            return;
+        }
+        // Leaves end - save or remove bot
         // Folia start - region threading
         // halt scheduler
         // don't wait, we may be on a scheduler thread
-@@ -1589,7 +1592,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1590,7 +1597,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         int i = this.pauseWhileEmptySeconds() * 20;
         this.removeDisabledPluginsBlockingSleep(); // Paper - API to allow/disallow tick sleeping
         if (false && i > 0) { // Folia - region threading - this is complicated to implement, and even if done correctly is messy
@@ -62,7 +66,7 @@ index 0b7c014114f1f8648824fe7c9b75fde3ea79162a..384b121df8bfc72b21b607e8fa4ae90e
                 this.emptyTicks++;
             } else {
                 this.emptyTicks = 0;
-@@ -1913,6 +1916,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1914,6 +1921,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
     public void tickConnection() {
         this.getConnection().tick();
@@ -70,7 +74,7 @@ index 0b7c014114f1f8648824fe7c9b75fde3ea79162a..384b121df8bfc72b21b607e8fa4ae90e
     }
 
     private void synchronizeTime(ServerLevel level) {
-@@ -2991,6 +2995,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -3001,6 +3009,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         return 0;
     }
 
@@ -544,7 +548,7 @@ index 52fd730998535ea071bfc99b7cc2c254b9b656d7..0abf6f0265fcb916f2c2c76fb1313bd1
 
         for (WaypointTransmitter waypointTransmitter : this.waypoints) {
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index bfd29fc6a5af3cd28a462ce97bbc04634402b74c..319789f635b8b6bba2e8843c7fb38ef1fdf51677 100644
+index a720d8db40ca56c997a4eeae14ebbc6fe764892c..118a21e7ba82832560fb0d8fb8d6b21beeb14000 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -1225,7 +1225,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Fri, 3 Oct 2025 19:43:36 +0800
+Subject: [PATCH] Modify merge ItemEntity logic
+
+Add followTickSequenceMerge to modify merge items, due to Paper's modification of the merge radius, when the merge radius is large and stacks containing many items get stuck in an unexpected position, individual items may never reach their destination. This configuration option is added to fix this behavior.
+
+diff --git a/net/minecraft/world/entity/item/ItemEntity.java b/net/minecraft/world/entity/item/ItemEntity.java
+index e5e8c752129a6ebb0dd1315c9b8ec459be11ef07..dfd202a74ec7f2cdb9cdc208a6428090a110f811 100644
+--- a/net/minecraft/world/entity/item/ItemEntity.java
+++ b/net/minecraft/world/entity/item/ItemEntity.java
+@@ -295,7 +295,7 @@ public class ItemEntity extends Entity implements TraceableEntity, ChangePublish
+         ItemStack item = this.getItem();
+         ItemStack item1 = itemEntity.getItem();
+         if (Objects.equals(this.target, itemEntity.target) && areMergable(item, item1)) {
+-            if (item1.getCount() < item.getCount()) {
+            if (fun.bm.lophine.config.modules.misc.ItemEntityConfig.followTickSequenceMerge || item1.getCount() < item.getCount()) { // Lophine - add follow Tick Sequence Merge, see Paper#13073
+                 merge(this, item, itemEntity, item1);
+             } else {
+                 merge(itemEntity, item1, this, item);
@@ -8,7 +8,7 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/ea91106ae57fc4cc1
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5d05a8a843e605b6cb6d16883d17dd73d4c21e06..57ea85aebc72eb002d3dcf04144499feeb82081a 100644
+index 4dde33c872d463bf17ba03e926de90e6988444b2..de72f36bd22e2c7452b9c3ee40657f6119ca70b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -497,6 +497,7 @@ public final class CraftServer implements Server {
@@ -8,19 +8,13 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-index 9180f23529a31b6b0a5b38bb7cda3e32d487f691..cc8686b791f4c559e51bb06b52b02e295b6e0547 100644
+index 9180f23529a31b6b0a5b38bb7cda3e32d487f691..e1f456b31ffda9370b63e51f343847d6f9f62263 100644
 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
 +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-@@ -47,6 +47,23 @@ class PaperEventManager {
-             throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously.");
-         }
+@@ -36,6 +36,15 @@ class PaperEventManager {
 
-+        // Leaves start - skip bot
-+        if (event instanceof org.bukkit.event.player.PlayerEvent playerEvent && playerEvent.getPlayer() instanceof org.leavesmc.leaves.entity.bot.Bot) {
-+            return;
-+        }
-+        // Leaves end - skip bot
-+
+     // SimplePluginManager
+     public void callEvent(@NotNull Event event) {
 +        // Leaves start - process bot load/save
 +        if (fun.bm.lophine.config.modules.function.FakeplayerConfig.enable && fun.bm.lophine.config.modules.function.FakeplayerConfig.canResident) {
 +            if (event instanceof org.bukkit.event.world.WorldLoadEvent worldLoadEvent) {
@@ -30,7 +24,18 @@ index 9180f23529a31b6b0a5b38bb7cda3e32d487f691..cc8686b791f4c559e51bb06b52b02e29
 +            }
 +        }
 +        // Leaves end - process bot load/save
-+
+         // Leaf start - Skip event if no listeners
+         RegisteredListener[] listeners = event.getHandlers().getRegisteredListeners();
+         if (listeners.length == 0) return;
+@@ -47,6 +56,12 @@ class PaperEventManager {
+             throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously.");
+         }
+ 
+        // Leaves start - skip bot
+        if (event instanceof org.bukkit.event.player.PlayerEvent playerEvent && playerEvent.getPlayer() instanceof org.leavesmc.leaves.entity.bot.Bot) {
+            return;
+        }
+        // Leaves end - skip bot
 +
         for (RegisteredListener registration : listeners) {
             if (!registration.getPlugin().isEnabled()) {
@@ -48,7 +53,7 @@ index 0a10f49ee410d93e95ceb90108200a1a9d12b54b..d2eee37d810a6d5cf514bc71dea66a4d
         if (nmsEntity.level() != this.getHandle().getLevel()) {
             nmsEntity = nmsEntity.teleport(new TeleportTransition(this.getHandle().getLevel(), nmsEntity, TeleportTransition.DO_NOTHING));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 57ea85aebc72eb002d3dcf04144499feeb82081a..e03de696e7652b7e211bf61ff6d6cdf44a587146 100644
+index de72f36bd22e2c7452b9c3ee40657f6119ca70b3..0a96721797b9bbc643f68677bbb1d10c3c89e815 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -316,6 +316,7 @@ public final class CraftServer implements Server {
@@ -156,7 +161,7 @@ index 852e1ffef6a022caad7c8eff34091e50112a2290..8eb5d014d9ed688ffebaffb4ce0bb408
         if (entity instanceof EnderDragonPart complexPart) {
             if (complexPart.parentMob instanceof EnderDragon) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ffb10b412d19907e6f63b7e3ca67ef061eec96ba..de14df49b11f1243de9aa6870a3c8e3f429502fd 100644
+index e040f9a7c9451fbe547dda56952410047a99ddc0..05753de195bd7f4ac2952183662a8cc9ec8f4ba0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -897,7 +897,11 @@ public class CraftEventFactory {
@@ -6,28 +6,33 @@ import me.earthme.luminol.config.flags.ConfigInfo;
 import me.earthme.luminol.config.flags.TransformedConfig;
 import me.earthme.luminol.enums.EnumConfigCategory;

-@ConfigClassInfo(configAttribution = EnumConfigCategory.EXPERIMENT, mainName = "command")
+@ConfigClassInfo(category = EnumConfigCategory.EXPERIMENT, name = "command")
 public class CommandConfig implements IConfigModule {
-    @ConfigInfo(baseName = "tick_command_enabled", comments =
+    @ConfigInfo(name = "tick_command_enabled", comments =
            """
                    Allow to use tick command""")
    public static boolean tick = false;

-    @ConfigInfo(baseName = "datapack_command_enabled", comments =
+    @ConfigInfo(name = "datapack_command_enabled", comments =
            """
                    Allow to use datapack command
                        --- datapack hot-update unsupported, please restart server""")
    public static boolean datapack = false;

-    @ConfigInfo(baseName = "function_command_enabled", comments =
+    @ConfigInfo(name = "function_command_enabled", comments =
            """
                    Allow to use function command""")
    public static boolean function = false;

-    @TransformedConfig(name = "enable-waypoint", category = {"experiment", "waypoint bar"})
-    @TransformedConfig(name = "enable-waypoint", category = {"experiment", "waypoint_bar"})
-    @ConfigInfo(baseName = "waypoint_command_enabled", comments = """
-                    Allow to use waypoint command
-            """)
+    @TransformedConfig(name = "enable-waypoint", directory = {"experiment", "waypoint bar"})
+    @TransformedConfig(name = "enable-waypoint", directory = {"experiment", "waypoint_bar"})
+    @ConfigInfo(name = "waypoint_command_enabled", comments =
+            """
+                    Allow to use waypoint command""")
    public static boolean waypoint = false;
+
+    @ConfigInfo(name = "scoreboard_command_enabled", comments =
+            """
+                    Allow to use scoreboard command""")
+    public static boolean scoreboard = false;
 }
@@ -5,9 +5,9 @@ import me.earthme.luminol.config.flags.ConfigClassInfo;
 import me.earthme.luminol.config.flags.ConfigInfo;
 import me.earthme.luminol.enums.EnumConfigCategory;

-@ConfigClassInfo(configAttribution = EnumConfigCategory.EXPERIMENT, mainName = "entity_damage_source_trace")
+@ConfigClassInfo(category = EnumConfigCategory.EXPERIMENT, name = "entity_damage_source_trace")
 public class EntityDamageSourceTraceConfig implements IConfigModule {
-    @ConfigInfo(baseName = "enabled", comments =
+    @ConfigInfo(name = "enabled", comments =
            """
                    Allow trace damage source cross different Region Scheduler.""")
    public static boolean enabled = false;
@@ -5,16 +5,16 @@ import me.earthme.luminol.config.flags.ConfigClassInfo;
 import me.earthme.luminol.config.flags.ConfigInfo;
 import me.earthme.luminol.enums.EnumConfigCategory;

-@ConfigClassInfo(configAttribution = EnumConfigCategory.EXPERIMENT, mainName = "ray_tracking_entity_tracker")
+@ConfigClassInfo(category = EnumConfigCategory.EXPERIMENT, name = "ray_tracking_entity_tracker")
 public class RayTrackingEntityTrackerConfig implements IConfigModule {
-    @ConfigInfo(baseName = "enabled")
+    @ConfigInfo(name = "enabled")
    public static boolean enabled = false;
-    @ConfigInfo(baseName = "skip_marker_armor_stands")
+    @ConfigInfo(name = "skip_marker_armor_stands")
    public static boolean skipMarkerArmorStands = true;
-    @ConfigInfo(baseName = "check_interval_ms")
+    @ConfigInfo(name = "check_interval_ms")
    public static int checkIntervalMs = 10;
-    @ConfigInfo(baseName = "tracing_distance")
+    @ConfigInfo(name = "tracing_distance")
    public static int tracingDistance = 48;
-    @ConfigInfo(baseName = "hitbox_limit")
+    @ConfigInfo(name = "hitbox_limit")
    public static int hitboxLimit = 50;
 }
@@ -6,10 +6,10 @@ import me.earthme.luminol.config.flags.ConfigInfo;
 import me.earthme.luminol.config.flags.TransformedConfig;
 import me.earthme.luminol.enums.EnumConfigCategory;

-@ConfigClassInfo(configAttribution = EnumConfigCategory.FIXES, mainName = "end-void-ring")
+@ConfigClassInfo(category = EnumConfigCategory.FIXES, name = "end-void-ring")
 public class EndVoidRingsConfig implements IConfigModule {
-    @TransformedConfig(name = "enabled", category = {"gameplay", "end_void_rings"})
-    @ConfigInfo(baseName = "enabled", comments = """
+    @TransformedConfig(name = "enabled", directory = {"gameplay", "end_void_rings"})
+    @ConfigInfo(name = "enabled", comments = """
            If enabled, it will generate end void rings, like MC-159283.""")
    public static boolean enabled = false;
 }
@@ -1,32 +1,38 @@
 package fun.bm.lophine.config.modules.function;

 import me.earthme.luminol.config.IConfigModule;
+import me.earthme.luminol.config.flags.CommandSuggestions;
 import me.earthme.luminol.config.flags.ConfigClassInfo;
 import me.earthme.luminol.config.flags.ConfigInfo;
 import me.earthme.luminol.config.flags.TransformedConfig;
 import me.earthme.luminol.enums.EnumConfigCategory;

-@ConfigClassInfo(configAttribution = EnumConfigCategory.FUNCTION, mainName = "container_expansion")
+@ConfigClassInfo(category = EnumConfigCategory.FUNCTION, name = "container_expansion")
 public class ContainerExpansionConfig implements IConfigModule {
-    @TransformedConfig(name = "barrel_rows", category = {"misc", "container_expansion"})
-    @ConfigInfo(baseName = "barrel_rows", comments =
+    @TransformedConfig(name = "barrel_rows", directory = {"misc", "container_expansion"})
+    @CommandSuggestions(suggest = {"1", "2", "3", "4", "5", "6"})
+    @ConfigInfo(name = "barrel_rows", comments =
            """
                    range: 1~6""")
    public static int barrelRows = 3;

-    @TransformedConfig(name = "enderchest_rows", category = {"misc", "container_expansion"})
-    @ConfigInfo(baseName = "enderchest_rows", comments =
+    @TransformedConfig(name = "enderchest_rows", directory = {"misc", "container_expansion"})
+    @CommandSuggestions(suggest = {"1", "2", "3", "4", "5", "6"})
+    @ConfigInfo(name = "enderchest_rows", comments =
            """
                    range: 1~6""")
    public static int enderchestRows = 3;

-    @TransformedConfig(name = "shulker_stackable_count", category = {"misc", "container_expansion"})
-    @ConfigInfo(baseName = "shulker_stackable_count", comments =
+    @TransformedConfig(name = "shulker_stackable_count", directory = {"function", "container_expansion"})
+    @TransformedConfig(name = "shulker_stackable_count", directory = {"misc", "container_expansion"})
+    @CommandSuggestions(suggest = {"1", "2", "32", "64"})
+    @ConfigInfo(name = "shulker_stackable_count", directory = {"shulker_box"}, comments =
            """
                    range: 1~64""")
    public static int shulkerCount = 1;

-    @TransformedConfig(name = "same_nbt_shulker_stackable", category = {"misc", "container_expansion"})
-    @ConfigInfo(baseName = "same_nbt_shulker_stackable")
+    @TransformedConfig(name = "same_nbt_shulker_stackable", directory = {"function", "container_expansion"})
+    @TransformedConfig(name = "same_nbt_shulker_stackable", directory = {"misc", "container_expansion"})
+    @ConfigInfo(name = "same_nbt_shulker_stackable", directory = {"shulker_box"})
    public static boolean nbtShulkerStackable = false;
 }
@@ -10,73 +10,73 @@ import org.leavesmc.leaves.command.bot.BotCommand;

 import java.util.List;

-@ConfigClassInfo(configAttribution = EnumConfigCategory.FUNCTION, mainName = "fakeplayer")
+@ConfigClassInfo(category = EnumConfigCategory.FUNCTION, name = "fakeplayer")
 public class FakeplayerConfig implements IConfigModule {
-    @ConfigInfo(baseName = "enable", comments = """
+    @ConfigInfo(name = "enable", comments = """
            Enable fakeplayer functionality""")
    public static boolean enable = true;

-    @ConfigInfo(baseName = "unable-fakeplayer-names", comments = """
+    @ConfigInfo(name = "unable-fakeplayer-names", comments = """
            List of names that cannot be used for fakeplayers""")
    public static List<String> unableNames = List.of("player-name");

-    @ConfigInfo(baseName = "limit", comments = """
+    @ConfigInfo(name = "limit", comments = """
            Maximum number of fakeplayers allowed""")
    public static int limit = 10;

-    @ConfigInfo(baseName = "prefix", comments = """
+    @ConfigInfo(name = "prefix", comments = """
            Prefix for fakeplayer names""")
    public static String prefix = "";

-    @ConfigInfo(baseName = "suffix", comments = """
+    @ConfigInfo(name = "suffix", comments = """
            Suffix for fakeplayer names""")
    public static String suffix = "";

-    @ConfigInfo(baseName = "regen-amount", comments = """
+    @ConfigInfo(name = "regen-amount", comments = """
            Regeneration amount for fakeplayers""")
    public static double regenAmount = 0.0;

-    @ConfigInfo(baseName = "resident-fakeplayer", comments = """
+    @ConfigInfo(name = "resident-fakeplayer", comments = """
            Allow fakeplayers to be resident""")
    public static boolean canResident = false;

-    @ConfigInfo(baseName = "open-fakeplayer-inventory", comments = """
+    @ConfigInfo(name = "open-fakeplayer-inventory", comments = """
            Allow opening fakeplayer inventory""")
    public static boolean canOpenInventory = false;

-    @ConfigInfo(baseName = "use-action", comments = """
+    @ConfigInfo(name = "use-action", comments = """
            Allow fakeplayers to use actions""")
    public static boolean canUseAction = true;

-    @ConfigInfo(baseName = "modify-config", comments = """
+    @ConfigInfo(name = "modify-config", comments = """
            Allow modifying fakeplayer config""")
    public static boolean canModifyConfig = false;

-    @ConfigInfo(baseName = "manual-save-and-load", comments = """
+    @ConfigInfo(name = "manual-save-and-load", comments = """
            Allow manual save and load of fakeplayers""")
    public static boolean canManualSaveAndLoad = false;

-    @ConfigInfo(baseName = "cache-skin", comments = """
+    @ConfigInfo(name = "cache-skin", comments = """
            Use skin cache for fakeplayers""")
    public static boolean useSkinCache = false;

-    @ConfigInfo(baseName = "always-send-data", comments = """
+    @ConfigInfo(name = "always-send-data", comments = """
            Always send data for fakeplayers""")
    public static boolean canSendDataAlways = true;

-    @ConfigInfo(baseName = "skip-sleep-check", comments = """
+    @ConfigInfo(name = "skip-sleep-check", comments = """
            Skip sleep check for fakeplayers""")
    public static boolean canSkipSleep = false;

-    @ConfigInfo(baseName = "spawn-phantom", comments = """
+    @ConfigInfo(name = "spawn-phantom", comments = """
            Allow phantoms to spawn for fakeplayers""")
    public static boolean canSpawnPhantom = false;

-    @ConfigInfo(baseName = "simulation-distance", comments = """
+    @ConfigInfo(name = "simulation-distance", comments = """
            Simulation distance for fakeplayers (-1 for default)""")
    public static int simulationDistance = -1;

-    @ConfigInfo(baseName = "enable-locator-bar", comments = """
+    @ConfigInfo(name = "enable-locator-bar", comments = """
            Enable locator bar for fakeplayers""")
    public static boolean enableLocatorBar = false;

@@ -6,10 +6,10 @@ import me.earthme.luminol.config.flags.ConfigInfo;
 import me.earthme.luminol.config.flags.TransformedConfig;
 import me.earthme.luminol.enums.EnumConfigCategory;

-@ConfigClassInfo(configAttribution = EnumConfigCategory.FUNCTION, mainName = "language")
+@ConfigClassInfo(category = EnumConfigCategory.FUNCTION, name = "language")
 public class LanguageConfig implements IConfigModule {
-    @TransformedConfig(name = "lang", category = {"optimizations", "language"})
-    @ConfigInfo(baseName = "lang", comments = """
+    @TransformedConfig(name = "lang", directory = {"optimizations", "language"})
+    @ConfigInfo(name = "lang", comments = """
            Please use the key from https://minecraft.wiki/w/Language
            Sample of format: en_us zh_cn zh_hk zh_tw""")
    public static String lang = "en_us";
@@ -6,22 +6,22 @@ import me.earthme.luminol.config.flags.ConfigInfo;
 import me.earthme.luminol.config.flags.TransformedConfig;
 import me.earthme.luminol.enums.EnumConfigCategory;

-@ConfigClassInfo(configAttribution = EnumConfigCategory.FUNCTION, mainName = "old-feature")
+@ConfigClassInfo(category = EnumConfigCategory.FUNCTION, name = "old-feature")
 public class OldFeatureConfig implements IConfigModule {
-    @TransformedConfig(name = "spawn_invulnerable_time", category = {"misc", "old-feature"})
-    @ConfigInfo(baseName = "spawn_invulnerable_time")
+    @TransformedConfig(name = "spawn_invulnerable_time", directory = {"misc", "old-feature"})
+    @ConfigInfo(name = "spawn_invulnerable_time")
    public static boolean spawnInvulnerableTime = false;

-    @TransformedConfig(name = "old_zombie_reinforcement", category = {"misc", "old-feature"})
-    @ConfigInfo(baseName = "old_zombie_reinforcement")
+    @TransformedConfig(name = "old_zombie_reinforcement", directory = {"misc", "old-feature"})
+    @ConfigInfo(name = "old_zombie_reinforcement")
    public static boolean oldZombieReinforcement = false;

-    @TransformedConfig(name = "old_explosion_damage_calculator", category = {"misc", "old-feature"})
-    @ConfigInfo(baseName = "old_explosion_damage_calculator")
+    @TransformedConfig(name = "old_explosion_damage_calculator", directory = {"misc", "old-feature"})
+    @ConfigInfo(name = "old_explosion_damage_calculator")
    public static boolean oldExplosionDamageCalculator = false;

-    @TransformedConfig(name = "old_raid_behavior", category = {"misc", "old-feature"})
-    @TransformedConfig(name = "give_bad_omen_when_kill_raid_captain", category = {"misc", "revert_raid_changes"}, transformComments = false)
-    @ConfigInfo(baseName = "old_raid_behavior")
+    @TransformedConfig(name = "old_raid_behavior", directory = {"misc", "old-feature"})
+    @TransformedConfig(name = "give_bad_omen_when_kill_raid_captain", directory = {"misc", "revert_raid_changes"}, transformComments = false)
+    @ConfigInfo(name = "old_raid_behavior")
    public static boolean oldRaidBehavior = false;
 }
@@ -6,11 +6,11 @@ import me.earthme.luminol.config.flags.ConfigInfo;
 import me.earthme.luminol.config.flags.TransformedConfig;
 import me.earthme.luminol.enums.EnumConfigCategory;

-@ConfigClassInfo(configAttribution = EnumConfigCategory.FUNCTION, mainName = "redstone")
+@ConfigClassInfo(category = EnumConfigCategory.FUNCTION, name = "redstone")
 public class RedStoneConfig implements IConfigModule {
-    @TransformedConfig(name = "shears_rotate", category = {"misc", "redstone"})
-    @TransformedConfig(name = "allow_skip_cooldown", category = {"misc", "redstone"})
-    @ConfigInfo(baseName = "shears_rotate", comments =
+    @TransformedConfig(name = "shears_rotate", directory = {"misc", "redstone"})
+    @TransformedConfig(name = "allow_skip_cooldown", directory = {"misc", "redstone"})
+    @ConfigInfo(name = "shears_rotate", comments =
            """
                    Allows you to use the Shears to right-click to rotate the block.""")
    public static boolean shears = false;
@@ -0,0 +1,64 @@
+package fun.bm.lophine.config.modules.function;
+
+import me.earthme.luminol.config.IConfigModule;
+import me.earthme.luminol.config.flags.CommandSuggestions;
+import me.earthme.luminol.config.flags.ConfigClassInfo;
+import me.earthme.luminol.config.flags.ConfigInfo;
+import me.earthme.luminol.config.flags.TransformedConfig;
+import me.earthme.luminol.enums.EnumConfigCategory;
+
+import java.util.List;
+
+@ConfigClassInfo(category = EnumConfigCategory.FUNCTION, name = "servux-protocol")
+public class ServuxProtocolConfig implements IConfigModule {
+    @TransformedConfig(name = "entity-protocol", directory = {"function", "survux-protocol"})
+    @TransformedConfig(name = "entity-protocol", directory = {"misc", "survux-protocol"})
+    @ConfigInfo(name = "entity-protocol", directory = {"data"})
+    public static boolean entityProtocol = false;
+
+    @TransformedConfig(name = "hud-logger-protocol", directory = {"function", "survux-protocol"})
+    @TransformedConfig(name = "hud-logger-protocol", directory = {"misc", "survux-protocol"})
+    @ConfigInfo(name = "hud-logger-protocol")
+    public static boolean hudLoggerProtocol = false;
+
+    @TransformedConfig(name = "hud-metadata-protocol", directory = {"function", "survux-protocol"})
+    @TransformedConfig(name = "hud-metadata-protocol", directory = {"misc", "survux-protocol"})
+    @ConfigInfo(name = "hud-metadata-protocol")
+    public static boolean hudMetadataProtocol = false;
+
+    @TransformedConfig(name = "hud-metadata-share-seed", directory = {"function", "survux-protocol"})
+    @TransformedConfig(name = "hud-metadata-share-seed", directory = {"misc", "survux-protocol"})
+    @ConfigInfo(name = "hud-metadata-share-seed")
+    public static boolean hudMetadataShareSeed = false;
+
+    @TransformedConfig(name = "structure-protocol", directory = {"function", "survux-protocol"})
+    @TransformedConfig(name = "structure-protocol", directory = {"misc", "survux-protocol"})
+    @ConfigInfo(name = "structure-protocol")
+    public static boolean structureProtocol = false;
+
+    @TransformedConfig(name = "hud-enabled-loggers", directory = {"function", "survux-protocol"})
+    @TransformedConfig(name = "hud-enabled-loggers", directory = {"misc", "survux-protocol"})
+    @ConfigInfo(name = "hud-enabled-loggers")
+    public static List<String> hudEnabledLoggers = List.of("tps", "mob_caps");
+
+    @TransformedConfig(name = "hud-update-interval", directory = {"function", "survux-protocol"})
+    @TransformedConfig(name = "hud-update-interval", directory = {"misc", "survux-protocol"})
+    @ConfigInfo(name = "hud-update-interval")
+    public static int hudUpdateInterval = 1;
+
+    @TransformedConfig(name = "litematics-enabled", directory = {"function", "survux-protocol"})
+    @TransformedConfig(name = "litematics-enabled", directory = {"misc", "survux-protocol"})
+    @ConfigInfo(name = "litematics-enabled", directory = {"litematics"})
+    public static boolean litematicsEnabled = false;
+
+    @TransformedConfig(name = "litematics-max-nbt-size", directory = {"function", "survux-protocol"})
+    @TransformedConfig(name = "litematics-max-nbt-size", directory = {"misc", "survux-protocol"})
+    @CommandSuggestions(suggest = {"-1", "2097152"})
+    @ConfigInfo(name = "litematics-max-nbt-size", directory = {"litematics"})
+    public static int litematicsMaxNbtSize = 2097152;
+
+    @TransformedConfig(name = "litematics-print-max-delay-ticks", directory = {"function", "survux-protocol"})
+    @CommandSuggestions(suggest = {"-1", "1200"})
+    @ConfigInfo(name = "litematics-print-max-delay-ticks", directory = {"litematics"}, comments = "The max delay ticks for printing litematics, -1 to disable")
+    public static int maxDelay = 1200;
+}
@@ -1,48 +0,0 @@
-package fun.bm.lophine.config.modules.function;
-
-import me.earthme.luminol.config.IConfigModule;
-import me.earthme.luminol.config.flags.ConfigClassInfo;
-import me.earthme.luminol.config.flags.ConfigInfo;
-import me.earthme.luminol.config.flags.TransformedConfig;
-import me.earthme.luminol.enums.EnumConfigCategory;
-
-import java.util.List;
-
-@ConfigClassInfo(configAttribution = EnumConfigCategory.FUNCTION, mainName = "survux-protocol")
-public class SurvuxProtocolConfig implements IConfigModule {
-    @TransformedConfig(name = "entity-protocol", category = {"misc", "survux-protocol"})
-    @ConfigInfo(baseName = "entity-protocol")
-    public static boolean entityProtocol = false;
-
-    @TransformedConfig(name = "hud-logger-protocol", category = {"misc", "survux-protocol"})
-    @ConfigInfo(baseName = "hud-logger-protocol")
-    public static boolean hudLoggerProtocol = false;
-
-    @TransformedConfig(name = "hud-metadata-protocol", category = {"misc", "survux-protocol"})
-    @ConfigInfo(baseName = "hud-metadata-protocol")
-    public static boolean hudMetadataProtocol = false;
-
-    @TransformedConfig(name = "hud-metadata-share-seed", category = {"misc", "survux-protocol"})
-    @ConfigInfo(baseName = "hud-metadata-share-seed")
-    public static boolean hudMetadataShareSeed = false;
-
-    @TransformedConfig(name = "structure-protocol", category = {"misc", "survux-protocol"})
-    @ConfigInfo(baseName = "structure-protocol")
-    public static boolean structureProtocol = false;
-
-    @TransformedConfig(name = "hud-enabled-loggers", category = {"misc", "survux-protocol"})
-    @ConfigInfo(baseName = "hud-enabled-loggers")
-    public static List<String> hudEnabledLoggers = List.of("tps", "mob_caps");
-
-    @TransformedConfig(name = "hud-update-interval", category = {"misc", "survux-protocol"})
-    @ConfigInfo(baseName = "hud-update-interval")
-    public static int hudUpdateInterval = 1;
-
-    @TransformedConfig(name = "litematics-enabled", category = {"misc", "survux-protocol"})
-    @ConfigInfo(baseName = "litematics-enabled")
-    public static boolean litematicsEnabled = false;
-
-    @TransformedConfig(name = "litematics-max-nbt-size", category = {"misc", "survux-protocol"})
-    @ConfigInfo(baseName = "litematics-max-nbt-size")
-    public static int litematicsMaxNbtSize = 2097152;
-}
@@ -6,13 +6,14 @@ import me.earthme.luminol.config.flags.ConfigInfo;
 import me.earthme.luminol.config.flags.TransformedConfig;
 import me.earthme.luminol.enums.EnumConfigCategory;

-@ConfigClassInfo(configAttribution = EnumConfigCategory.MISC, mainName = "villager")
+@ConfigClassInfo(category = EnumConfigCategory.MISC, name = "villager")
 public class VillagerConfig implements IConfigModule {
-    @TransformedConfig(name = "villager-infinite-trade", category = {"misc", "villager"})
-    @TransformedConfig(name = "villager-infinite-trade", category = {"misc", "villager-config"})
-    @ConfigInfo(baseName = "villager-infinite-trade", comments =
+    @TransformedConfig(name = "villager-infinite-trade", directory = {"misc", "villager"})
+    @TransformedConfig(name = "villager-infinite-trade", directory = {"misc", "villager-config"})
+    @ConfigInfo(name = "villager-infinite-trade", comments =
            """
                    Allow villager infinite trade (limit of 524288 times)
-                        ---- we won't edit saved data, only edit in send data to client.""")
+                        ---- we won't edit saved data, only edit in send data to client.
+                        (after we fixed void trade, this config will drop to void trade)""")
    public static boolean villagerInfiniteTrade = false;
 }
@@ -5,13 +5,13 @@ import me.earthme.luminol.config.flags.ConfigClassInfo;
 import me.earthme.luminol.config.flags.ConfigInfo;
 import me.earthme.luminol.enums.EnumConfigCategory;

-@ConfigClassInfo(configAttribution = EnumConfigCategory.MISC, mainName = "disable-check")
+@ConfigClassInfo(category = EnumConfigCategory.MISC, name = "disable-check")
 public class DisableCheckConfig implements IConfigModule {
-    @ConfigInfo(baseName = "disable-op-move-check", comments = """
+    @ConfigInfo(name = "disable-op-move-check", comments = """
            Disable the check for the operator's move check""")
    public static boolean disableOpMoveCheck = false;

-    @ConfigInfo(baseName = "disable-op-fly-check", comments = """
+    @ConfigInfo(name = "disable-op-fly-check", comments = """
            Disable the check for the operator's fly check""")
    public static boolean disableOpFlyCheck = false;
 }
@@ -0,0 +1,16 @@
+package fun.bm.lophine.config.modules.misc;
+
+import me.earthme.luminol.config.IConfigModule;
+import me.earthme.luminol.config.flags.ConfigClassInfo;
+import me.earthme.luminol.config.flags.ConfigInfo;
+import me.earthme.luminol.enums.EnumConfigCategory;
+
+@ConfigClassInfo(category = EnumConfigCategory.MISC, name = "item-entity")
+public class ItemEntityConfig implements IConfigModule {
+    @ConfigInfo(name = "follow-tick-sequence-merge", comments = """
+            Due to Paper's modification of the merge radius,
+            when the merge radius is large and stacks containing many items get stuck in an unexpected position,
+            individual items may never reach their destination.
+            This configuration option is added to fix this behavior.""")
+    public static boolean followTickSequenceMerge = false;
+}
@@ -6,20 +6,20 @@ import me.earthme.luminol.config.flags.ConfigInfo;
 import me.earthme.luminol.config.flags.TransformedConfig;
 import me.earthme.luminol.enums.EnumConfigCategory;

-@ConfigClassInfo(configAttribution = EnumConfigCategory.REMOVED, mainName = "removed_config")
+@ConfigClassInfo(category = EnumConfigCategory.REMOVED, name = "removed_config")
 public class RemovedConfig implements IConfigModule {
-    @TransformedConfig(name = "disable_end_crystal_check", category = {"fixes", "end_crystal"}, transform = false)
-    @TransformedConfig(name = "disable_end_crystal_check", category = {"misc", "end_crystal"}, transform = false)
-    @TransformedConfig(name = "allow_skip_cooldown", 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 = "use_old_position_find", category = {"misc", "revert_raid_changes"}, transform = false)
-    @TransformedConfig(name = "vanilla_hopper", category = {"misc", "redstone"}, transform = false)
-    @TransformedConfig(name = "old_replaceable_by_mushrooms", category = {"misc", "old-feature"}, transform = false)
-    @TransformedConfig(name = "old_nether_portal_collision", category = {"misc", "old-feature"}, transform = false)
-    @TransformedConfig(name = "better_shulker_box", category = {"misc", "container_expansion"}, transform = false)
-    @ConfigInfo(baseName = "removed", comments =
+    @TransformedConfig(name = "disable_end_crystal_check", directory = {"fixes", "end_crystal"}, transform = false)
+    @TransformedConfig(name = "disable_end_crystal_check", directory = {"misc", "end_crystal"}, transform = false)
+    @TransformedConfig(name = "allow_skip_cooldown", directory = {"misc", "revert_raid_changes"}, transform = false)
+    @TransformedConfig(name = "bad_omen_infinite", directory = {"misc", "revert_raid_changes"}, transform = false)
+    @TransformedConfig(name = "skip_height_check", directory = {"misc", "revert_raid_changes"}, transform = false)
+    @TransformedConfig(name = "skip_self_raid_check", directory = {"misc", "revert_raid_changes"}, transform = false)
+    @TransformedConfig(name = "use_old_position_find", directory = {"misc", "revert_raid_changes"}, transform = false)
+    @TransformedConfig(name = "vanilla_hopper", directory = {"misc", "redstone"}, transform = false)
+    @TransformedConfig(name = "old_replaceable_by_mushrooms", directory = {"misc", "old-feature"}, transform = false)
+    @TransformedConfig(name = "old_nether_portal_collision", directory = {"misc", "old-feature"}, transform = false)
+    @TransformedConfig(name = "better_shulker_box", directory = {"misc", "container_expansion"}, transform = false)
+    @ConfigInfo(name = "removed", comments =
            """
                    RemovedConfig redirect to here, no any function.""")
    public static boolean enabled = true;
@@ -6,9 +6,9 @@ import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
 import com.mojang.logging.LogUtils;
 import fun.bm.lophine.config.modules.function.LanguageConfig;
+import io.papermc.paper.ServerBuildInfo;
 import me.earthme.luminol.config.ConfigManager;
 import me.earthme.luminol.config.ConfigsInstance;
-import net.minecraft.DetectedVersion;
 import net.minecraft.locale.DeprecatedTranslationsInfo;
 import net.minecraft.locale.Language;
 import net.minecraft.network.chat.FormattedText;
@@ -41,7 +41,7 @@ import java.util.function.BiConsumer;
 */
 public class ServerI18nUtil {
    private static final Logger logger = LogUtils.getClassLogger();
-    private static final String VERSION = DetectedVersion.BUILT_IN.name();
+    private static final String VERSION = ServerBuildInfo.buildInfo().minecraftVersionId();
    private static final String BASE_PATH = "cache/lophine/" + VERSION + "/";
    private static final String defaultLophineLangPath = "/assets/lophine/lang/en_us.json";
    private static final String manifestUrl = "https://launchermeta.mojang.com/mc/game/version_manifest.json";
@@ -83,8 +83,8 @@ public class ServerI18nUtil {
            logger.warn("Unsupported language: {}", LanguageConfig.lang);
            // Fallback to English
            final ConfigsInstance configsInstance = ConfigManager.configfiles.get("lophine");
-            configsInstance.setConfig(new String[]{"optimizations", "lang"}, "en_us");
-            configsInstance.reloadAsync();
+            configsInstance.setConfig(new String[]{"function", "language", "lang"}, "en_us");
+            configsInstance.reloadAsync(true);
        } catch (Exception e) {
            if (e instanceof MalformedJsonException malformedJson) {
                malformedJson.clean();
@@ -17,6 +17,7 @@

 package org.leavesmc.leaves.bot;

+import ca.spottedleaf.moonrise.common.util.TickThread;
 import com.google.common.collect.Maps;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
@@ -41,6 +42,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.storage.ValueInput;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.event.entity.EntityRemoveEvent;
@@ -51,6 +53,7 @@ import org.slf4j.Logger;

 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;

 public class BotList {

@@ -67,6 +70,8 @@ public class BotList {
    private final Map<String, ServerBot> botsByName = Maps.newHashMap();
    private final Map<String, Set<String>> botsNameByWorldUuid = Maps.newHashMap();

+    public boolean forceShutdown = false;
+
    public BotList(MinecraftServer server) {
        this.server = server;
        this.dataStorage = new BotDataStorage(server.storageSource);
@@ -129,7 +134,7 @@ public class BotList {

        ResourceKey<Level> resourcekey = null;
        if (nbt.getLong("WorldUUIDMost").isPresent() && nbt.getLong("WorldUUIDLeast").isPresent()) {
-            org.bukkit.World bWorld = Bukkit.getServer().getWorld(new UUID(nbt.getLong("WorldUUIDMost").orElseThrow(), nbt.getLong("WorldUUIDLeast").orElseThrow()));
+            World bWorld = Bukkit.getServer().getWorld(new UUID(nbt.getLong("WorldUUIDMost").orElseThrow(), nbt.getLong("WorldUUIDLeast").orElseThrow()));
            if (bWorld != null) {
                resourcekey = ((CraftWorld) bWorld).getHandle().dimension();
            }
@@ -167,30 +172,36 @@ public class BotList {
        this.botsByUUID.put(bot.getUUID(), bot);

        bot.supressTrackerForLogin = true;
-        world.addNewPlayer(bot);
+
+        io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueTickTaskQueue(
+                world, net.minecraft.util.Mth.floor(location.getX()) >> 4, net.minecraft.util.Mth.floor(location.getZ()) >> 4,
+                () -> {
+                    world.addNewPlayer(bot);
+
+                    BotJoinEvent event1 = new BotJoinEvent(bot.getBukkitEntity(), PaperAdventure.asAdventure(Component.translatable("multiplayer.player.joined", bot.getDisplayName())).style(Style.style(NamedTextColor.YELLOW)));
+                    this.server.server.getPluginManager().callEvent(event1);
+
+                    net.kyori.adventure.text.Component joinMessage = event1.joinMessage();
+                    if (joinMessage != null && !joinMessage.equals(net.kyori.adventure.text.Component.empty())) {
+                        this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(joinMessage), false);
+                    }
+
+                    bot.renderInfo();
+                    bot.supressTrackerForLogin = false;
+
+                    bot.level().getChunkSource().chunkMap.addEntity(bot);
+                    bot.renderData();
+                    bot.initInventoryMenu();
+                    botsNameByWorldUuid
+                            .computeIfAbsent(bot.level().uuid.toString(), (k) -> new HashSet<>())
+                            .add(bot.getBukkitEntity().getRealName());
+                    BotList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", bot.getName().getString(), "Local", bot.getId(), bot.level().serverLevelData.getLevelName(), bot.getX(), bot.getY(), bot.getZ());
+                },
+                ca.spottedleaf.concurrentutil.util.Priority.HIGHER);
        optional.ifPresent(nbt -> {
            bot.loadAndSpawnEnderPearls(nbt);
            bot.loadAndSpawnParentVehicle(nbt);
        });
-
-        BotJoinEvent event1 = new BotJoinEvent(bot.getBukkitEntity(), PaperAdventure.asAdventure(Component.translatable("multiplayer.player.joined", bot.getDisplayName())).style(Style.style(NamedTextColor.YELLOW)));
-        this.server.server.getPluginManager().callEvent(event1);
-
-        net.kyori.adventure.text.Component joinMessage = event1.joinMessage();
-        if (joinMessage != null && !joinMessage.equals(net.kyori.adventure.text.Component.empty())) {
-            this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(joinMessage), false);
-        }
-
-        bot.renderInfo();
-        bot.supressTrackerForLogin = false;
-
-        bot.level().getChunkSource().chunkMap.addEntity(bot);
-        bot.renderData();
-        bot.initInventoryMenu();
-        botsNameByWorldUuid
-                .computeIfAbsent(bot.level().uuid.toString(), (k) -> new HashSet<>())
-                .add(bot.getBukkitEntity().getRealName());
-        BotList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", bot.getName().getString(), "Local", bot.getId(), bot.level().serverLevelData.getLevelName(), bot.getX(), bot.getY(), bot.getZ());
        return bot;
    }

@@ -225,7 +236,7 @@ public class BotList {
            if (entity.hasExactlyOnePlayerPassenger()) {
                bot.stopRiding();
                entity.getPassengersAndSelf().forEach((entity1) -> {
-                    if (!false && entity1 instanceof AbstractVillager villager) {
+                    if (entity1 instanceof AbstractVillager villager) {
                        final Player human = villager.getTradingPlayer();
                        if (human != null) {
                            villager.setTradingPlayer(null);
@@ -279,11 +290,28 @@ public class BotList {
        }
    }

-    public void removeAll() {
+    public boolean removeAll() {
+        boolean finished = true;
+        AtomicInteger check = new AtomicInteger();
+        AtomicInteger received = new AtomicInteger();
        for (ServerBot bot : this.bots) {
            bot.resume = FakeplayerConfig.canResident;
-            this.removeBot(bot, BotRemoveEvent.RemoveReason.INTERNAL, null, FakeplayerConfig.canResident);
+            if (TickThread.isTickThreadFor(bot)) {
+                this.removeBot(bot, BotRemoveEvent.RemoveReason.INTERNAL, null, FakeplayerConfig.canResident);
+            } else {
+                finished = false;
+                check.getAndIncrement();
+                bot.getBukkitEntity().taskScheduler.schedule((Entity unused) -> {
+                    BotList.this.removeBot(bot, BotRemoveEvent.RemoveReason.INTERNAL, null, FakeplayerConfig.canResident);
+                    received.getAndIncrement();
+                    if (received.get() >= check.get()) {
+                        this.forceShutdown = true;
+                        MinecraftServer.getServer().stopServer();
+                    }
+                }, null, 1L);
+            }
        }
+        return finished;
    }

    public void loadBotInfo() {
@@ -154,7 +154,7 @@ public class ServerBot extends ServerPlayer {
            this.notSleepTicks++;
        }

-        if (FakeplayerConfig.regenAmount > 0.0 && getServer().getTickCount() % 20 == 0) {
+        if (FakeplayerConfig.regenAmount > 0.0 && getServer().checkTickCount(20)) {
            float regenAmount = (float) (FakeplayerConfig.regenAmount * 20);
            this.setHealth(Math.min(this.getHealth() + regenAmount, this.getMaxHealth()));
        }
@@ -20,9 +20,12 @@ package org.leavesmc.leaves.bot.agent.configs;
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import fun.bm.lophine.config.modules.experiment.CommandConfig;
 import fun.bm.lophine.config.modules.function.FakeplayerConfig;
+import me.earthme.luminol.utils.NullPlugin;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.waypoints.ServerWaypointManager;
+import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
+import org.leavesmc.leaves.bot.ServerBot;
 import org.leavesmc.leaves.command.CommandContext;

 public class LocatorBarConfig extends AbstractBotConfig<Boolean, Boolean, LocatorBarConfig> {
@@ -40,12 +43,20 @@ public class LocatorBarConfig extends AbstractBotConfig<Boolean, Boolean, Locato

    @Override
    public void setValue(@NotNull Boolean value) throws IllegalArgumentException {
-        this.value = value;
-        ServerWaypointManager manager = this.bot.level().getWaypointManager();
-        if (value) {
-            manager.trackWaypoint(this.bot);
+        if (bot == null) {
+            Bukkit.getGlobalRegionScheduler().runDelayed(new NullPlugin(), (task) -> setValue(value), 20);
        } else {
-            manager.untrackWaypoint(this.bot);
+            setValue(value, this.bot);
+        }
+    }
+
+    public void setValue(@NotNull Boolean value, ServerBot bot) throws IllegalArgumentException {
+        this.value = value;
+        ServerWaypointManager manager = bot.level().getWaypointManager();
+        if (value) {
+            manager.trackWaypoint(bot);
+        } else {
+            manager.untrackWaypoint(bot);
        }
    }

@@ -20,7 +20,9 @@ package org.leavesmc.leaves.bot.agent.configs;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import fun.bm.lophine.config.modules.function.FakeplayerConfig;
+import me.earthme.luminol.utils.NullPlugin;
 import net.minecraft.nbt.CompoundTag;
+import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
 import org.leavesmc.leaves.command.CommandContext;

@@ -66,6 +68,10 @@ public class SimulationDistanceConfig extends AbstractBotConfig<Integer, Integer

    @Override
    public void load(@NotNull CompoundTag nbt) {
-        this.setValue(nbt.getIntOr(getName(), FakeplayerConfig.getSimulationDistance(this.bot)));
+        if (this.bot == null) {
+            Bukkit.getGlobalRegionScheduler().runDelayed(new NullPlugin(), (task) -> load(nbt), 20);
+        } else {
+            this.setValue(nbt.getIntOr(getName(), FakeplayerConfig.getSimulationDistance(this.bot)));
+        }
    }
 }
@@ -19,8 +19,11 @@ package org.leavesmc.leaves.bot.agent.configs;

 import com.mojang.brigadier.arguments.BoolArgumentType;
 import fun.bm.lophine.config.modules.function.FakeplayerConfig;
+import me.earthme.luminol.utils.NullPlugin;
 import net.minecraft.nbt.CompoundTag;
+import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
+import org.leavesmc.leaves.bot.ServerBot;
 import org.leavesmc.leaves.command.CommandContext;

 public class SkipSleepConfig extends AbstractBotConfig<Boolean, Boolean, SkipSleepConfig> {
@@ -35,7 +38,15 @@ public class SkipSleepConfig extends AbstractBotConfig<Boolean, Boolean, SkipSle
    }

    @Override
-    public void setValue(Boolean value) throws IllegalArgumentException {
+    public void setValue(@NotNull Boolean value) throws IllegalArgumentException {
+        if (bot == null) {
+            Bukkit.getGlobalRegionScheduler().runDelayed(new NullPlugin(), (task) -> setValue(value), 20);
+        } else {
+            setValue(value, this.bot);
+        }
+    }
+
+    public void setValue(@NotNull Boolean value, ServerBot bot) throws IllegalArgumentException {
        bot.fauxSleeping = value;
    }

@@ -71,7 +71,7 @@ public class TickTypeConfig extends AbstractBotConfig<ServerBot.TickType, String
    @Override
    public void load(@NotNull CompoundTag nbt) {
        String raw = nbt.getStringOr(getName(), FakeplayerConfig.tickType.name());
-        this.setValue(switch (raw) {
+        this.setValue(switch (raw.toLowerCase()) {
            case "network" -> ServerBot.TickType.NETWORK;
            case "entity_list" -> ServerBot.TickType.ENTITY_LIST;
            default -> throw new IllegalStateException("Unexpected bot tick type value: " + raw);
@@ -20,6 +20,7 @@ package org.leavesmc.leaves.command.bot.subcommands;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import io.papermc.paper.adventure.PaperAdventure;
+import net.minecraft.world.entity.LivingEntity;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
@@ -50,6 +51,21 @@ public class RemoveCommand extends BotSubcommand {
    }

    private static boolean removeBot(@NotNull ServerBot bot, @Nullable CommandSender sender) {
+        return removeBot(bot, sender, true);
+    }
+
+    private static boolean removeBot(@NotNull ServerBot bot, @Nullable CommandSender sender, boolean taskQueue) {
+        if (taskQueue) {
+            bot.getBukkitEntity().taskScheduler.schedule((LivingEntity nmsEntity) -> {
+                removeBotOrigin(bot, sender);
+            }, null, 1L);
+        } else {
+            return removeBotOrigin(bot, sender);
+        }
+        return true;
+    }
+
+    private static boolean removeBotOrigin(@NotNull ServerBot bot, @Nullable CommandSender sender) {
        boolean success = BotList.INSTANCE.removeBot(bot, BotRemoveEvent.RemoveReason.COMMAND, sender, false);
        if (!success) {
            sender = sender == null ? Bukkit.getConsoleSender() : sender;
@@ -24,6 +24,7 @@ import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import org.leavesmc.leaves.protocol.core.invoker.*;
 import org.slf4j.Logger;
@@ -251,9 +252,9 @@ public class LeavesProtocolManager {
        return false;
    }

-    public static void handleTick(long tickCount) {
+    public static void handleTick() {
        for (var tickerInfo : TICKERS) {
-            if (tickCount % tickerInfo.owner().tickerInterval(tickerInfo.handler().tickerId()) == 0) {
+            if (MinecraftServer.getServer().checkTickCount(tickerInfo.owner().tickerInterval(tickerInfo.handler().tickerId()))) {
                tickerInfo.invoke();
            }
        }
@@ -18,7 +18,7 @@
 package org.leavesmc.leaves.protocol.servux;

 import com.mojang.logging.LogUtils;
-import fun.bm.lophine.config.modules.function.SurvuxProtocolConfig;
+import fun.bm.lophine.config.modules.function.ServuxProtocolConfig;
 import io.netty.buffer.Unpooled;
 import net.minecraft.Util;
 import net.minecraft.core.BlockPos;
@@ -144,7 +144,7 @@ public class ServuxEntityDataProtocol implements LeavesProtocol {

    @Override
    public boolean isActive() {
-        return SurvuxProtocolConfig.entityProtocol;
+        return ServuxProtocolConfig.entityProtocol;
    }

    public enum EntityDataPayloadType {
@@ -20,7 +20,7 @@ package org.leavesmc.leaves.protocol.servux;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Table;
 import com.mojang.serialization.DataResult;
-import fun.bm.lophine.config.modules.function.SurvuxProtocolConfig;
+import fun.bm.lophine.config.modules.function.ServuxProtocolConfig;
 import io.netty.buffer.Unpooled;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
@@ -104,7 +104,7 @@ public class ServuxHudDataProtocol implements LeavesProtocol {
        metadata.putString("id", HudDataPayload.CHANNEL.toString());
        metadata.putInt("version", PROTOCOL_VERSION);
        metadata.putString("servux", ServuxProtocol.SERVUX_STRING);
-        if (SurvuxProtocolConfig.hudLoggerProtocol) {
+        if (ServuxProtocolConfig.hudLoggerProtocol) {
            CompoundTag nbt = new CompoundTag();
            for (DataLogger.Type type : DataLogger.Type.VALUES) {
                nbt.putBoolean(type.getSerializedName(), isLoggerTypeEnabled(type));
@@ -185,7 +185,7 @@ public class ServuxHudDataProtocol implements LeavesProtocol {
        metadata.putInt("spawnPosZ", spawnPos.getZ());
        metadata.putInt("spawnChunkRadius", level.getGameRules().getInt(GameRules.RULE_SPAWN_CHUNK_RADIUS));

-        if (SurvuxProtocolConfig.hudMetadataShareSeed) {
+        if (ServuxProtocolConfig.hudMetadataShareSeed) {
            metadata.putLong("worldSeed", level.getSeed());
        }
    }
@@ -217,7 +217,7 @@ public class ServuxHudDataProtocol implements LeavesProtocol {
    }

    private static boolean isLoggerTypeEnabled(DataLogger.Type type) {
-        return SurvuxProtocolConfig.hudEnabledLoggers.contains(type.getSerializedName());
+        return ServuxProtocolConfig.hudEnabledLoggers.contains(type.getSerializedName());
    }

    @ProtocolHandler.Ticker
@@ -233,13 +233,13 @@ public class ServuxHudDataProtocol implements LeavesProtocol {

    @ProtocolHandler.Ticker(tickerId = "logger")
    public void loggerTick() {
-        if (!SurvuxProtocolConfig.hudLoggerProtocol) {
+        if (!ServuxProtocolConfig.hudLoggerProtocol) {
            return;
        }

        MinecraftServer server = MinecraftServer.getServer();

-        if (server.getTickCount() % SurvuxProtocolConfig.hudUpdateInterval == 0) {
+        if (server.checkTickCount(ServuxProtocolConfig.hudUpdateInterval)) {
            LOGGERS.forEach((type, logger) -> {
                if (!isLoggerTypeEnabled(type)) {
                    return;
@@ -277,7 +277,7 @@ public class ServuxHudDataProtocol implements LeavesProtocol {

    @Override
    public boolean isActive() {
-        return SurvuxProtocolConfig.hudMetadataProtocol;
+        return ServuxProtocolConfig.hudMetadataProtocol;
    }

    @Override
@@ -18,7 +18,7 @@
 package org.leavesmc.leaves.protocol.servux;

 import com.mojang.logging.LogUtils;
-import fun.bm.lophine.config.modules.function.SurvuxProtocolConfig;
+import fun.bm.lophine.config.modules.function.ServuxProtocolConfig;
 import io.netty.buffer.Unpooled;
 import it.unimi.dsi.fastutil.longs.LongIterator;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
@@ -57,7 +57,6 @@ public class ServuxStructuresProtocol implements LeavesProtocol {

    public static final int PROTOCOL_VERSION = 2;
    private static final int updateInterval = 40;
-    private static final int timeout = 30 * 20;
    private static final Map<Integer, ServerPlayer> players = new ConcurrentHashMap<>();
    private static final Map<UUID, Map<ChunkPos, Timeout>> timeouts = new HashMap<>();
    private static int retainDistance;
@@ -105,7 +104,7 @@ public class ServuxStructuresProtocol implements LeavesProtocol {

        if (chunkHasStructureReferences(pos.x, pos.z, chunk.getLevel())) {
            final Map<ChunkPos, Timeout> map = timeouts.computeIfAbsent(uuid, (u) -> new HashMap<>());
-            map.computeIfAbsent(pos, (p) -> new Timeout(tickCounter - timeout));
+            map.computeIfAbsent(pos, (p) -> new Timeout(tickCounter - ServuxProtocolConfig.maxDelay));
        }
    }

@@ -145,7 +144,7 @@ public class ServuxStructuresProtocol implements LeavesProtocol {
        tag.putString("id", StructuresPayload.CHANNEL.toString());
        tag.putInt("version", PROTOCOL_VERSION);
        tag.putString("servux", ServuxProtocol.SERVUX_STRING);
-        tag.putInt("timeout", timeout);
+        tag.putInt("timeout", ServuxProtocolConfig.maxDelay);

        sendPacket(player, new StructuresPayload(StructuresPayloadType.PACKET_S2C_METADATA, tag));
    }
@@ -270,7 +269,7 @@ public class ServuxStructuresProtocol implements LeavesProtocol {
        for (Map.Entry<ChunkPos, Timeout> entry : map.entrySet()) {
            Timeout out = entry.getValue();

-            if (out.needsUpdate(tickCounter, timeout)) {
+            if (out.needsUpdate(ServuxProtocolConfig.maxDelay, tickCounter)) {
                positionsToUpdate.add(entry.getKey());
            }
        }
@@ -336,7 +335,7 @@ public class ServuxStructuresProtocol implements LeavesProtocol {

    @Override
    public boolean isActive() {
-        return SurvuxProtocolConfig.structureProtocol;
+        return ServuxProtocolConfig.structureProtocol;
    }

    public enum StructuresPayloadType {
@@ -410,7 +409,8 @@ public class ServuxStructuresProtocol implements LeavesProtocol {
        }

        public boolean needsUpdate(int currentTick, int timeout) {
-            return currentTick - this.lastSync >= timeout;
+            if (timeout == -1 || currentTick - this.lastSync >= timeout) return true;
+            return MinecraftServer.getServer().checkTickCount(timeout);
        }

        public void setLastSync(int tickCounter) {
@@ -17,7 +17,7 @@

 package org.leavesmc.leaves.protocol.servux.litematics;

-import fun.bm.lophine.config.modules.function.SurvuxProtocolConfig;
+import fun.bm.lophine.config.modules.function.ServuxProtocolConfig;
 import io.netty.buffer.Unpooled;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
@@ -133,7 +133,7 @@ public class ServuxLitematicsProtocol implements LeavesProtocol {
                }
                playerSession.remove(uuid);
                fullPacket.readVarInt();
-                Tag tag = FriendlyByteBuf.readNbt(fullPacket, new NbtAccounter(SurvuxProtocolConfig.litematicsMaxNbtSize == -1 ? Long.MAX_VALUE : SurvuxProtocolConfig.litematicsMaxNbtSize, 512));
+                Tag tag = FriendlyByteBuf.readNbt(fullPacket, new NbtAccounter(ServuxProtocolConfig.litematicsMaxNbtSize == -1 ? Long.MAX_VALUE : ServuxProtocolConfig.litematicsMaxNbtSize, 512));
                if (!(tag instanceof CompoundTag)) {
                    ServuxProtocol.LOGGER.error("cannot read nbt tag from packet");
                    return;
@@ -269,29 +269,13 @@ public class ServuxLitematicsProtocol implements LeavesProtocol {
            long timeStart = System.currentTimeMillis();
            SchematicPlacement placement = SchematicPlacement.createFromNbt(tags);
            ReplaceBehavior replaceMode = ReplaceBehavior.fromStringStatic(tags.getStringOr("ReplaceMode", ReplaceBehavior.NONE.name()));
-            io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueTickTaskQueue(
-                    player.level(),
-                    ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(player.position()),
-                    ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkZ(player.position()),
-                    () -> {
-                        placement.pasteTo(serverLevel, replaceMode);
-                        long timeElapsed = System.currentTimeMillis() - timeStart;
-                        player.getBukkitEntity().sendActionBar(
-                                Component.text("Pasted ")
-                                        .append(Component.text(placement.getName(), NamedTextColor.AQUA))
-                                        .append(Component.text(" to world "))
-                                        .append(Component.text(serverLevel.serverLevelData.getLevelName(), NamedTextColor.LIGHT_PURPLE))
-                                        .append(Component.text(" in "))
-                                        .append(Component.text(timeElapsed, NamedTextColor.GREEN))
-                                        .append(Component.text("ms"))
-                        );
-                    });
+            placement.pasteTo(serverLevel, replaceMode, player, timeStart);
        }
    }

    @Override
    public boolean isActive() {
-        return SurvuxProtocolConfig.litematicsEnabled;
+        return ServuxProtocolConfig.litematicsEnabled;
    }

    public enum ServuxLitematicaPayloadType {
@@ -18,15 +18,23 @@
 package org.leavesmc.leaves.protocol.servux.litematics.placement;

 import com.google.common.collect.ImmutableMap;
+import fun.bm.lophine.config.modules.function.ServuxProtocolConfig;
+import io.papermc.paper.threadedregions.RegionizedServer;
+import me.earthme.luminol.utils.NullPlugin;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import net.minecraft.core.BlockBox;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.block.Mirror;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.phys.AABB;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 import org.leavesmc.leaves.protocol.servux.ServuxProtocol;
 import org.leavesmc.leaves.protocol.servux.litematics.LitematicaSchematic;
@@ -35,6 +43,7 @@ import org.leavesmc.leaves.protocol.servux.litematics.utils.*;

 import javax.annotation.Nullable;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;

 public class SchematicPlacement {
@@ -283,14 +292,52 @@ public class SchematicPlacement {
        return ChunkPos.rangeClosed(new ChunkPos(i, j), new ChunkPos(k, l));
    }

-    public void pasteTo(ServerLevel serverWorld, ReplaceBehavior replaceBehavior) {
+    public void pasteTo(ServerLevel serverWorld, ReplaceBehavior replaceBehavior, ServerPlayer player, long timeStart) {
        Box enclosingBox = this.getEnclosingBox();
        if (enclosingBox == null || enclosingBox.pos1() == null || enclosingBox.pos2() == null) {
            ServuxProtocol.LOGGER.error("receiver a null enclosing box");
            return;
        }
-        streamChunkPos(Objects.requireNonNull(enclosingBox.toVanilla())).forEach(chunkPos ->
-                SchematicPlacingUtils.placeToWorldWithinChunk(serverWorld, chunkPos, this, replaceBehavior, false)
+
+        AtomicInteger count_full = new AtomicInteger();
+        AtomicInteger count = new AtomicInteger();
+
+        streamChunkPos(Objects.requireNonNull(enclosingBox.toVanilla())).forEach(chunkPos -> {
+                    RegionizedServer.getInstance().taskQueue.queueTickTaskQueue(
+                            serverWorld,
+                            chunkPos.x,
+                            chunkPos.z,
+                            () -> {
+                                SchematicPlacingUtils.placeToWorldWithinChunk(serverWorld, chunkPos, this, replaceBehavior, false);
+                                count.getAndIncrement();
+                            });
+                    count_full.getAndIncrement();
+                }
        );
+
+        final NullPlugin nullPlugin = new NullPlugin();
+        scheduleTask(nullPlugin, serverWorld, count, count_full, player, timeStart, ServuxProtocolConfig.maxDelay);
+    }
+
+    private void scheduleTask(Plugin plugin, ServerLevel serverWorld, AtomicInteger count1, AtomicInteger count2, ServerPlayer player, long timeStart, int retryCount) {
+        Bukkit.getGlobalRegionScheduler().runDelayed(plugin,
+                (unused) -> {
+                    if (count1.get() >= count2.get()) {
+                        long timeElapsed = System.currentTimeMillis() - timeStart;
+                        player.getBukkitEntity().sendActionBar(
+                                Component.text("Pasted ")
+                                        .append(Component.text(this.getName(), NamedTextColor.AQUA))
+                                        .append(Component.text(" to world "))
+                                        .append(Component.text(serverWorld.serverLevelData.getLevelName(), NamedTextColor.LIGHT_PURPLE))
+                                        .append(Component.text(" in "))
+                                        .append(Component.text(timeElapsed, NamedTextColor.GREEN))
+                                        .append(Component.text("ms"))
+                        );
+                    } else {
+                        if (retryCount >= 0 || retryCount == -1) {
+                            scheduleTask(plugin, serverWorld, count1, count2, player, timeStart, retryCount - 1);
+                        }
+                    }
+                }, 1);
    }
 }
@@ -1,20 +1,3 @@
-/*
- * This file is part of Leaves (https://github.com/LeavesMC/Leaves)
- *
- * Leaves is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Leaves is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Leaves. If not, see <https://www.gnu.org/licenses/>.
- */
-
 package org.leavesmc.leaves.util;

 import fun.bm.lophine.config.modules.function.RedStoneConfig;
@@ -25,8 +8,6 @@ import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.*;
@@ -47,6 +28,9 @@ public class ShearsWrenchUtil {
        if (!RedStoneConfig.shears || !(block instanceof ObserverBlock || block instanceof DispenserBlock || block instanceof PistonBaseBlock || block instanceof HopperBlock || block instanceof RepeaterBlock || block instanceof ComparatorBlock || block instanceof CrafterBlock || block instanceof LeverBlock || block instanceof CocoaBlock || block instanceof TrapDoorBlock || block instanceof FenceGateBlock || block instanceof LightningRodBlock || block instanceof CalibratedSculkSensorBlock || block instanceof BaseRailBlock)) {
            return null;
        }
+        if (context.getPlayer() == null || !context.getPlayer().getItemInHand(invert(context.getHand())).isEmpty()) {
+            return null;
+        }
        StateDefinition<Block, BlockState> blockstatelist = block.getStateDefinition();
        Property<?> iblockstate;
        if (block instanceof CrafterBlock) {
@@ -106,10 +90,8 @@ public class ShearsWrenchUtil {
        return InteractionResult.CONSUME;
    }

-    public static boolean shouldSkipPlace(BlockPlaceContext context) {
-        return RedStoneConfig.shears &&
-                context.getPlayer() != null &&
-                context.getPlayer().getItemInHand(InteractionHand.MAIN_HAND).is(Items.SHEARS);
+    private static InteractionHand invert(InteractionHand original) {
+        return original == InteractionHand.MAIN_HAND ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND;
    }

    private static <T extends Comparable<T>> BlockState cycleState(BlockState state, Property<T> property, boolean inverse) {
@@ -8,7 +8,7 @@ pluginManagement {
 }

 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }

 rootProject.name = "lophine"
Author	SHA1	Message	Date
Helvetica Volubi	847bcd54e0	Update Luminol	2025-10-06 14:20:14 +08:00
Helvetica Volubi	15a55403ff	Modify merge ItemEntity logic Add followTickSequenceMerge to modify merge items, due to Paper's modification of the merge radius, when the merge radius is large and stacks containing many items get stuck in an unexpected position, individual items may never reach their destination. This configuration option is added to fix this behavior.	2025-10-04 01:15:49 +08:00
Helvetica Volubi	482809df6e	[ci skip]fix: fix default translations support	2025-10-03 18:24:30 +08:00
Helvetica Volubi	5db8ec4bd9	fix: pre fix a bug in I18n (will cause bug in 1.21.9)	2025-10-03 17:03:37 +08:00
Helvetica Volubi	d60cd46c15	Update Luminol	2025-10-02 16:51:47 +08:00
Helvetica Volubi	df40d4bdc9	Update Luminol	2025-10-01 23:21:57 +08:00
Helvetica Volubi	0084883933	feat: add config to enable scoreboard command unsafe	2025-09-29 22:59:44 +08:00
Helvetica Volubi	1d1e4ec70b	fix: fixes #62	2025-09-29 16:49:58 +08:00
Helvetica Volubi	1927a66d8e	fix:fix a bug in config of multi-format	2025-09-29 00:14:55 +08:00
Helvetica Volubi	38442749e7	fix: fixes #65	2025-09-28 17:39:20 +08:00
Helvetica Volubi	70dae5976d	fix: try fixes #63	2025-09-28 15:49:30 +08:00
Helvetica Volubi	b08756b4b3	fix: fixes #64	2025-09-28 14:44:04 +08:00
Helvetica Volubi	5e658adad3	Update Luminol	2025-09-28 13:12:54 +08:00
Bacteriawa	4d6e08312a	Update Luminol	2025-09-25 23:43:14 +08:00
Helvetica Volubi	9efe6499d0	Update Luminol	2025-09-24 01:08:36 +08:00
Helvetica Volubi	319946e8c1	fixes #61	2025-09-21 21:14:01 +08:00
Helvetica Volubi	28ce6ae7b1	Update Luminol & fix up CI	2025-09-19 15:10:55 +08:00
Helvetica Volubi	af4a8a8731	Update Luminol	2025-09-13 22:17:35 +08:00
Helvetica Volubi	7059c6a062	Update Luminol & Leaves Redstone Shears Wrench	2025-09-13 04:03:53 +08:00
Helvetica Volubi	98a8b65665	Update Luminol	2025-09-13 02:39:56 +08:00
Helvetica Volubi	ac6b1e2377	Update Luminol	2025-09-12 05:09:04 +08:00
Helvetica Volubi	0e964ae71c	fixes #58	2025-09-11 17:24:13 +08:00