perf: some perform update && update Gradle wrapper to version 9.4.1

fix: fix some function is not covered by core config
Carpet features (#134 )
2026-04-22 01:40:07 +08:00 · 2026-04-14 00:41:54 +08:00 · 2026-04-13 19:45:35 +08:00 · 2026-04-13 18:35:25 +08:00 · 2026-04-11 03:40:59 +08:00 · 2026-04-08 09:49:45 +08:00
153 changed files with 4781 additions and 1757 deletions
@@ -74,11 +74,11 @@ body:
        All config files on your server.
        例如以下文件（或者文件夹）：
        Example files (or folders)：
-         - \spigot.yml
-         - \bukkit.yml
-         - \config\\\*
-         - \lophine_config\\\*
-         - \luminol_config\\\*
+        - \spigot.yml
+        - \bukkit.yml
+        - \config\\\*
+        - \lophine_config\\\*
+        - \luminol_config\\\*
  - type: textarea
    id: other
    attributes:
@@ -39,7 +39,7 @@ jobs:
          java-version: 21

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

      - name: Grant execute permission for gradlew
        run: chmod +x gradlew
@@ -54,7 +54,7 @@ jobs:
        run: ./gradlew --refresh-dependencies createMojmapPaperclipJar

      - name: Upload Artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
        with:
          name: ${{ env.project_id_b }} CI Artifacts
          path: lophine-server/build/libs/*-paperclip-*-mojmap.jar
@@ -21,7 +21,7 @@ jobs:
          ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
          fetch-depth: 0  # a full history is required for pull request analysis
      - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2025.3
+        uses: JetBrains/qodana-action@latest
        with:
          pr-mode: false
        env:
@@ -6,12 +6,10 @@ build

 /run

-/lightingluminol-server/build.gradle.kts
-/lightingluminol-api/build.gradle.kts
-/luminol-server/build.gradle.kts
-/luminol-server/src/minecraft
+/lophine-server/build.gradle.kts
+/lophine-api/build.gradle.kts
+/lophine-server/src/minecraft
 /paper-server
-/luminol-api/build.gradle.kts
 /paper-api
 /paper-api-generator

@@ -3,7 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent

 plugins {
    java // TODO java launcher tasks
-    id("moe.luminolmc.hyacinthusweight.patcher") version "+" // Automatically pulls the latest
+    id("moe.luminolmc.hyacinthusweight.patcher")
 }

 paperweight {
@@ -0,0 +1,89 @@
+### Carpet 原版
+
+| 规则 | 状态 | 说明 |
+| --- | --- | --- |
+| `language` | 已映射 | 转发到 `lophine.function.language.lang` |
+| `commandTick` | 已映射 | 转发到现有的 tick 指令补丁 |
+| `creativeNoClip` | 已映射 | 转发到 Lophine 的创造飞行穿墙实现 |
+| `ctrlQCraftingFix` | 结构等价 | 当前的合成与切石机菜单已经自带修复后的 Ctrl+Q 结果槽丢弃行为 |
+| `placementRotationFix` | 已移植 | 放置朝向判断可使用玩家身体朝向而不是头部旋转 |
+| `tntDoNotUpdate` | 已移植 | 新放置的 TNT 不会再因放置时更新而自动点燃 |
+| `explosionNoBlockDamage` | 已移植 | 爆炸仍会伤害实体，但不会破坏方块 |
+| `interactionUpdates` | 已移植 | 玩家交互和破坏方块时可以在不触发邻居更新与形状更新的情况下运行 |
+| `xpNoCooldown` | 已移植 | 经验球可以在同一 tick 内被连续吸收，不再有拾取冷却 |
+| `viewDistance` | 已移植 | 专用服务器启动视距会被兼容配置覆盖 |
+| `fastRedstoneDust` | 已移植 | 规则启用时，红石粉更新会统一走 Alternate Current 快速更新后端 |
+| `lagFreeSpawning` | 已移植 | 自然生成会使用轻量碰撞检查与预构造实体路径 |
+| `defaultLoggers` | 已移植 | 按 Carpet 默认订阅语义为玩家启用 HUD logger，当前支持 `tps`、`mobcaps`、`counter` |
+| `commandPlayer` | 已映射 | 当前由同一套 `/bot` 假人能力承接 |
+| `hopperCounters` | 已映射 | 转发到 Lophine 的羊毛漏斗计数器 |
+
+### Carpet TIS Addition
+
+| 规则 | 状态 | 说明 |
+| --- | --- | --- |
+| `yeetUpdateSuppressionCrash` | 已映射 | 转发到同一套 Lophine 崩溃修复逻辑 |
+| `dustTrapdoorReintroduced` | 已映射 | 转发到 `lophine.experiment.redstone.redstone-ignore-upwards-update` |
+| `shulkerBoxCCEReintroduced` | 已映射 | 转发到 `lophine.experiment.redstone.cce-update-suppression` |
+| `instantBlockUpdaterReintroduced` | 已映射 | 转发到 `lophine.experiment.redstone.instant-block-updater` |
+| `optimizedDragonRespawn` | 已映射 | 转发到 Luminol 的末影龙重生优化 |
+| `antiSpamDisabled` | 已移植 | 在 `ServerGamePacketListenerImpl` 中关闭聊天和创造丢物防刷屏限制 |
+| `blockPlacementIgnoreEntity` | 已移植 | 创造模式放置方块时忽略实体碰撞检查 |
+| `creativeOpenContainerForcibly` | 已移植 | 创造玩家可以强制打开被阻挡的箱子、末影箱和潜影盒 |
+| `observerNoDetection` | 已移植 | 观察者的检测触发会在发出脉冲前被取消 |
+| `creativeNoItemCooldown` | 已移植 | 创造玩家不会应用物品冷却 |
+| `totallyNoBlockUpdate` | 已移植 | 邻居更新和形状更新会在 `NeighborUpdater` 中被统一短路 |
+| `tiscmNetworkProtocol` | 已移植 | 原生 `tiscm:network/v1` 握手与数据包协商已经通过专用 Leaves 协议接入 |
+| `optimizedTNTHighPriority` | 结构等价 | 当前 `ServerExplosion` 路径已经运行在优化过的服务端爆炸实现上 |
+| `tntIgnoreRedstoneSignal` | 已移植 | TNT 在自动点燃判断时忽略红石信号 |
+| `tntDupingFix` | 已移植 | 活塞复制 TNT 的路径现在由 `PistonBaseBlock` 中的兼容规则直接控制 |
+| `clientSettingsLostOnRespawnFix` | 已移植 | 玩家上一次的客户端设置会在 `ServerPlayer.restoreFrom` 中恢复 |
+| `entityInstantDeathRemoval` | 已移植 | 已死亡生物不会再保留原版的 20gt 延迟，而是立即移除 |
+| `farmlandTrampledDisabled` | 已移植 | 耕地不会再因实体踩踏而变回泥土 |
+| `yeetOutOfOrderChatKick` | 已移植 | 乱序的签名聊天不会再破坏安全聊天链 |
+| `tickCommandPermission` | 已移植 | `/tick` 的权限等级可通过兼容配置调整 |
+| `tickFreezeCommandToggleable` | 已移植 | 已冻结时再次执行 `/tick freeze` 会切换回运行状态 |
+| `syncServerMsptMetricsData` | 已移植 | 实时 MSPT 样本会通过原生 TISCM 协议通道广播 |
+| `microTiming` | 结构等价 | 当前 Folia 的区块级性能分析与计时钩子已经提供对应的服务端观测能力 |
+| `optimizedFastEntityMovement` | 结构等价 | Moonrise/Paper 的快速实体移动碰撞优化已经是基础运行时的一部分 |
+| `optimizedHardHitBoxEntityCollision` | 结构等价 | Moonrise/Paper 的硬碰撞箱实体碰撞优化已经是基础运行时的一部分 |
+| `tntFuseDuration` | 已移植 | 可配置的 TNT 引信时长已接入 NMS TNT 逻辑 |
+| `fakePlayerTicksLikeRealPlayer` | 已映射 | 转发到 Leaves 的假人网络阶段 tick 行为 |
+| `hopperCountersUnlimitedSpeed` | 已映射 | 转发到不限速计数器模式 |
+
+### Carpet Org Addition
+
+| 规则 | 状态 | 说明 |
+| --- | --- | --- |
+| `hopperNoItemCost` | 已移植 | 漏斗上方放置羊毛时，可在传输后恢复被推出的物品堆，实现零消耗供给线 |
+| `simpleInGameCalculator` | 已移植 | 以 `=` 开头的聊天内容会作为简单计算表达式私聊回复 |
+
+### Carpet AMS Addition
+
+| 规则 | 状态 | 说明 |
+| --- | --- | --- |
+| `amsUpdateSuppressionCrashFix` | 已映射 | 转发到 Lophine 现有的更新抑制崩溃修复 |
+| `creativeOneHitKill` | 已移植 | 创造玩家可通过 `Player.attack` 瞬间击杀附近符合条件的目标 |
+| `bambooModelNoOffset` | 已移植 | 竹子和竹笋始终返回零模型偏移 |
+| `carpetAlwaysSetDefault` | 结构等价 | 兼容配置默认值已经会在 `ConfigsInstance.preLoadConfig` 中被写入 |
+| `powerfulExpMending` | 已移植 | 经验拾取会修复玩家整个背包内所有受损的经验修补物品 |
+| `sensibleEnderman` | 已移植 | 末影人仅会在规则开启时拾取南瓜和西瓜 |
+| `shulkerGolem` | 已移植 | 潜影盒上方放置雕刻南瓜时可以召唤潜影贝 |
+| `preventEndSpikeRespawn` | 已移植 | 末影龙重生时会跳过黑曜石柱重建和柱顶水晶重建 |
+| `betterCraftableBoneBlock` | 已移植 | 向配方管理器注入 AMS 的替代骨块配方 |
+| `betterCraftableDispenser` | 已移植 | 向配方管理器注入 AMS 的替代发射器配方 |
+| `fakePlayerDefaultSurvivalMode` | 已移植 | 新创建的假人可以被强制设为生存模式，而不是沿用服务器默认游戏模式 |
+| `fakePlayerInteractLikeClient` | 已移植 | 假人与盔甲架交互时会先按真实客户端方式回退，再进入普通实体交互 |
+| `fakePlayerAutoReplenishmentFormShulkerBox` | 已移植 | 假人自动补货现在可以从背包里的潜影盒中抽取匹配物品 |
+
+### Lophine 扩展承接
+
+| 规则 | 状态 | 说明                               |
+| --- | --- |----------------------------------|
+| `commandBot` | 已映射 | 启用 Lophine `/bot`                |
+| `fakePlayerResident` | 已映射 | 转发到 Lophine 的假人常驻模式              |
+| `openFakePlayerInventory` | 已映射 | 转发到 Lophine 的假人背包打开功能            |
+| `fakePlayerAutoReplaceTool` | 已映射 | 为现有自动换工具逻辑增加了新开关                 |
+| `fakePlayerAutoReplenishment` | 已映射 | 为现有自动补货逻辑增加了新开关                  |
+| `fakePlayerReloadAction` | 已映射 | 为假人动作持久化增加了新开关                   |
+| `fakePlayerAutoFish` | 已移植 | 手持鱼竿的假人会自动抛竿和收杆，除非显式执行 `fish` 动作 |
@@ -1,13 +1,13 @@
 group=fun.bm.lophine
 version=1.21.11-R0.1-SNAPSHOT
 mcVersion=1.21.11
-# This is the current API version for use in (paper-)plugin.yml files
-# During snapshot cycles this should be the anticipated version of the release target
 apiVersion=1.21.11
-release=1
+clipVersion=3.0.15-20260413.051550-1
+weightVersion=2.0.7
+release=2
 # 0 for skip release, 1 for pre-release, 2 for release

-luminolRef=a96e4b79bbdcac4471cdb5ef4b2bd2fc7385c7e1
+luminolRef=e605804fc5600aa41b18863543873bff65e125e9

 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-9.2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -39,9 +39,9 @@ public interface Bot extends Player {
    /**
     * Gets the fakeplayer name without prefix and suffix
     *
-     * @return fakeplayer real name
+     * @return fakeplayer raw name
     */
-    @NotNull String getRealName();
+    @NotNull String getRawName();

    /**
     * Gets the creator's UUID of the fakeplayer
@@ -91,4 +91,13 @@ public interface Bot extends Player {
     * @return success
     */
    boolean remove(boolean save);
+
+    /**
+     * Remove the fakeplayer
+     *
+     * @param save   should save
+     * @param resume should resume at next server start
+     * @return success
+     */
+    boolean remove(boolean save, boolean resume);
 }
@@ -27,8 +27,8 @@ import java.util.function.Consumer;

 public interface BotCreator {

-    static BotCreator of(String realName, Location location) {
-        return Bukkit.getBotManager().botCreator(realName, location);
+    static BotCreator of(String rawName, Location location) {
+        return Bukkit.getBotManager().botCreator(rawName, location);
    }

    BotCreator name(String name);
@@ -61,5 +61,5 @@ public interface BotManager {
     */
    <T extends BotAction<T>> T newAction(@NotNull Class<T> type);

-    BotCreator botCreator(@NotNull String realName, @NotNull Location location);
+    BotCreator botCreator(@NotNull String rawName, @NotNull Location location);
 }
@@ -49,9 +49,9 @@
 -    implementation(project(":luminol-api")) // Luminol
 +    implementation(project(":lophine-api")) // Lophine
     // Luminol start - Dependenices insert
-     implementation("com.electronwill.night-config:toml:3.8.3") // Night config
-     implementation("com.github.luben:zstd-jni:1.5.4-1")
-@@ -272,14 +_,14 @@
+     implementation("net.objecthunter:exp4j:0.4.8")
+     implementation("io.netty:netty-all:4.2.9.Final") // used for io_uring
+@@ -274,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,
-@@ -431,7 +_,7 @@
+@@ -433,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 0bebc2cc87fb9c1c526e4de4f3bc157552307a72..cb1657939b86c039fcfe6403d3f202c2c5879e88 100644
+index 490316c7d5cbb77e988039cfa7a7cc0aa3849730..f5fb4e210c07f32e52eb8c1ba166d1571a6778c7 100644
 --- a/src/main/java/me/earthme/luminol/config/ConfigManager.java
 +++ b/src/main/java/me/earthme/luminol/config/ConfigManager.java
-@@ -23,6 +23,7 @@ public class ConfigManager {
+@@ -24,6 +24,7 @@ public class ConfigManager {
 
     public static void initConfigs() {
         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
+        configfiles.put("lophine", ConfigsInstance.of("lophine", "fun.bm.lophine.config.modules")); // add lophine 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 df5d926fb4401dd93d658fe14ae4d9d58cff68f9..b6d84fea596cfa78032151ab2f206b6b3d5dd197 100644
+index e4022494b050b68d54bac3cde87bdfc9e908859c..a4188ef831825764c0756b826651e2e7a9f99c5b 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(category = EnumConfigCategory.MISC, name = "server_mod_name")
 public class ServerModNameConfig implements IConfigModule {
-     @ConfigInfo(name = "name")
+     @ConfigInfo(name = "name", comments = "Decides the server mod name shown in your F3 debug screen.")
 -    public static String serverModName = "Luminol";
 +    public static String serverModName = "Lophine";
 
-     @ConfigInfo(name = "vanilla_spoof")
+     @ConfigInfo(name = "vanilla_spoof", comments = "Ignore any plugin's modification and server mod name set in this config block, only force sending brand name of vanilla")
     public static boolean fakeVanilla = false;
@@ -5,26 +5,36 @@ 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 4051384e82dba0416838c3c9889a6e368367b601..a5535b479cdcca870d0c8be6ed6fbcb32f266ac2 100644
+index ad2ba680bedb2336de24146676e70a1f64fd9c5a..505f7fe2ac40451e56967c90df9c52fb35f80fdf 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", directory = {"experiment", "force_the_data_command_to_be_enabled"})
+@@ -13,6 +13,7 @@ public class CommandConfig implements IConfigModule {
     @ConfigInfo(name = "enable_data_command")
+     @HotReloadUnsupported
     public static boolean data = false;
 +    @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", comments = """
             Force to enable command blocks.
-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 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(category = EnumConfigCategory.OPTIMIZATIONS, name = "force_disable_packet_limiter_of_paper")
+@@ -20,6 +21,9 @@ public class CommandConfig implements IConfigModule {
+             DO NOT ENABLE UNLESS YOU KNOW WHAT YOU ARE DOING!!!
+             """)
+     public static boolean commandBlock = false;
+    @TransformedConfig(name = "enable-waypoint", directory = {"experiment", "waypoint bar"}, originInstance = "lophine")
+    @TransformedConfig(name = "enable-waypoint", directory = {"experiment", "waypoint_bar"}, originInstance = "lophine")
+    @TransformedConfig(name = "waypoint_command_enabled", directory = {"experiment", "command"}, originInstance = "lophine")
+     @ConfigInfo(name = "enable_waypoints_and_waypoint_command", comments = """
+             Enable waypoint and waypoint command.
+             WARN: Still under testing
+diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/PaperPacketLimiterConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/PaperPacketLimiterConfig.java
+index aece37eb6406f8ada56428e68cf198c43f8ae309..d5f99fd672e33c16fc3c3e2031ce2e5a5001ab55 100644
+--- a/src/main/java/me/earthme/luminol/config/modules/misc/PaperPacketLimiterConfig.java
+++ b/src/main/java/me/earthme/luminol/config/modules/misc/PaperPacketLimiterConfig.java
+@@ -11,6 +11,7 @@ import me.earthme.luminol.enums.EnumConfigCategory;
+                 "has negative impacts on security"
+ )
 public class PaperPacketLimiterConfig implements IConfigModule {
 +    @TransformedConfig(name = "unlimit-packet", directory = {"misc", "network"}, originInstance = "lophine")
-     @TransformedConfig(name = "force_disable", directory = {"misc", "force_disable_packet_limiter_of_paper"})
+     @TransformedConfig(name = "force_disable", directory = {"optimizations", "force_disable_packet_limiter_of_paper"})
     @ConfigInfo(name = "force_disable")
     public static boolean forceDisable = false;
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Wed, 18 Feb 2026 00:15:08 +0800
+Subject: [PATCH] Leaves: Fakeplayer
+
+Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
+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/me/earthme/luminol/utils/FoliaServerWaypointManager.java b/src/main/java/me/earthme/luminol/utils/FoliaServerWaypointManager.java
+index 948730740e151352b4a12a90862f1e16925e52b0..0e6c9edbceef525bf102ad8f1fc0cb08e789d0e6 100644
+--- a/src/main/java/me/earthme/luminol/utils/FoliaServerWaypointManager.java
+++ b/src/main/java/me/earthme/luminol/utils/FoliaServerWaypointManager.java
+@@ -39,6 +39,12 @@ public class FoliaServerWaypointManager implements WaypointManager<@NotNull Wayp
+             return;
+         }
+ 
+        // Leaves start - fakeplayer
+        if (waypoint instanceof org.leavesmc.leaves.bot.ServerBot bot && !bot.getConfigValue(org.leavesmc.leaves.bot.agent.Configs.ENABLE_LOCATOR_BAR)) {
+            return;
+        }
+        // Leaves end - fakeplayer
+
+         this.waypoints.add(waypoint);
+ 
+         for (ServerPlayer toCreateFor : this.trackingPlayers) {
+@@ -92,6 +98,12 @@ public class FoliaServerWaypointManager implements WaypointManager<@NotNull Wayp
+     public void addPlayer(ServerPlayer player) {
+         this.trackingPlayers.add(player);
+ 
+        // Leaves start - fakeplayer
+        if (player instanceof org.leavesmc.leaves.bot.ServerBot) {
+            return;
+        }
+        // Leaves end - fakeplayer
+
+         for (WaypointTransmitter waypointTransmitter : this.waypoints) {
+             this.createConnection(player, waypointTransmitter);
+         }
@@ -0,0 +1,150 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Mon, 16 Mar 2026 15:51:40 +0800
+Subject: [PATCH] Diff in auto-update patch
+
+
+diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/AutoUpdateConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/AutoUpdateConfig.java
+index ce01352b637547c1cf8308d56d4b3f9c48fcca70..d57c04d839401e8ba88e56d92be2798bb312949f 100644
+--- a/src/main/java/me/earthme/luminol/config/modules/misc/AutoUpdateConfig.java
+++ b/src/main/java/me/earthme/luminol/config/modules/misc/AutoUpdateConfig.java
+@@ -16,13 +16,13 @@ import java.util.Set;
+         category = EnumConfigCategory.MISC,
+         name = "auto_update",
+         comments = """
+-                Checks GitHub Releases for newer Luminol jars on a schedule.
+-                Downloads are staged under auto_update/luminol and written to auto_update/core.path,
+                Checks GitHub Releases for newer version's jars on a schedule.
+                Downloads are staged under auto_update/lophine and written to auto_update/core.path,
+                 which Hyacinthusclip can consume on the next restart.
+-                If target_jar_path is set, Luminol will also try to replace that launcher jar directly."""
+                If target_jar_path is set, server will also try to replace that launcher jar directly."""
+ )
+ public class AutoUpdateConfig implements IConfigModule {
+-    @ConfigInfo(name = "enabled", comments = "Whether Luminol should check for updates automatically.")
+    @ConfigInfo(name = "enabled", comments = "Whether the server should check for updates automatically.")
+     public static boolean enabled = false;
+ 
+     @ConfigInfo(name = "check_times", comments = "List of daily check times in HH:mm, based on the server's local time zone.")
+@@ -33,7 +33,7 @@ public class AutoUpdateConfig implements IConfigModule {
+ 
+     @ConfigInfo(name = "target_jar_path", comments = """
+             Optional launcher jar path to replace after a successful download.
+-            Leave this blank to keep the downloaded jar staged in auto_update/luminol
+            Leave this blank to keep the downloaded jar staged in auto_update/lophine
+             and let Hyacinthusclip switch to it through auto_update/core.path on restart.""")
+     public static String targetJarPath = "";
+ 
+@@ -42,7 +42,7 @@ public class AutoUpdateConfig implements IConfigModule {
+ 
+     @Override
+     public void onLoaded(CommentedFileConfig configInstance, @Nullable Set<Exception> exs) {
+-        if (enabled) {
+        if (enabled || fun.bm.lophine.config.modules.misc.AutoUpdateConfig.enabled) {
+             if (instance == null) {
+                 instance = new AutoUpdateHelper();
+             }
+diff --git a/src/main/java/me/earthme/luminol/utils/AutoUpdateHelper.java b/src/main/java/me/earthme/luminol/utils/AutoUpdateHelper.java
+index 94a25cd681c9352d6931edafd9ec67fd7ba8a777..d0d0cf5e5ff8d4b8efa4d9778c27267b41cf8cf8 100644
+--- a/src/main/java/me/earthme/luminol/utils/AutoUpdateHelper.java
+++ b/src/main/java/me/earthme/luminol/utils/AutoUpdateHelper.java
+@@ -35,10 +35,10 @@ public final class AutoUpdateHelper {
+     private final Logger LOGGER = LogUtils.getClassLogger();
+     private final Gson GSON = new Gson();
+ 
+-    private final String GITHUB_API_BASE = "https://api.github.com/repos/LuminolMC/Luminol";
+    private final String GITHUB_API_BASE = "https://api.github.com/repos/lophineMC/lophine";
+     private final Path AUTO_UPDATE_DIR = Path.of("auto_update");
+     private final Path CORE_PATH_FILE = AUTO_UPDATE_DIR.resolve("core.path");
+-    private final Path LUMINOL_UPDATE_DIR = AUTO_UPDATE_DIR.resolve("luminol");
+    private final Path LUMINOL_UPDATE_DIR = AUTO_UPDATE_DIR.resolve("lophine");
+     private final Path LATEST_PATH_FILE = LUMINOL_UPDATE_DIR.resolve("latest.path");
+     private final long DAILY_TASK_PERIOD_MILLIS = TimeUnit.DAYS.toMillis(1);
+ 
+@@ -51,13 +51,13 @@ public final class AutoUpdateHelper {
+         ensureWorkingDirectories();
+ 
+         scheduler = Executors.newSingleThreadScheduledExecutor(task -> {
+-            final Thread thread = new Thread(task, "Luminol Auto Update Scheduler");
+            final Thread thread = new Thread(task, "Lophine Auto Update Scheduler");
+             thread.setDaemon(true);
+             return thread;
+         });
+ 
+         if (AutoUpdateConfig.checkTimes.isEmpty()) {
+-            LOGGER.warn("Luminol auto-update is enabled, but misc.auto_update.check_times is empty.");
+            LOGGER.warn("Lophine auto-update is enabled, but misc.auto_update.check_times is empty.");
+             return;
+         }
+ 
+@@ -95,14 +95,14 @@ public final class AutoUpdateHelper {
+ 
+     private void checkForUpdatesSafely() {
+         if (!UPDATE_RUNNING.compareAndSet(false, true)) {
+-            LOGGER.info("A Luminol auto-update check is already running, skipping this schedule.");
+            LOGGER.info("A Lophine auto-update check is already running, skipping this schedule.");
+             return;
+         }
+ 
+         try {
+             checkForUpdates();
+         } catch (Exception e) {
+-            LOGGER.warn("Luminol auto-update failed.", e);
+            LOGGER.warn("Lophine auto-update failed.", e);
+         } finally {
+             UPDATE_RUNNING.set(false);
+         }
+@@ -123,7 +123,7 @@ public final class AutoUpdateHelper {
+ 
+         final ReleaseAssetInfo latestRelease = getLatestCompatibleRelease(mcVersion, gitBranch);
+         if (latestRelease == null) {
+-            LOGGER.warn("No compatible Luminol release was found for Minecraft {}{}.",
+            LOGGER.warn("No compatible Lophine release was found for Minecraft {}{}.",
+                     mcVersion,
+                     gitBranch == null ? "" : " on branch " + gitBranch
+             );
+@@ -132,7 +132,7 @@ public final class AutoUpdateHelper {
+ 
+         final UpdateStatus updateStatus = compareReleaseWithCurrentBuild(latestRelease.releaseCommitHash(), currentGitHash);
+         if (updateStatus == UpdateStatus.UP_TO_DATE) {
+-            LOGGER.info("You are already running the latest compatible Luminol release: {}", latestRelease.tagName());
+            LOGGER.info("You are already running the latest compatible Lophine release: {}", latestRelease.tagName());
+             return;
+         }
+ 
+@@ -154,7 +154,7 @@ public final class AutoUpdateHelper {
+             return;
+         }
+ 
+-        LOGGER.info("Found a newer Luminol release: {}", latestRelease.tagName());
+        LOGGER.info("Found a newer Lophine release: {}", latestRelease.tagName());
+ 
+         final Path stagedJar = downloadAndStageRelease(latestRelease);
+         final Path finalJarPath = tryApplyTargetJar(stagedJar);
+@@ -163,7 +163,7 @@ public final class AutoUpdateHelper {
+ 
+         if (finalJarPath.equals(stagedJar)) {
+             LOGGER.info(
+-                    "Downloaded the latest Luminol jar to {} and refreshed auto_update/core.path for Hyacinthusclip. Please restart your server.",
+                    "Downloaded the latest Lophine jar to {} and refreshed auto_update/core.path for Hyacinthusclip. Please restart your server.",
+                     finalJarPath.toAbsolutePath()
+             );
+         } else {
+@@ -179,7 +179,7 @@ public final class AutoUpdateHelper {
+         try {
+             Files.createDirectories(LUMINOL_UPDATE_DIR);
+         } catch (IOException e) {
+-            throw new RuntimeException("Failed to create Luminol auto update directory", e);
+            throw new RuntimeException("Failed to create Lophine auto update directory", e);
+         }
+     }
+ 
+@@ -440,7 +440,7 @@ public final class AutoUpdateHelper {
+     private @NotNull HttpURLConnection openConnection(String url) throws IOException, URISyntaxException {
+         final HttpURLConnection connection = (HttpURLConnection) new URI(url).toURL().openConnection();
+         connection.setRequestProperty("Accept", "application/vnd.github+json");
+-        connection.setRequestProperty("User-Agent", "Luminol Auto Update");
+        connection.setRequestProperty("User-Agent", "Lophine Auto Update");
+         connection.setConnectTimeout(10000);
+         connection.setReadTimeout(10000);
+         return connection;
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bacteriawa <A3167717663@hotmail.com>
+Date: Sun, 22 Mar 2026 01:39:17 +0800
+Subject: [PATCH] Carpet features
+
+
+diff --git a/src/main/java/me/earthme/luminol/config/ConfigManager.java b/src/main/java/me/earthme/luminol/config/ConfigManager.java
+index f5fb4e210c07f32e52eb8c1ba166d1571a6778c7..e990c147e1b632ef5a33e4f3c37b5cd608040ac7 100644
+--- a/src/main/java/me/earthme/luminol/config/ConfigManager.java
+++ b/src/main/java/me/earthme/luminol/config/ConfigManager.java
+@@ -25,6 +25,13 @@ public class ConfigManager {
+     public static void initConfigs() {
+         configfiles.put("luminol", ConfigsInstance.of("luminol", "me.earthme.luminol.config.modules"));
+         configfiles.put("lophine", ConfigsInstance.of("lophine", "fun.bm.lophine.config.modules")); // add lophine global config
+        configfiles.put("lophine_carpet", ConfigsInstance.of(
+                new java.io.File("lophine_config"),
+                "lophine_carpet",
+                "lophine_carpet_config.toml",
+                "lophinecarpetconfig",
+                "fun.bm.lophine.carpet.config.modules"
+        )); // add lophine carpet config
+         preLoad();
+     }
+ 
@@ -1,14 +1,14 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Helvetica Volubi <suisuroru@blue-millennium.fun>
 Date: Sun, 3 Aug 2025 14:26:37 +0800
-Subject: [PATCH] Add configs to disable some check for operators
+Subject: [PATCH] Add config to disable some check for operators


 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 718a10b442997c8225a7de27ff92c1f36b809a9e..5757832ca91c42b417a95a2536a282a24eef0ef7 100644
+index 90e044ab3476d91819dddf14054d4626358da363..5c5dfcefd9ce6c9d7f69fb6d03216805b9e63822 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -391,7 +391,7 @@ public class ServerGamePacketListenerImpl
+@@ -392,7 +392,7 @@ public class ServerGamePacketListenerImpl
         this.tickCount++;
         this.knownMovePacketCount = this.receivedMovePacketCount;
         if (this.clientIsFloating && !this.player.isSleeping() && !this.player.isPassenger() && !this.player.isDeadOrDying()) {
@@ -17,7 +17,7 @@ index 718a10b442997c8225a7de27ff92c1f36b809a9e..5757832ca91c42b417a95a2536a282a2
                 // LOGGER.warn("{} was kicked for floating too long!", this.player.getPlainTextName()); // Paper - Logging moved to net.minecraft.server.network.ServerCommonPacketListenerImpl.disconnect()
                 this.disconnect(io.papermc.paper.configuration.GlobalConfiguration.get().messages.kick.flyingPlayer, org.bukkit.event.player.PlayerKickEvent.Cause.FLYING_PLAYER); // Paper - use configurable kick message & kick event cause
                 return true;
-@@ -410,7 +410,7 @@ public class ServerGamePacketListenerImpl
+@@ -411,7 +411,7 @@ public class ServerGamePacketListenerImpl
             this.vehicleLastGoodY = this.lastVehicle.getY();
             this.vehicleLastGoodZ = this.lastVehicle.getZ();
             if (this.clientVehicleIsFloating && this.lastVehicle.getControllingPassenger() == this.player) {
@@ -26,16 +26,16 @@ index 718a10b442997c8225a7de27ff92c1f36b809a9e..5757832ca91c42b417a95a2536a282a2
                     // LOGGER.warn("{} was kicked for floating a vehicle too long!", this.player.getPlainTextName()); // Paper - Logging moved to net.minecraft.server.network.ServerCommonPacketListenerImpl.disconnect()
                     this.disconnect(io.papermc.paper.configuration.GlobalConfiguration.get().messages.kick.flyingVehicle, org.bukkit.event.player.PlayerKickEvent.Cause.FLYING_VEHICLE); // Paper - use configurable kick message & kick event cause
                     return true;
-@@ -661,7 +661,7 @@ public class ServerGamePacketListenerImpl
+@@ -662,7 +662,7 @@ public class ServerGamePacketListenerImpl
                 d5 = d2 - rootVehicle.getZ();
                 d7 = d3 * d3 + d4 * d4 + d5 * d5;
                 boolean flag1 = false;
-                if (!me.earthme.luminol.config.modules.misc.DisableMovedWronglyThreshold.enabled && d7 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
-+                if (!me.earthme.luminol.config.modules.misc.DisableMovedWronglyThreshold.enabled && d7 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpMoveCheck && MinecraftServer.getServer().getPlayerList().isOp(this.player.nameAndId()))) { // Spigot // Lophine - disable move check for operator
+-                if (!me.earthme.luminol.config.modules.misc.DisableWarningConfig.disableMovedWronglyThresholdWarning && d7 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
+                if (!me.earthme.luminol.config.modules.misc.DisableWarningConfig.disableMovedWronglyThresholdWarning && d7 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !(fun.bm.lophine.config.modules.misc.DisableCheckConfig.disableOpMoveCheck && MinecraftServer.getServer().getPlayerList().isOp(this.player.nameAndId()))) { // Spigot // Lophine - disable move check for operator
                     flag1 = true; // Paper - diff on change, this should be moved wrongly
                     LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", rootVehicle.getPlainTextName(), this.player.getPlainTextName(), Math.sqrt(d7));
                 }
-@@ -1563,7 +1563,7 @@ public class ServerGamePacketListenerImpl
+@@ -1564,7 +1564,7 @@ public class ServerGamePacketListenerImpl
                                             // Paper start - Add fail move event
                                             io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY,
                                                     toX, toY, toZ, toYaw, toPitch, true);
@@ -44,7 +44,7 @@ index 718a10b442997c8225a7de27ff92c1f36b809a9e..5757832ca91c42b417a95a2536a282a2
                                                 if (event.getLogWarning()) {
                                             LOGGER.warn("{} moved too quickly! {},{},{}", this.player.getPlainTextName(), d3, d4, d5);
                                                 }
-@@ -1642,7 +1642,7 @@ public class ServerGamePacketListenerImpl
+@@ -1643,7 +1643,7 @@ public class ServerGamePacketListenerImpl
                                     // Paper start - Add fail move event
                                     io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_WRONGLY,
                                             toX, toY, toZ, toYaw, toPitch, true);
@@ -5,10 +5,10 @@ Subject: [PATCH] Add config to enable cross region damage trace


 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 338ad851814e0d15ac2c20c9f13895f52557e130..93bc76af4d0abbe1c526434991e74c4465764ac6 100644
+index 607ce65a719e333ce2275346a356032327d00ccf..dcdb01fe5333d407a10f9872d09992c7b438ddeb 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -1447,6 +1447,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1445,6 +1445,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
             this.awardStat(Stats.ENTITY_KILLED_BY.get(killCredit.getType()));
             killCredit.awardKillScore(this, damageSource);
             this.createWitherRose(killCredit);
@@ -22,7 +22,7 @@ index 338ad851814e0d15ac2c20c9f13895f52557e130..93bc76af4d0abbe1c526434991e74c44
         }
 
         this.level().broadcastEntityEvent(this, EntityEvent.DEATH);
-@@ -1470,6 +1477,24 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1468,6 +1475,24 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
     }
     // Leaves end - exp fix
 
@@ -48,10 +48,10 @@ index 338ad851814e0d15ac2c20c9f13895f52557e130..93bc76af4d0abbe1c526434991e74c44
         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 372fb8a7f06e87c5694b972e3b726e52903ef1e3..ad497cc5a01662e86d6c3d0a7d51b86cfc764f53 100644
+index 7a63f52efca133d9d1a773da2443333009d87113..5bae274f5ee869e540e4330e03af671b6b18313d 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -1960,6 +1960,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -1975,6 +1975,13 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
             final LivingEntity killer = this.getKillCredit();
             if (killer != null) {
                 killer.awardKillScore(this, damageSource);
@@ -65,7 +65,7 @@ index 372fb8a7f06e87c5694b972e3b726e52903ef1e3..ad497cc5a01662e86d6c3d0a7d51b86c
             }
         }); // Paper end
         this.postDeathDropItems(deathEvent); // Paper
-@@ -1970,6 +1977,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -1985,6 +1992,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
         return deathEvent; // Paper
     }
 
@@ -84,7 +84,7 @@ index 372fb8a7f06e87c5694b972e3b726e52903ef1e3..ad497cc5a01662e86d6c3d0a7d51b86c
     protected void dropEquipment(ServerLevel level) {
     }
     protected void postDeathDropItems(org.bukkit.event.entity.EntityDeathEvent event) {} // Paper - method for post death logic that cannot be ran before the event is potentially cancelled
-@@ -2597,6 +2616,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -2612,6 +2631,18 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
         }
     }
 
@@ -18,7 +18,7 @@ index bca2c5410aa543d2bb421e53893e9163508b3568..fdccb06c918d387e46c29ede7337159d
                     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 532a628de2d5eda29b503274bc323d71a57cf1cb..0f213d1cfab6066f6713c5b2124b76409510454c 100644
+index 040c0f8d26554ba583ecf370e2df3690d8f48dd6..22e68cabb4554c3e21e6f4ef316186f60ec77511 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -152,7 +152,7 @@ import org.jetbrains.annotations.Contract;
@@ -30,7 +30,7 @@ index 532a628de2d5eda29b503274bc323d71a57cf1cb..0f213d1cfab6066f6713c5b2124b7640
     // CraftBukkit start
     private static final int CURRENT_LEVEL = 2;
     static boolean isLevelAtLeast(ValueInput input, int level) {
-@@ -6536,4 +6536,46 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -6442,4 +6442,46 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
     // Paper end - Expose entity id counter
 
     public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG
@@ -92,7 +92,7 @@ index 0590d5723854a03a59fe9471710802f4e64e50b8..4f8ff2c024d6f2e67c5fa38fe2e660ba
     public EntityType(
         EntityType.EntityFactory<T> factory,
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index 5b19dba8c978feafa5d3d956359188e2de2257a5..3a8ac0765b8a988c281a2ded8c40ec044781cda2 100644
+index 67c0f4027a1e8b364694b5ed8b71965f2fe9b359..0f6e1428cc71c370af45db3e2a4f47c66e5d8628 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
@@ -189,6 +189,25 @@ public abstract class Player extends Avatar implements ContainerUser {
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable function command


 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index b4976ac6a609c24a43375d6c945e2412b00ab627..ddde2c3e7c8d9105202a7ff32e444f85485cdb7f 100644
+index 4fa276ba05a550cdf7ce48617056c5a4d4a18006..6cb0d4daf0f275b95d5ca09275e40ab32258eb39 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
@@ -215,7 +215,9 @@ public class Commands {
@@ -0,0 +1,94 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Fri, 16 Jan 2026 02:34:43 +0800
+Subject: [PATCH] Add config to enable save-all command
+
+
+diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java
+index 17108636a5728efe98a064001e00e3ca098b1f51..7748e9ac04fbd3f5259d92fc908d90889cba86c8 100644
+--- a/io/papermc/paper/threadedregions/RegionizedServer.java
+++ b/io/papermc/paper/threadedregions/RegionizedServer.java
+@@ -350,6 +350,8 @@ public final class RegionizedServer {
+         // tick player ping sample
+         this.tickPlayerSample();
+ 
+        fun.bm.lophine.utils.SaveAllUtil.checkTimeout(); // Lophine - save-all fix
+
+         // tick worlds
+         for (final ServerLevel world : this.worlds) {
+             this.globalTick(world, tickCount);
+diff --git a/io/papermc/paper/threadedregions/TickRegions.java b/io/papermc/paper/threadedregions/TickRegions.java
+index 02c004bc7f9a0203523ce4b27cd766d6bdc478c0..3d86e21198f2888422330b6f7c27712f40a6aabc 100644
+--- a/io/papermc/paper/threadedregions/TickRegions.java
+++ b/io/papermc/paper/threadedregions/TickRegions.java
+@@ -190,6 +190,8 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
+         public final ThreadedRegionizer.ThreadedRegion<TickRegionData, TickRegionSectionData> region;
+         public final ServerLevel world;
+ 
+        public long lastSavedTime = 0; // Lophine - save-all fix
+
+         // generic regionised data
+         private final Reference2ReferenceOpenHashMap<RegionizedData<?>, Object> regionizedData = new Reference2ReferenceOpenHashMap<>();
+ 
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
+index 6cb0d4daf0f275b95d5ca09275e40ab32258eb39..48628174299f8f18170198df1834d6174bd1fafa 100644
+--- a/net/minecraft/commands/Commands.java
+++ b/net/minecraft/commands/Commands.java
+@@ -294,7 +294,11 @@ public class Commands {
+             PardonCommand.register(this.dispatcher);
+             PardonIpCommand.register(this.dispatcher);
+             //PerfCommand.register(this.dispatcher); // Folia - region threading - TODO later
+-            //SaveAllCommand.register(this.dispatcher); // Folia - region threading - TODO later
+            // Lophine start - Add a config to enable save all command
+            if (fun.bm.lophine.config.modules.experiment.CommandConfig.saveAll) {
+                SaveAllCommand.register(this.dispatcher); // Folia - region threading - TODO later
+            }
+            // Lophine end - Add a config to enable save all command
+             SaveOffCommand.register(this.dispatcher);
+             SaveOnCommand.register(this.dispatcher);
+             SetPlayerIdleTimeoutCommand.register(this.dispatcher);
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index 8ce5cdda24d63b33b39e32f9712fafa3917f27c5..25324d81bbe876dbe47b33bd5749b72e4283bf80 100644
+--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
+@@ -1656,6 +1656,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     // Folia start - region threading
+     public void tickServer(long startTime, long scheduledEnd, long targetBuffer,
+                            io.papermc.paper.threadedregions.TickRegions.TickRegionData region) {
+        // Lophine start - save-all fix
+        if (fun.bm.lophine.utils.SaveAllUtil.isSaving()) {
+            fun.bm.lophine.utils.SaveAllUtil.postRegionSave(region);
+        }
+        // Lophine end - save-all fix
+         final ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle foliaProfiler = io.papermc.paper.threadedregions.TickRegionScheduler.getProfiler(); // Folia - profiler
+         // Folia end - region threading
+         org.spigotmc.WatchdogThread.tick(); // Spigot
+diff --git a/net/minecraft/server/commands/SaveAllCommand.java b/net/minecraft/server/commands/SaveAllCommand.java
+index e37b71402179c73146ff67babc228ccfb996f8f4..cfdb60bd89d83282f2202a5585bac22a6002e138 100644
+--- a/net/minecraft/server/commands/SaveAllCommand.java
+++ b/net/minecraft/server/commands/SaveAllCommand.java
+@@ -21,7 +21,9 @@ public class SaveAllCommand {
+     }
+ 
+     private static int saveAll(CommandSourceStack source, boolean flush) throws CommandSyntaxException {
+-        source.sendSuccess(() -> Component.translatable("commands.save.saving"), false);
+        // Lophine start - save all
+        fun.bm.lophine.utils.SaveAllUtil.preSaveAll(source, flush);
+/*        source.sendSuccess(() -> Component.translatable("commands.save.saving"), false);
+         MinecraftServer server = source.getServer();
+         boolean flag = server.saveEverything(true, flush, true);
+         if (!flag) {
+@@ -29,6 +31,12 @@ public class SaveAllCommand {
+         } else {
+             source.sendSuccess(() -> Component.translatable("commands.save.success"), true);
+             return 1;
+-        }
+        }*/
+        return 1;
+     }
+
+    public static SimpleCommandExceptionType getErrorFailed() {
+        return ERROR_FAILED;
+    }
+    // Lophine end - save all
+ }
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config to enable scoreboard command


 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index b95d144dd479d339cc4b0f92cc4c3bade9af4927..44f469b1fc5169adf3214ac52b8e2647d26e7974 100644
+index 48628174299f8f18170198df1834d6174bd1fafa..91e2f3e9e85622adbd3799473634e716383bbe94 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
@@ -241,7 +241,11 @@ public class Commands {
@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Thu, 1 May 2025 22:43:08 +0800
+Date: Wed, 21 Jan 2026 21:28:21 +0800
 Subject: [PATCH] Add config to enable tick command


 diff --git a/io/papermc/paper/threadedregions/RegionizedServer.java b/io/papermc/paper/threadedregions/RegionizedServer.java
-index b3bc39ebe8d2f48d976de9cd4fcae46095523514..6df2b8cf3b902bb157ed5fa9eaf9ca062d9e5a39 100644
+index 7748e9ac04fbd3f5259d92fc908d90889cba86c8..80b5d151e0dd6fa44794187875b4b80519839d81 100644
 --- a/io/papermc/paper/threadedregions/RegionizedServer.java
 +++ b/io/papermc/paper/threadedregions/RegionizedServer.java
@@ -332,6 +332,11 @@ public final class RegionizedServer {
@@ -20,7 +20,7 @@ index b3bc39ebe8d2f48d976de9cd4fcae46095523514..6df2b8cf3b902bb157ed5fa9eaf9ca06
         // expire invalid click command callbacks
         io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.ADVENTURE_CLICK_MANAGER.handleQueue((int)this.tickCount); // Paper // Folia - region threading - moved to global tick
         io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.DIALOG_CLICK_MANAGER.handleQueue((int)this.tickCount); // Paper // Folia - region threading - moved to global tick
-@@ -355,6 +360,13 @@ public final class RegionizedServer {
+@@ -357,6 +362,13 @@ public final class RegionizedServer {
             this.globalTick(world, tickCount);
         }
 
@@ -34,20 +34,20 @@ index b3bc39ebe8d2f48d976de9cd4fcae46095523514..6df2b8cf3b902bb157ed5fa9eaf9ca06
         // tick connections
         this.tickConnections();
 
-@@ -488,7 +500,7 @@ public final class RegionizedServer {
+@@ -492,7 +504,7 @@ public final class RegionizedServer {
     }
 
-     private void tickTime(final ServerLevel world, final int tickCount) {
+     private void tickTime(final ServerLevel world, final long tickCount) {
 -        if (world.tickTime) {
 +        if ((!fun.bm.lophine.config.modules.experiment.CommandConfig.tick || world.tickRateManager().runsNormally()) && world.tickTime) { // Luminol - Add a config to enable tick command
             if (world.getGameRules().get(GameRules.ADVANCE_TIME)) {
-                 world.setDayTime(world.levelData.getDayTime() + (long)tickCount);
+                 world.setDayTime(world.levelData.getDayTime() + tickCount);
             }
 diff --git a/io/papermc/paper/threadedregions/TickRegionScheduler.java b/io/papermc/paper/threadedregions/TickRegionScheduler.java
-index e3df94bfd26b118cb8a7bdece75d611aaf27c606..bae2385b725c0ce551768f22945393ccf6e1e432 100644
+index 0f4e8ee9438135e24e0f61a1390c59573b9e9c3f..65699d2ad66c686a8b7d1b951787ddd766800a94 100644
 --- a/io/papermc/paper/threadedregions/TickRegionScheduler.java
 +++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java
-@@ -39,8 +39,8 @@ public final class TickRegionScheduler {
+@@ -40,8 +40,8 @@ public final class TickRegionScheduler {
         }
     }
 
@@ -58,14 +58,14 @@ index e3df94bfd26b118cb8a7bdece75d611aaf27c606..bae2385b725c0ce551768f22945393cc
     // Folia start - watchdog
     public static final FoliaWatchdogThread WATCHDOG_THREAD = new FoliaWatchdogThread();
     static {
-@@ -447,8 +447,23 @@ public final class TickRegionScheduler {
+@@ -448,8 +448,23 @@ public final class TickRegionScheduler {
             final long cpuStart = MEASURE_CPU_TIME ? THREAD_MX_BEAN.getCurrentThreadCpuTime() : 0L;
             final long tickStart = System.nanoTime();
 
 -            // use max(), don't assume that tickStart >= scheduledStart
-            final int tickCount = Math.max(1, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
+-            final long tickCount = Math.max(1L, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
 +            // Luminol start - Add a config to enable tick command
-+            final int tickCount;
+            final long tickCount;
 +            if (fun.bm.lophine.config.modules.experiment.CommandConfig.tick) {
 +                if (MinecraftServer.tickRateManager.isSprinting() && MinecraftServer.tickRateManager.checkShouldSprintThisTick()) {
 +                    TICK_RATE = net.minecraft.server.commands.TickCommand.MAX_TICKRATE;
@@ -74,17 +74,17 @@ index e3df94bfd26b118cb8a7bdece75d611aaf27c606..bae2385b725c0ce551768f22945393cc
 +                } else {
 +                    TICK_RATE = MinecraftServer.tickRateManager.tickrate();
 +                    TIME_BETWEEN_TICKS = (long) (1_000_000_000L / TICK_RATE);
-+                    tickCount = Math.max(1, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
+                    tickCount = Math.max(1L, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
 +                }
 +            } else {
 +                // use max(), don't assume that tickStart >= scheduledStart
-+                tickCount = Math.max(1, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
+                tickCount = Math.max(1L, this.tickSchedule.getPeriodsAhead(TIME_BETWEEN_TICKS, tickStart));
 +            }
 +            // Luminol end - Add tick command support
 
             if (!this.tryMarkTicking()) {
                 if (!this.cancelled.get()) {
-@@ -497,6 +512,11 @@ public final class TickRegionScheduler {
+@@ -498,6 +513,11 @@ public final class TickRegionScheduler {
             try {
                 // next start isn't updated until the end of this tick
                 this.tickRegion(tickCount, tickStart, scheduledEnd);
@@ -97,7 +97,7 @@ index e3df94bfd26b118cb8a7bdece75d611aaf27c606..bae2385b725c0ce551768f22945393cc
                 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 8d77d6f165a5883e997122d1c2f231287e0caebe..23f047a47cdccc90a96153cc52bdedf91cd15db9 100644
+index 91e2f3e9e85622adbd3799473634e716383bbe94..21466c225db02a5be74bf60b5ea831c5bea8a7e8 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
@@ -262,7 +262,11 @@ public class Commands {
@@ -114,7 +114,7 @@ index 8d77d6f165a5883e997122d1c2f231287e0caebe..23f047a47cdccc90a96153cc52bdedf9
         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 1627a8f3ebf7bf1a750a62802f1187ad8c1a6a0f..6e18d988104c121d9683eb57e77a78acfdee3907 100644
+index 25324d81bbe876dbe47b33bd5749b72e4283bf80..504f21c5f1e3101e7164b97059aecce630d18cee 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
@@ -270,7 +270,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1,180 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Helvetica Volubi <suisuroru@blue-millennium.fun>
-Date: Mon, 7 Jul 2025 18:19:00 +0800
-Subject: [PATCH] Add config to enable waypoint command & bar
-
-use concurrent method to fix it (now, they are thread safe)
-
-diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index 0c31144e1f18fe92065f0c167aaaaa809363cc4c..65d45f7abe95d9492620ea53ab87797a0ebc0ec7 100644
--- a/net/minecraft/commands/Commands.java
-+++ b/net/minecraft/commands/Commands.java
-@@ -270,7 +270,11 @@ public class Commands {
-         TimeCommand.register(this.dispatcher);
-         TitleCommand.register(this.dispatcher, context);
-         //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
-        //WaypointCommand.register(this.dispatcher, context); // Folia - region threading - TODO later
-+        // Lophine start - unsafe waypoint bar
-+        if (fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) {
-+            WaypointCommand.register(this.dispatcher, context); // Folia - region threading - TODO later
-+        }
-+        // Lophine end - unsafe waypoint bar
-         WeatherCommand.register(this.dispatcher);
-         WorldBorderCommand.register(this.dispatcher);
-         if (JvmProfiler.INSTANCE.isAvailable()) {
-diff --git a/net/minecraft/server/waypoints/ServerWaypointManager.java b/net/minecraft/server/waypoints/ServerWaypointManager.java
-index 1cbc46e480cc7d109c6128f109a1a9e38bf1a193..f76d3a404eb7077f1db2374303eb265cb513d848 100644
--- a/net/minecraft/server/waypoints/ServerWaypointManager.java
-+++ b/net/minecraft/server/waypoints/ServerWaypointManager.java
-@@ -16,22 +16,32 @@ import net.minecraft.world.waypoints.WaypointManager;
- import net.minecraft.world.waypoints.WaypointTransmitter;
- 
- public class ServerWaypointManager implements WaypointManager<WaypointTransmitter> {
-    private final Set<WaypointTransmitter> waypoints = new HashSet<>();
-    private final Set<ServerPlayer> players = new HashSet<>();
-    private final Table<ServerPlayer, WaypointTransmitter, WaypointTransmitter.Connection> connections = HashBasedTable.create();
-+    private final Set<WaypointTransmitter> waypoints = new java.util.concurrent.CopyOnWriteArraySet<>(); // Lophine - concurrent
-+    private final Set<ServerPlayer> players = new java.util.concurrent.CopyOnWriteArraySet<>(); // Lophine - concurrent
-+    private final fun.bm.lophine.utils.concurrent.AbstractConcurrentTable<ServerPlayer, WaypointTransmitter, WaypointTransmitter.Connection> connections = fun.bm.lophine.config.modules.optimizations.WayPointOptimizedTableConfig.optimizedTable ? new fun.bm.lophine.utils.concurrent.OptimizedConcurrentTable<>() : new fun.bm.lophine.utils.concurrent.ConcurrentTable<>(); // Lophine - concurrent
- 
-     @Override
-     public void trackWaypoint(WaypointTransmitter waypoint) {
-        // Folia - region threading
-+        // Lophine start - unsafe waypoint bar
-+        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
-+        this.waypoints.add(waypoint);
-+
-+        for (ServerPlayer serverPlayer : this.players) {
-+            this.createConnection(serverPlayer, waypoint);
-+        }
-+        // Lophine end - unsafe waypoint bar
-     }
- 
-     @Override
-     public void updateWaypoint(WaypointTransmitter waypoint) {
-         if (this.waypoints.contains(waypoint)) {
-            Map<ServerPlayer, WaypointTransmitter.Connection> map = Tables.transpose(this.connections).row(waypoint);
-            SetView<ServerPlayer> set = Sets.difference(this.players, map.keySet());
-+            java.util.List<Entry<ServerPlayer, WaypointTransmitter.Connection>> map = this.connections.getXZ(waypoint); // Lophine - concurrent
-+            if (map.isEmpty()) return; // Lophine - concurrent
-+            Set<ServerPlayer> players1 = new HashSet<>(); // Lophine - concurrent
-+            map.forEach((entry) -> players1.add(entry.getKey())); // Lophine - concurrent
-+            SetView<ServerPlayer> set = Sets.difference(this.players, players1); // Lophine - concurrent
- 
-            for (Entry<ServerPlayer, WaypointTransmitter.Connection> entry : ImmutableSet.copyOf(map.entrySet())) {
-+            for (Entry<ServerPlayer, WaypointTransmitter.Connection> entry : map) { // Lophine - concurrent
-                 this.updateConnection(entry.getKey(), waypoint, entry.getValue());
-             }
- 
-@@ -43,26 +53,67 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
- 
-     @Override
-     public void untrackWaypoint(WaypointTransmitter waypoint) {
-        this.connections.column(waypoint).forEach((serverPlayer, connection) -> connection.disconnect());
-        Tables.transpose(this.connections).row(waypoint).clear();
-+        java.util.List<Entry<ServerPlayer, WaypointTransmitter.Connection>> map = this.connections.getXZ(waypoint); // Lophine - concurrent
-+        if (map.isEmpty()) return; // Lophine - concurrent
-+        this.connections.getXZ(waypoint).forEach((entry) -> entry.getKey().disconnect()); // Lophine - concurrent
-+        this.connections.clearXZ(waypoint); // Lophine - concurrent
-         this.waypoints.remove(waypoint);
-     }
- 
-     public void addPlayer(ServerPlayer player) {
-         // Folia - region threading
-+        // Lophine start - unsafe waypoint bar
-+        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
-+        this.players.add(player);
-+
-+        for (WaypointTransmitter waypointTransmitter : this.waypoints) {
-+            this.createConnection(player, waypointTransmitter);
-+        }
-+
-+        if (player.isTransmittingWaypoint()) {
-+            this.trackWaypoint((WaypointTransmitter)player);
-+        }
-+        // Lophine end - unsafe waypoint bar
-     }
- 
-     public void updatePlayer(ServerPlayer player) {
-         // Folia - region threading
-+        // Lophine start - unsafe waypoint bar
-+        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
-+        java.util.List<Entry<WaypointTransmitter, WaypointTransmitter.Connection>> map = this.connections.getYZ(player); // Lophine - concurrent
-+        if (map.isEmpty()) return; // Lophine - concurrent
-+        Set<WaypointTransmitter> waypoints1 = new HashSet<>();// Lophine - concurrent
-+        map.forEach((entry) -> waypoints1.add(entry.getKey()));// Lophine - concurrent
-+        SetView<WaypointTransmitter> set = Sets.difference(this.waypoints, waypoints1); // Lophine - concurrent
-+
-+        for (Entry<WaypointTransmitter, WaypointTransmitter.Connection> entry : map) { // Lophine - concurrent
-+            this.updateConnection(player, entry.getKey(), entry.getValue());
-+        }
-+
-+        for (WaypointTransmitter waypointTransmitter : set) {
-+            this.createConnection(player, waypointTransmitter);
-+        }
-+        // Lophine end - unsafe waypoint bar
-     }
- 
-     public void removePlayer(ServerPlayer player) {
-         // Folia - region threading
-+        // Lophine start - unsafe waypoint bar
-+        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
-+        java.util.List<Entry<WaypointTransmitter, WaypointTransmitter.Connection>> map = this.connections.getYZ(player); // Lophine - concurrent
-+        if (map.isEmpty()) return; // Lophine - concurrent
-+        map.forEach((entry) -> entry.getValue().disconnect()); // Lophine - concurrent
-+        this.connections.clearYZ(player); // Lophine - concurrent
-+        this.untrackWaypoint((WaypointTransmitter)player);
-+        this.players.remove(player);
-+        // Lophine end - unsafe waypoint bar
-     }
- 
-     public void breakAllConnections() {
-        this.connections.values().forEach(WaypointTransmitter.Connection::disconnect);
-        this.connections.clear();
-+        java.util.List<WaypointTransmitter.Connection> map = this.connections.getAllZ(); // Lophine - concurrent
-+        if (map.isEmpty()) return; // Lophine - concurrent
-+        map.forEach(WaypointTransmitter.Connection::disconnect); // Lophine - concurrent
-+        this.connections.clearAll(); // Lophine - concurrent
-     }
- 
-     public void remakeConnections(WaypointTransmitter waypoint) {
-@@ -83,13 +134,19 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
-         if (player != waypoint) {
-             if (isLocatorBarEnabledFor(player)) {
-                 waypoint.makeWaypointConnectionWith(player).ifPresentOrElse(connection -> {
-                    this.connections.put(player, waypoint, connection);
-+                    this.connections.putOrUpdate(player, waypoint, connection);
-                     connection.connect();
-                 }, () -> {
-                    WaypointTransmitter.Connection connection = this.connections.remove(player, waypoint);
-                    if (connection != null) {
-                        connection.disconnect();
-                    }
-+                    // Lophine start - concurrent
-+                    java.util.List<WaypointTransmitter.Connection> c = this.connections.getZ(player, waypoint);
-+                    if (c.isEmpty()) return; // Lophine - concurrent
-+                    c.forEach((connection) -> {
-+                        this.connections.remove(player, waypoint, connection);
-+                        if (connection != null) {
-+                            connection.disconnect();
-+                        }
-+                    });
-+                    // Lophine end - concurrent
-                 });
-             }
-         }
-@@ -103,10 +160,12 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
-                 } else {
-                     waypoint.makeWaypointConnectionWith(player).ifPresentOrElse(connection1 -> {
-                         connection1.connect();
-                        this.connections.put(player, waypoint, connection1);
-+                        this.connections.putOrUpdate(player, waypoint, connection1);
-                     }, () -> {
-                         connection.disconnect();
-                        this.connections.remove(player, waypoint);
-+                        java.util.List<WaypointTransmitter.Connection> c = this.connections.getZ(player, waypoint); // Lophine - concurrent
-+                        if (c.isEmpty()) return; // Lophine - concurrent
-+                        c.forEach((connection1) -> this.connections.remove(player, waypoint, connection1)); // Lophine - concurrent
-                     });
-                 }
-             }
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix datapack command save function


 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 2f91e80f8c3df2775a793aa3c648c50007543192..6230c08d001aebc119900906aa557247261985a3 100644
+index 504f21c5f1e3101e7164b97059aecce630d18cee..d5b680fc6e13ec26d0db2448009e4cbe59933e22 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -2430,6 +2430,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2437,6 +2437,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         return this.reloadResources(selectedIds, io.papermc.paper.event.server.ServerResourcesReloadedEvent.Cause.PLUGIN);
     }
 
@@ -8,10 +8,10 @@ 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 6df2b8cf3b902bb157ed5fa9eaf9ca062d9e5a39..057f60cd24876bf44cf3efccbc8a61b030a2a381 100644
+index 80b5d151e0dd6fa44794187875b4b80519839d81..8d32d906f87a1cb866a7497ee0de3045e9adce2c 100644
 --- a/io/papermc/paper/threadedregions/RegionizedServer.java
 +++ b/io/papermc/paper/threadedregions/RegionizedServer.java
-@@ -367,6 +367,8 @@ public final class RegionizedServer {
+@@ -369,6 +369,8 @@ public final class RegionizedServer {
         }
         // Luminol end - Add a config to enable tick command
 
@@ -129,7 +129,7 @@ index 0bf2173c5445de021090c2d0264afc440b005bdc..076bfe7a7b57f8d3b29ef0aaad117707
         this.connection.setReadOnly();
         // CraftBukkit - Don't wait
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index fe58993c3fb98189141120f849c7750ce1e24ebd..d9b20f3b099eea4862774da79929bb71f8dede53 100644
+index d2b2bf35b3f5704f3bca94d0fe3b70206c2fbf96..c8be04b8a50bac52150a1fdd238634e630e1765e 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
@@ -315,6 +315,8 @@ public abstract class PlayerList {
@@ -8,10 +8,10 @@ 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/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index a60c70550c217bccda6695dc7b7165de8e97e5cd..6aad6024dc121eae63b7fde92a89cbea29fcafb3 100644
+index b0546cb4af7291013399e67d98bced98a5fffc0f..bf340425dc2a1545b9069badcf054d4c2f6a405f 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -3015,7 +3015,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -3058,7 +3058,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
             // Spigot start
             if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
                 // Paper start - Fix merchant inventory not closing on entity removal
@@ -21,7 +21,7 @@ index a60c70550c217bccda6695dc7b7165de8e97e5cd..6aad6024dc121eae63b7fde92a89cbea
                 }
                 // Paper end - Fix merchant inventory not closing on entity removal
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index a8a034ad5895ad1b833754c91c3a370c3b9b3744..35d51c727ce9229a174c45e9ea838fa9e3c3d80a 100644
+index c8be04b8a50bac52150a1fdd238634e630e1765e..2eb551390aa66d89988df9ca23cf0dd7ccfd6577 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
@@ -555,7 +555,7 @@ public abstract class PlayerList {
@@ -41,10 +41,10 @@ index 1281eadb2d0c5b4ce5e3afd51d8205f9a4ef011c..b1446dfb4689174ee9f55cec6080622e
         if (count > i) {
             source.sendFailure(Component.translatable("commands.give.failed.toomanyitems", i, itemStack.getDisplayName()));
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5757832ca91c42b417a95a2536a282a24eef0ef7..df6ad5831f83fcc869b0b4ed844a73b3cb81c469 100644
+index 5c5dfcefd9ce6c9d7f69fb6d03216805b9e63822..d35ef52a6adb9a560138d1a2af32969c3a73f42b 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3126,7 +3126,7 @@ public class ServerGamePacketListenerImpl
+@@ -3170,7 +3170,7 @@ public class ServerGamePacketListenerImpl
                                             } else if (slot.mayPlace(cursor)) {
                                                 if (ItemStack.isSameItemSameComponents(clickedItem, cursor)) {
                                                     int toPlace = packet.buttonNum() == 0 ? cursor.getCount() : 1;
@@ -53,7 +53,7 @@ index 5757832ca91c42b417a95a2536a282a24eef0ef7..df6ad5831f83fcc869b0b4ed844a73b3
                                                     toPlace = Math.min(toPlace, slot.container.getMaxStackSize() - clickedItem.getCount());
                                                     if (toPlace == 1) {
                                                         action = InventoryAction.PLACE_ONE;
-@@ -3162,7 +3162,7 @@ public class ServerGamePacketListenerImpl
+@@ -3206,7 +3206,7 @@ public class ServerGamePacketListenerImpl
                                                 }
                                             } else if (ItemStack.isSameItemSameComponents(cursor, clickedItem)) {
                                                 if (clickedItem.getCount() >= 0) {
@@ -62,7 +62,7 @@ index 5757832ca91c42b417a95a2536a282a24eef0ef7..df6ad5831f83fcc869b0b4ed844a73b3
                                                         // As of 1.5, this is result slots only
                                                         action = InventoryAction.PICKUP_ALL;
                                                     }
-@@ -3379,6 +3379,7 @@ public class ServerGamePacketListenerImpl
+@@ -3423,6 +3423,7 @@ public class ServerGamePacketListenerImpl
                         this.player.containerMenu.broadcastFullState();
                     } else {
                         this.player.containerMenu.broadcastChanges();
@@ -70,7 +70,7 @@ index 5757832ca91c42b417a95a2536a282a24eef0ef7..df6ad5831f83fcc869b0b4ed844a73b3
                     }
                     if (packet.buttonNum() == Inventory.SLOT_OFFHAND && this.player.containerMenu != this.player.inventoryMenu) this.player.containerSynchronizer.sendOffHandSlotChange(); // Paper - update offhand data when the player is clicking in an inventory not their own as the sychronizer does not include offhand slots
                     if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.updateEquipmentOnPlayerActions) this.player.detectEquipmentUpdates(); // Paper - Force update attributes.
-@@ -3490,7 +3491,7 @@ public class ServerGamePacketListenerImpl
+@@ -3534,7 +3535,7 @@ public class ServerGamePacketListenerImpl
             }
 
             boolean flag1 = packet.slotNum() >= 1 && packet.slotNum() <= 45;
@@ -79,7 +79,7 @@ index 5757832ca91c42b417a95a2536a282a24eef0ef7..df6ad5831f83fcc869b0b4ed844a73b3
             if (flag || (flag1 && !ItemStack.matches(this.player.inventoryMenu.getSlot(packet.slotNum()).getItem(), packet.itemStack()))) { // Insist on valid slot
                 // CraftBukkit start - Call click event
                 org.bukkit.inventory.InventoryView inventory = this.player.inventoryMenu.getBukkitView();
-@@ -3532,6 +3533,7 @@ public class ServerGamePacketListenerImpl
+@@ -3576,6 +3577,7 @@ public class ServerGamePacketListenerImpl
                 this.player.inventoryMenu.getSlot(packet.slotNum()).setByPlayer(itemStack);
                 this.player.inventoryMenu.setRemoteSlot(packet.slotNum(), itemStack);
                 this.player.inventoryMenu.broadcastChanges();
@@ -229,7 +229,7 @@ index 44276ba9c7aab306cfd12833a834ebe61cf64e7c..0a19a7782f3fa27c41e02393e887ba7c
 
     default @Nullable SlotAccess getChestVehicleSlot(final int slot) {
 diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
-index b090b74c845cd5944c9a8e35e899ad35063770d3..8e28afcfda7b180def81122e35920f6fd57a4574 100644
+index 3b1c6a2397950ceb167890961b635cc69aaf8950..e7ea8849e8fa942709f505145e8076f064476206 100644
 --- a/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
@@ -292,6 +292,13 @@ public abstract class AbstractContainerMenu {
@@ -255,7 +255,7 @@ index b090b74c845cd5944c9a8e35e899ad35063770d3..8e28afcfda7b180def81122e35920f6f
                             int min1 = Math.min(getQuickCraftPlaceCount(this.quickcraftSlots, this.quickcraftType, itemStack) + i2, min);
                             count -= min1 - i2;
                             // slot1.setByPlayer(itemStack.copyWithCount(min1));
-@@ -560,7 +567,7 @@ public abstract class AbstractContainerMenu {
+@@ -556,7 +563,7 @@ public abstract class AbstractContainerMenu {
                                 slot.setByPlayer(carried2);
                             }
                         } else if (ItemStack.isSameItemSameComponents(carried, carried2)) {
@@ -264,7 +264,7 @@ index b090b74c845cd5944c9a8e35e899ad35063770d3..8e28afcfda7b180def81122e35920f6f
                             optional1.ifPresent(itemStack2 -> {
                                 carried2.grow(itemStack2.getCount());
                                 slot.onTake(player, itemStack2);
-@@ -622,7 +629,7 @@ public abstract class AbstractContainerMenu {
+@@ -618,7 +625,7 @@ public abstract class AbstractContainerMenu {
             Slot slot2 = this.slots.get(slotIndex);
             if (slot2.hasItem()) {
                 ItemStack itemStack = slot2.getItem();
@@ -273,7 +273,7 @@ index b090b74c845cd5944c9a8e35e899ad35063770d3..8e28afcfda7b180def81122e35920f6f
             }
         } else if (clickType == ClickType.THROW && this.getCarried().isEmpty() && slotIndex >= 0) {
             Slot slot2 = this.slots.get(slotIndex);
-@@ -657,15 +664,15 @@ public abstract class AbstractContainerMenu {
+@@ -653,15 +660,15 @@ public abstract class AbstractContainerMenu {
                 int maxStackSize = button == 0 ? 1 : -1;
 
                 for (int i3 = 0; i3 < 2; i3++) {
@@ -292,7 +292,7 @@ index b090b74c845cd5944c9a8e35e899ad35063770d3..8e28afcfda7b180def81122e35920f6f
                                 itemStack.grow(itemStack1.getCount());
                             }
                         }
-@@ -767,7 +774,7 @@ public abstract class AbstractContainerMenu {
+@@ -763,7 +770,7 @@ public abstract class AbstractContainerMenu {
             i = endIndex - 1;
         }
 
@@ -301,7 +301,7 @@ index b090b74c845cd5944c9a8e35e899ad35063770d3..8e28afcfda7b180def81122e35920f6f
             while (!stack.isEmpty() && (reverseDirection ? i >= startIndex : i < endIndex)) {
                 Slot slot = this.slots.get(i);
                 ItemStack item = slot.getItem();
-@@ -868,7 +875,7 @@ public abstract class AbstractContainerMenu {
+@@ -864,7 +871,7 @@ public abstract class AbstractContainerMenu {
     public static boolean canItemQuickReplace(@Nullable Slot slot, ItemStack stack, boolean stackSizeMatters) {
         boolean flag = slot == null || !slot.hasItem();
         return !flag && ItemStack.isSameItemSameComponents(stack, slot.getItem())
@@ -310,7 +310,7 @@ index b090b74c845cd5944c9a8e35e899ad35063770d3..8e28afcfda7b180def81122e35920f6f
             : flag;
     }
 
-@@ -876,7 +883,7 @@ public abstract class AbstractContainerMenu {
+@@ -872,7 +879,7 @@ public abstract class AbstractContainerMenu {
         return switch (type) {
             case 0 -> Mth.floor((float)stack.getCount() / slots.size());
             case 1 -> 1;
@@ -319,7 +319,7 @@ index b090b74c845cd5944c9a8e35e899ad35063770d3..8e28afcfda7b180def81122e35920f6f
             default -> stack.getCount();
         };
     }
-@@ -899,7 +906,7 @@ public abstract class AbstractContainerMenu {
+@@ -895,7 +902,7 @@ public abstract class AbstractContainerMenu {
             for (int i = 0; i < container.getContainerSize(); i++) {
                 ItemStack item = container.getItem(i);
                 if (!item.isEmpty()) {
@@ -355,7 +355,7 @@ index 2b7e245ebf3bb471a1d817c4b5d56a64790cbab7..00083df87439ff0fa56e09853931b605
 
     public @Nullable Identifier getNoItemIcon() {
 diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
-index 5489302acb5bceac2cae71079a8356b455cf1304..a688da5bc71799c13548d390ab58645da9128229 100644
+index ed2971b54afbebe37a7ff61798778a4249b79856..73a97f4f62fe7d27b441cab58c6c86ffce011060 100644
 --- a/net/minecraft/world/item/ItemStack.java
 +++ b/net/minecraft/world/item/ItemStack.java
@@ -174,7 +174,7 @@ public final class ItemStack implements DataComponentHolder, ChangePublisher<net
@@ -420,7 +420,7 @@ index c5fe15844d405a27cdae18c903dd481c25b437de..3faa541c4a4623e915269d6241e1a3a3
             org.bukkit.craftbukkit.inventory.CraftItemStack oitemstack = org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack);
 
 diff --git a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 8176c0b35852fb0753339a92f1bbae41a5ae6782..9ada04588b8d30d307a91d93c48e6dca25b8d484 100644
+index 9346f2deca8eeca29fa2fced416247fd1609249e..07236e86638faa3231917af507cdd37ac49b1270 100644
 --- a/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
@@ -412,7 +412,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
@@ -446,7 +446,7 @@ index 8f80c469c309bf61328c4f98037495f47a38c3c1..b4127d4b4386b98205275a9a0ef8067c
     }
 
 diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index f851e0f7d727cb9dca70c578777d871af424388c..6a51bace3151646afae9de820d9c8977a0221df4 100644
+index 53c50d776e5ca66e5903a464d763a7df5b7672be..6cdb59762b5b223a220d420ff99fa9eadc64f3e0 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
@@ -8,7 +8,7 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/3e96b237749a960f2
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java
-index c8fa9a9ae29ecf9b2d6234e7efee61d05c8bc0ae..336daa3f7e2c957286d245746af47603a98438bc 100644
+index 08a1be57e1057a9e961eeb8f59cd12e98ed52bab..33ee967d8a7d4ce2c455db9ffaac740cd589e6f3 100644
 --- a/net/minecraft/world/level/ServerExplosion.java
 +++ b/net/minecraft/world/level/ServerExplosion.java
@@ -717,6 +717,7 @@ public class ServerExplosion implements Explosion {
@@ -24,7 +24,7 @@ index 80f17f33f670018240c854df589cf90cdeab6e70..c9af615ff9120c07787f436dbb6024e5
             if (raidAt == null || raidAt.getRaidOmenLevel() < raidAt.getMaxRaidOmenLevel()) {
                 serverPlayer.addEffect(new MobEffectInstance(MobEffects.RAID_OMEN, 600, amplifier));
 diff --git a/net/minecraft/world/entity/raid/Raid.java b/net/minecraft/world/entity/raid/Raid.java
-index 4deb9e4688a04b25e862572b70bf91e3ace9841e..2f31fae204dbeeeec1d188b6908aec5ad937e62e 100644
+index dcdd6f230ff153a7b58d13b963d32376b1905b72..be9c78f2cf121e8ae55c1b18685877637a25ec80 100644
 --- a/net/minecraft/world/entity/raid/Raid.java
 +++ b/net/minecraft/world/entity/raid/Raid.java
@@ -264,7 +264,7 @@ public class Raid {
@@ -167,7 +167,7 @@ index 4deb9e4688a04b25e862572b70bf91e3ace9841e..2f31fae204dbeeeec1d188b6908aec5a
 +    // Leaves end - old FindSpawnPosition
 }
 diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
-index 29ddff87216069cdf423f96f3fe835e0802d9ab5..18c4dffb5942b17dc1f2e9d9124c4f3ba3271360 100644
+index 5e8245e6dd8a07ece83dd1bc20e351a92044e7a0..2b7894a4104d4cb237746a3e66d4368b6f8f3c1e 100644
 --- a/net/minecraft/world/entity/raid/Raider.java
 +++ b/net/minecraft/world/entity/raid/Raider.java
@@ -127,6 +127,43 @@ public abstract class Raider extends PatrollingMonster {
@@ -8,7 +8,7 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/79d9ef74c2684eb49
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/net/minecraft/world/item/ShearsItem.java b/net/minecraft/world/item/ShearsItem.java
-index 8cf3e51e12f9cf98836657e722edb23943f9e866..5fd5e9fd4e1a79dd1a9d62a5cf0c308805979420 100644
+index 5e25ddf78f72ada318ef28d29199de9b93fe667e..6f48162a25e20d2439935e8995cede9497626322 100644
 --- a/net/minecraft/world/item/ShearsItem.java
 +++ b/net/minecraft/world/item/ShearsItem.java
@@ -80,7 +80,10 @@ public class ShearsItem extends Item {
@@ -23,10 +23,10 @@ index 95f6b1cbd5e33151c326689bc72292ff38a48803..e1974bbebbd10b75ea02955d9ced198d
 +    // Leaves end - servux
 }
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 6aad6024dc121eae63b7fde92a89cbea29fcafb3..90e363a310936830788aee6484a63a989aa316e7 100644
+index bf340425dc2a1545b9069badcf054d4c2f6a405f..eb5722848d1c77044807510cd6a46a46c5763509 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -2442,6 +2442,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2491,6 +2491,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
             this.server.updateEffectiveRespawnData();
         }
         // Paper end
@@ -5,7 +5,7 @@ Subject: [PATCH] LeavesHooks


 diff --git a/ca/spottedleaf/moonrise/paper/PaperHooks.java b/ca/spottedleaf/moonrise/paper/PaperHooks.java
-index d9fd093f59987f471627ff20cfd2eb1a3c0dea64..78c6d425589b8147c33583ac46d6f21ec5dbefaa 100644
+index faf62f8c9453f8e7a21b1e141577f1f4539cd2f9..4e5985a3e4969f466980558190324350019ba8af 100644
 --- a/ca/spottedleaf/moonrise/paper/PaperHooks.java
 +++ b/ca/spottedleaf/moonrise/paper/PaperHooks.java
@@ -29,7 +29,7 @@ import net.minecraft.world.phys.AABB;
@@ -6,10 +6,10 @@ 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 ad497cc5a01662e86d6c3d0a7d51b86cfc764f53..67faf1ed52806ee2c1e2ea080b39959ad9ae986d 100644
+index 5bae274f5ee869e540e4330e03af671b6b18313d..3fe9afe55b4d61db8030479d3d74b8656679cb10 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -1225,6 +1225,29 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -1240,6 +1240,29 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
         }
     }
 
@@ -40,7 +40,7 @@ index ad497cc5a01662e86d6c3d0a7d51b86cfc764f53..67faf1ed52806ee2c1e2ea080b39959a
         if (this.getType().is(EntityTypeTags.IMMUNE_TO_INFESTED)) {
             return !effectInstance.is(MobEffects.INFESTED);
 diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
-index 18c4dffb5942b17dc1f2e9d9124c4f3ba3271360..2a2078ff7e353f5c94145ae700d58771a602a7ff 100644
+index 2b7894a4104d4cb237746a3e66d4368b6f8f3c1e..03e3290367790add702a5856aaff3be465ea548c 100644
 --- a/net/minecraft/world/entity/raid/Raider.java
 +++ b/net/minecraft/world/entity/raid/Raider.java
@@ -157,7 +157,7 @@ public abstract class Raider extends PatrollingMonster {
@@ -8,7 +8,7 @@ As part of: Purpur (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18
 Licensed under: MIT (https://github.com/PurpurMC/Purpur/blob/09f547de09fc5d886f18f6d99ff389289766ec9d/LICENSE)

 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 3c27af5cf768eaa0591846923590a88606dee589..66e7b62a57eada0f0db7d9cc1be6362ac1e3ee85 100644
+index 2eb551390aa66d89988df9ca23cf0dd7ccfd6577..0d322ef4aa3e70c9edbb9fa8ba368bef916eb93d 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
@@ -963,6 +963,10 @@ public abstract class PlayerList {
@@ -23,7 +23,7 @@ index 3c27af5cf768eaa0591846923590a88606dee589..66e7b62a57eada0f0db7d9cc1be6362a
 
     // Paper start - whitelist verify event / login event
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index 3a8ac0765b8a988c281a2ded8c40ec044781cda2..1e3ac806c3f111ee0a4f8ef47134941ec85fbe6e 100644
+index 0f6e1428cc71c370af45db3e2a4f47c66e5d8628..83612969b6058f444fc17e360cdcc4a8846f79aa 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
@@ -179,6 +179,7 @@ public abstract class Player extends Avatar implements ContainerUser {
@@ -26,7 +26,7 @@ index 7b9e2a1a208b46a69c16e6afd8b502259893574f..c300ae4363298fecef8fa9bf739f01c0
             loadFromJson(resourceAsStream, output);
         } catch (JsonParseException | IOException var7) {
 diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
-index 2d5309cc9386ef1bddf0bd4e153269fea1e75d60..ffa479f3743571bd198b1e3694301d73953a4eaa 100644
+index f41c70c6cb2e9fae43bad9dd66546417fe38f14a..0bb0877011cac3184b881bfa35f10ef83d7341de 100644
 --- a/net/minecraft/server/Main.java
 +++ b/net/minecraft/server/Main.java
@@ -151,6 +151,8 @@ public class Main {
@@ -5,7 +5,7 @@ Subject: [PATCH] Old zombie reinforcement


 diff --git a/net/minecraft/world/entity/monster/zombie/Zombie.java b/net/minecraft/world/entity/monster/zombie/Zombie.java
-index 1f359cf31dfd1a7bb9e1a9c8c830a4a4aa88ed00..206b725c9d1dffb185a466746544324135b14f23 100644
+index 7a9394d4555464312418964f1a7a5d2581496774..3fcd32cc77458ce196ce0e468c1a99f456a57604 100644
 --- a/net/minecraft/world/entity/monster/zombie/Zombie.java
 +++ b/net/minecraft/world/entity/monster/zombie/Zombie.java
@@ -314,7 +314,7 @@ public class Zombie extends Monster {
@@ -5,14 +5,14 @@ Subject: [PATCH] Spawn invulnerable time


 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 93bc76af4d0abbe1c526434991e74c4465764ac6..1a43bdcb4c37df4ad1c4dfe6ebb84470832e910f 100644
+index dcdb01fe5333d407a10f9872d09992c7b438ddeb..6df8f98afa7810815b8d7c86b3dac57cd5915682 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
@@ -240,6 +240,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
     private int lastSentFood = -99999999;
     private boolean lastFoodSaturationZero = true;
     public int lastSentExp = -99999999;
-+    private int spawnInvulnerableTime = 60; // Lophine - spawn invulnerable time
+    protected int spawnInvulnerableTime = 60; // Lophine - spawn invulnerable time
     private ChatVisiblity chatVisibility = ChatVisiblity.FULL;
     public ParticleStatus particleStatus = ParticleStatus.ALL;
     private boolean canChatColor = true;
@@ -24,7 +24,7 @@ index 93bc76af4d0abbe1c526434991e74c4465764ac6..1a43bdcb4c37df4ad1c4dfe6ebb84470
         if (this.invulnerableTime > 0) {
             this.invulnerableTime--;
         }
-@@ -1538,6 +1540,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1536,6 +1538,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
         if (this.isInvulnerableTo(level, damageSource)) {
             return false;
         } else {
@@ -20,7 +20,7 @@ index 368a9d33f93c2e85abe4cf10df5a85c09fb03dd6..2b78040daeb3b09c08494cbc1d4a9d36
         Set<CriterionTrigger.Listener<T>> set = (Set) advancements.criterionData.get(this); // Paper - fix PlayerAdvancements leak
         if (set != null && !set.isEmpty()) {
 diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
-index d5e604bf18a223aa434bc9f78274e1f3ff7f203d..715976a49ca621ba40d9353b18d41d342315afd4 100644
+index 9f444988d40208a1bfa9f147ef80489f81115e93..ab2fa0b86564622501238305714fff014e2b2a56 100644
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
@@ -74,7 +74,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -33,7 +33,7 @@ index d5e604bf18a223aa434bc9f78274e1f3ff7f203d..715976a49ca621ba40d9353b18d41d34
     private boolean encrypted;
     private final java.util.concurrent.atomic.AtomicBoolean disconnectionHandled = new java.util.concurrent.atomic.AtomicBoolean(false); // Folia - region threading - may be called concurrently during configuration stage
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index f04352738e4f703d28f3c06ff884aee7d980542c..0990879441a7d1ef97681115a6427e18eae7adef 100644
+index d5b680fc6e13ec26d0db2448009e4cbe59933e22..385c71d70ed9e5a3ae25fbecaefd6773c467d31d 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
@@ -425,6 +425,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -45,7 +45,7 @@ index f04352738e4f703d28f3c06ff884aee7d980542c..0990879441a7d1ef97681115a6427e18
     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<>();
-@@ -1052,6 +1054,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1050,6 +1052,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     // Folia end - region threading
 
     public void stopServer() {
@@ -57,7 +57,7 @@ index f04352738e4f703d28f3c06ff884aee7d980542c..0990879441a7d1ef97681115a6427e18
         // Folia start - region threading
         // halt scheduler
         // don't wait, we may be on a scheduler thread
-@@ -1665,7 +1672,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1668,7 +1675,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         int i = this.pauseWhenEmptySeconds() * 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
@@ -66,7 +66,15 @@ index f04352738e4f703d28f3c06ff884aee7d980542c..0990879441a7d1ef97681115a6427e18
                 this.emptyTicks++;
             } else {
                 this.emptyTicks = 0;
-@@ -2020,6 +2027,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1801,6 +1808,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             this.isSaving = true;
+             if (playerSaveInterval > 0) {
+                 this.playerList.saveAll(playerSaveInterval);
+                org.leavesmc.leaves.bot.BotList.INSTANCE.saveAllResumeBots(playerSaveInterval); // Leaves - resident fakeplayer
+             }
+             for (final ServerLevel level : (region == null ? this.getAllLevels() : Arrays.asList(region.world))) { // Folia - region threading
+                 if (level.paperConfig().chunks.autoSaveInterval.value() > 0) {
+@@ -2027,6 +2035,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
     public void tickConnection() {
         this.getConnection().tick();
@@ -74,7 +82,7 @@ index f04352738e4f703d28f3c06ff884aee7d980542c..0990879441a7d1ef97681115a6427e18
     }
 
     private void synchronizeTime(ServerLevel level) {
-@@ -3154,6 +3162,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -3161,6 +3170,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         return this.debugSubscribers;
     }
 
@@ -92,7 +100,7 @@ index f04352738e4f703d28f3c06ff884aee7d980542c..0990879441a7d1ef97681115a6427e18
         @Override
         public void close() {
 diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java
-index 98004b77b7f40d315f41be82105df6d4b9000e33..cd968c6971d054d9b66a0eaea4753a51ebb75b02 100644
+index c9e6cd428e4c74b14a992de9ffe85a5a707c4e6b..5bf7eb5b906cefa57a1dfcf828ff7872dbceac4f 100644
 --- a/net/minecraft/server/PlayerAdvancements.java
 +++ b/net/minecraft/server/PlayerAdvancements.java
@@ -166,6 +166,11 @@ public class PlayerAdvancements {
@@ -125,7 +133,7 @@ index d92492bca62fb02fe7a9e4e220cb8651c4d1e16d..7d0752f9a6a90cf389a9cb5829ab0260
                 return banIp(source, playerByName.getIpAddress(), reason);
             } else {
 diff --git a/net/minecraft/server/commands/BanPlayerCommands.java b/net/minecraft/server/commands/BanPlayerCommands.java
-index 978ef2e996a78e907f959bfe99d47de832427011..b34a077449f1c7bb8a0b5c94fdeb072dcc103797 100644
+index 978ef2e996a78e907f959bfe99d47de832427011..9644e68ba2c295fcda2d4a3034277520ade91bca 100644
 --- a/net/minecraft/server/commands/BanPlayerCommands.java
 +++ b/net/minecraft/server/commands/BanPlayerCommands.java
@@ -45,7 +45,15 @@ public class BanPlayerCommands {
@@ -135,7 +143,7 @@ index 978ef2e996a78e907f959bfe99d47de832427011..b34a077449f1c7bb8a0b5c94fdeb072d
 +        boolean hasBot = false; // Leaves - disable kick
         for (NameAndId nameAndId : players) {
 +            // Leaves start - disable ban
-+            if (org.leavesmc.leaves.bot.BotList.INSTANCE.getBot(nameAndId.id()) != null) {
+            if (nameAndId.isBot()) {
 +                source.sendFailure(Component.literal("Permission denied"));
 +                hasBot = true;
 +                continue;
@@ -197,19 +205,19 @@ index 5f78d629bab84acb2fa43a9fcc1cec52b4e91ae3..1c6059bd23afdd555d2dc8c533a5b027
                 return i;
             }
 diff --git a/net/minecraft/server/commands/OpCommand.java b/net/minecraft/server/commands/OpCommand.java
-index 07332a86e6e0441bafacb020f27ec36a277f1486..3798c1ea92ead20b3b7e67d88d2405f29e324d2c 100644
+index 07332a86e6e0441bafacb020f27ec36a277f1486..590891d70a71ab30ceae3a3cf1923745e7c20b26 100644
 --- a/net/minecraft/server/commands/OpCommand.java
 +++ b/net/minecraft/server/commands/OpCommand.java
@@ -43,6 +43,7 @@ public class OpCommand {
         int i = 0;
 
         for (NameAndId nameAndId : players) {
-+            if (org.leavesmc.leaves.bot.BotList.INSTANCE.getBot(nameAndId.id()) != null) continue; // Leaves - disable op
+            if (nameAndId.isBot()) continue; // Leaves - disable op
             if (!playerList.isOp(nameAndId)) {
                 playerList.op(nameAndId);
                 i++;
 diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index 5fbcb5eac1d5449247da77b6120edbe2f2dd1d58..00285e2e68b00d627e91f292da46e9058255ea52 100644
+index 5fbcb5eac1d5449247da77b6120edbe2f2dd1d58..69cc67b7618d38e65ccb1f4c58013ef116886ad2 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
@@ -252,6 +252,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -224,7 +232,7 @@ index 5fbcb5eac1d5449247da77b6120edbe2f2dd1d58..00285e2e68b00d627e91f292da46e905
         // Paper end - initialize global and world-defaults configuration
         me.earthme.luminol.config.ConfigManager.loadConfigFiles(); // Luminol - load config file
         fun.bm.lophine.utils.ServerI18nUtil.init(); // Lophine - I18n support
-+        this.getBotList().loadBotInfo(); // Leaves - load resident bot info
+        this.getBotList().loadResumeBotInfo(); // Leaves - load resident bot info
         if (false) this.server.spark.enableEarlyIfRequested(); // Paper - spark // Luminol - Force disable builtin spark
         // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
         if (this.convertOldUsers()) {
@@ -247,7 +255,7 @@ index fdccb06c918d387e46c29ede7337159db8c5d9ca..4cd5c5659ac098c3b7ff95efb94b1987
             }
         }
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 90e363a310936830788aee6484a63a989aa316e7..c09af6b81987df8e681689ecce9932a2e39af1a3 100644
+index eb5722848d1c77044807510cd6a46a46c5763509..88efbe2bcb5621432b67366116150a3dab52e510 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
@@ -220,6 +220,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -266,7 +274,7 @@ index 90e363a310936830788aee6484a63a989aa316e7..c09af6b81987df8e681689ecce9932a2
     }
 
     // Folia start - region threading
-@@ -2469,6 +2471,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2518,6 +2520,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
         return this.players;
     }
 
@@ -279,7 +287,7 @@ index 90e363a310936830788aee6484a63a989aa316e7..c09af6b81987df8e681689ecce9932a2
     @Override
     public void updatePOIOnBlockStateChange(BlockPos pos, BlockState oldState, BlockState newState) {
         Optional<Holder<PoiType>> optional = PoiTypes.forState(oldState);
-@@ -2942,6 +2950,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2991,6 +2999,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
             // ServerLevel.this.getChunkSource().addEntity(entity); // Paper - ignore and warn about illegal addEntity calls instead of crashing server; moved down below valid=true
             if (entity instanceof ServerPlayer serverPlayer) {
                 ServerLevel.this.players.add(serverPlayer);
@@ -291,7 +299,7 @@ index 90e363a310936830788aee6484a63a989aa316e7..c09af6b81987df8e681689ecce9932a2
                 if (serverPlayer.isReceivingWaypoints()) {
                     ServerLevel.this.getWaypointManager().addPlayer(serverPlayer);
                 }
-@@ -3029,6 +3042,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -3072,6 +3085,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
             ServerLevel.this.getChunkSource().removeEntity(entity);
             if (entity instanceof ServerPlayer serverPlayer) {
                 ServerLevel.this.players.remove(serverPlayer);
@@ -304,7 +312,7 @@ index 90e363a310936830788aee6484a63a989aa316e7..c09af6b81987df8e681689ecce9932a2
                 ServerLevel.this.updateSleepingPlayerList();
             }
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 1a43bdcb4c37df4ad1c4dfe6ebb84470832e910f..daff493e4ea944afa91ce99a3596931a487304a3 100644
+index 6df8f98afa7810815b8d7c86b3dac57cd5915682..7c2d53ca863c2e50c6871938efc426ddefff9b5c 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
@@ -227,7 +227,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -316,15 +324,6 @@ index 1a43bdcb4c37df4ad1c4dfe6ebb84470832e910f..daff493e4ea944afa91ce99a3596931a
     private final PlayerAdvancements advancements;
     private final ServerStatsCounter stats;
     private float lastRecordedHealthAndAbsorption = Float.MIN_VALUE;
-@@ -240,7 +240,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-     private int lastSentFood = -99999999;
-     private boolean lastFoodSaturationZero = true;
-     public int lastSentExp = -99999999;
-    private int spawnInvulnerableTime = 60; // Lophine - spawn invulnerable time
-+    public int spawnInvulnerableTime = 60; // Lophine - spawn invulnerable time
-     private ChatVisiblity chatVisibility = ChatVisiblity.FULL;
-     public ParticleStatus particleStatus = ParticleStatus.ALL;
-     private boolean canChatColor = true;
@@ -248,7 +248,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
     private @Nullable Entity camera;
     public boolean isChangingDimension;
@@ -334,26 +333,16 @@ index 1a43bdcb4c37df4ad1c4dfe6ebb84470832e910f..daff493e4ea944afa91ce99a3596931a
     private @Nullable Vec3 levitationStartPos;
     private int levitationStartTime;
     private boolean disconnected;
-@@ -440,6 +440,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-     // Paper start - rewrite chunk system
-     private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
-     private final ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder viewDistanceHolder = new ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.ViewDistanceHolder();
-+    // Leaves start - player operation limiter
-+    private int instaBreakCountPerTick = 0;
-+    private int placeBlockCountPerTick = 0;
-+    // Leaves end - player operation limiter
+@@ -1495,7 +1495,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+     }
+     // Luminol End - Cross Region Damage trace
 
-     @Override
-     public final boolean moonrise$isRealPlayer() {
-@@ -897,6 +901,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-         }
-         // CraftBukkit end
-         this.connection.tickClientLoadTimeout();
-+        this.resetOperationCountPerTick(); // Leaves - player operation limiter
-         this.gameMode.tick();
-         this.wardenSpawnTracker.tick();
-         if (this.spawnInvulnerableTime > 0) --this.spawnInvulnerableTime; // Lophine - spawn invulnerable time
-@@ -2134,6 +2139,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+-    private void tellNeutralMobsThatIDied() {
+    protected void tellNeutralMobsThatIDied() { // Leaves private -> protected
+         AABB aabb = new AABB(this.blockPosition()).inflate(32.0, 10.0, 32.0);
+         this.level()
+             .getEntitiesOfClass(Mob.class, aabb, EntitySelector.NO_SPECTATORS)
+@@ -2132,6 +2132,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
                 this.lastSentHealth = -1.0F;
                 this.lastSentFood = -1;
                 this.teleportSpectators(teleportTransition, serverLevel);
@@ -365,40 +354,73 @@ index 1a43bdcb4c37df4ad1c4dfe6ebb84470832e910f..daff493e4ea944afa91ce99a3596931a
                 // CraftBukkit start
                 org.bukkit.event.player.PlayerChangedWorldEvent changeEvent = new org.bukkit.event.player.PlayerChangedWorldEvent(this.getBukkitEntity(), serverLevel.getWorld());
                 this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
-@@ -3728,4 +3738,31 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-         return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity();
+diff --git a/net/minecraft/server/players/CachedUserNameToIdResolver.java b/net/minecraft/server/players/CachedUserNameToIdResolver.java
+index 345bdb0ff82b8cd8c63e5ff1f2dabb68a1e54b77..c9a7c1c37155e0d339b880179a5988c9a6cb3797 100644
+--- a/net/minecraft/server/players/CachedUserNameToIdResolver.java
+++ b/net/minecraft/server/players/CachedUserNameToIdResolver.java
+@@ -122,6 +122,12 @@ public class CachedUserNameToIdResolver implements UserNameToIdResolver {
+ 
+     @Override
+     public Optional<NameAndId> get(String name) {
+        // Leaves start - fix bot
+        org.leavesmc.leaves.bot.ServerBot bot = org.leavesmc.leaves.bot.BotList.INSTANCE.getBotByName(name);
+        if (bot != null) {
+            return Optional.of(bot.nameAndId());
+        }
+        // Leaves end - fix bot
+         String string = name.toLowerCase(Locale.ROOT);
+         boolean stateLocked = true; try { this.stateLock.lock(); // Paper - Fix GameProfileCache concurrency
+         CachedUserNameToIdResolver.GameProfileInfo gameProfileInfo = this.profilesByName.get(string);
+diff --git a/net/minecraft/server/players/NameAndId.java b/net/minecraft/server/players/NameAndId.java
+index 05b4a75f6597e8613c91344d100bb7f005d169a7..9a5006362c12e972d031c48be4d30362d88d1c00 100644
+--- a/net/minecraft/server/players/NameAndId.java
+++ b/net/minecraft/server/players/NameAndId.java
+@@ -8,18 +8,22 @@ import java.util.UUID;
+ import net.minecraft.core.UUIDUtil;
+ import org.jspecify.annotations.Nullable;
+ 
+-public record NameAndId(UUID id, String name) {
+public record NameAndId(UUID id, String name, boolean isBot) { // Leaves - fakeplayer
+     public static final Codec<NameAndId> CODEC = RecordCodecBuilder.create(
+         instance -> instance.group(UUIDUtil.STRING_CODEC.fieldOf("id").forGetter(NameAndId::id), Codec.STRING.fieldOf("name").forGetter(NameAndId::name))
+             .apply(instance, NameAndId::new)
+     );
+ 
+     public NameAndId(GameProfile profile) {
+-        this(profile.id(), profile.name());
+        this(profile.id(), profile.name(), com.google.common.collect.Iterables.getFirst(profile.properties().get("is_bot"), "false").equals("true")); // Leaves - fakeplayer
     }
-     // CraftBukkit end
-+
-+    // Leaves start - player operation limiter
-+    protected void resetOperationCountPerTick() {
-+        instaBreakCountPerTick = 0;
-+        placeBlockCountPerTick = 0;
+ 
+     public NameAndId(com.mojang.authlib.yggdrasil.response.NameAndId nameAndId) {
+-        this(nameAndId.id(), nameAndId.name());
+        this(nameAndId.id(), nameAndId.name(), false); // Leaves - fakeplayer
 +    }
 +
-+    public int getInstaBreakCountPerTick() {
-+        return instaBreakCountPerTick;
-+    }
-+
-+    public int getPlaceBlockCountPerTick() {
-+        return placeBlockCountPerTick;
-+    }
-+
-+    public void addInstaBreakCountPerTick() {
-+        ++instaBreakCountPerTick;
-+    }
-+
-+    public void addPlaceBlockCountPerTick() {
-+        ++placeBlockCountPerTick;
-+    }
-+
-+    public boolean allowOperation() {
-+        return (instaBreakCountPerTick == 0 || placeBlockCountPerTick == 0) && (instaBreakCountPerTick <= 1 && placeBlockCountPerTick <= 2);
-+    }
-+    // Leaves end - player operation limiter
- }
+    public NameAndId(UUID uuid, String name) {
+        this(uuid, name, false); // Leaves - fakeplayer
+     }
+ 
+     public static @Nullable NameAndId fromJson(JsonObject json) {
+@@ -33,7 +37,7 @@ public record NameAndId(UUID id, String name) {
+                 return null;
+             }
+ 
+-            return new NameAndId(uuid, json.get("name").getAsString());
+            return new NameAndId(uuid, json.get("name").getAsString(), false); // Leaves - fakeplayer
+         } else {
+             return null;
+         }
+@@ -46,7 +50,7 @@ public record NameAndId(UUID id, String name) {
+ 
+     public static NameAndId createOffline(String name) {
+         UUID uuid = UUIDUtil.createOfflinePlayerUUID(name);
+-        return new NameAndId(uuid, name);
+        return new NameAndId(uuid, name, false); // Leaves - fakeplayer
+     }
+ 
+     // Paper start - utility method for common conversion back to the game profile
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 0d322ef4aa3e70c9edbb9fa8ba368bef916eb93d..293b154dc027694acd2dceaf00c61b3e42cf7a1c 100644
+index 0d322ef4aa3e70c9edbb9fa8ba368bef916eb93d..3a5319739f0687fc6f09b2ac8ee31716593fe0de 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
@@ -317,6 +317,19 @@ public abstract class PlayerList {
@@ -409,7 +431,7 @@ index 0d322ef4aa3e70c9edbb9fa8ba368bef916eb93d..293b154dc027694acd2dceaf00c61b3e
 +        if (fun.bm.lophine.config.modules.function.FakeplayerConfig.enable) {
 +            org.leavesmc.leaves.bot.ServerBot bot = this.server.getBotList().getBotByName(player.getScoreboardName());
 +            if (bot != null) {
-+                this.server.getBotList().removeBot(bot, org.leavesmc.leaves.event.bot.BotRemoveEvent.RemoveReason.INTERNAL, player.getBukkitEntity(), false, true);
+                this.server.getBotList().removeBot(bot, org.leavesmc.leaves.event.bot.BotRemoveEvent.RemoveReason.INTERNAL, player.getBukkitEntity(), false, false);
 +            }
 +            this.server.getBotList().bots.forEach(bot1 -> {
 +                bot1.sendPlayerInfo(player);
@@ -421,7 +443,7 @@ index 0d322ef4aa3e70c9edbb9fa8ba368bef916eb93d..293b154dc027694acd2dceaf00c61b3e
         final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
 
         if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure
-@@ -791,6 +804,13 @@ public abstract class PlayerList {
+@@ -791,6 +804,12 @@ public abstract class PlayerList {
         ).callEvent();
         // Paper end
 
@@ -430,12 +452,11 @@ index 0d322ef4aa3e70c9edbb9fa8ba368bef916eb93d..293b154dc027694acd2dceaf00c61b3e
 +            this.server.getBotList().bots.forEach(bot -> bot.sendFakeDataIfNeed(serverPlayer, true)); // Leaves - render bot
 +        }
 +        // Leaves end - bot support
-+
 +
         return serverPlayer;
     }
 
-@@ -892,11 +912,16 @@ public abstract class PlayerList {
+@@ -892,11 +911,16 @@ public abstract class PlayerList {
 
     public String[] getPlayerNamesArray() {
         List<ServerPlayer> players = new java.util.ArrayList<>(this.players); // Folia - region threading
@@ -453,7 +474,7 @@ index 0d322ef4aa3e70c9edbb9fa8ba368bef916eb93d..293b154dc027694acd2dceaf00c61b3e
 
         return strings;
     }
-@@ -1016,7 +1041,14 @@ public abstract class PlayerList {
+@@ -1016,7 +1040,14 @@ public abstract class PlayerList {
     }
 
     public @Nullable ServerPlayer getPlayerByName(String username) {
@@ -469,7 +490,7 @@ index 0d322ef4aa3e70c9edbb9fa8ba368bef916eb93d..293b154dc027694acd2dceaf00c61b3e
     }
 
     public void broadcast(@Nullable Player except, double x, double y, double z, double radius, ResourceKey<Level> dimension, Packet<?> packet) {
-@@ -1353,7 +1385,13 @@ public abstract class PlayerList {
+@@ -1353,7 +1384,13 @@ public abstract class PlayerList {
     }
 
     public @Nullable ServerPlayer getPlayer(UUID playerUUID) {
@@ -484,39 +505,11 @@ index 0d322ef4aa3e70c9edbb9fa8ba368bef916eb93d..293b154dc027694acd2dceaf00c61b3e
     }
 
     public @Nullable ServerPlayer getPlayer(String name) {
-diff --git a/net/minecraft/server/waypoints/ServerWaypointManager.java b/net/minecraft/server/waypoints/ServerWaypointManager.java
-index f76d3a404eb7077f1db2374303eb265cb513d848..2e0e17a59fa2864dc9a2f2dafd18158cae6dae04 100644
--- a/net/minecraft/server/waypoints/ServerWaypointManager.java
-+++ b/net/minecraft/server/waypoints/ServerWaypointManager.java
-@@ -24,6 +24,11 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
-     public void trackWaypoint(WaypointTransmitter waypoint) {
-         // Lophine start - unsafe waypoint bar
-         if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
-+        // Leaves start - fakeplayer
-+        if (waypoint instanceof org.leavesmc.leaves.bot.ServerBot bot && !bot.getConfigValue(org.leavesmc.leaves.bot.agent.Configs.ENABLE_LOCATOR_BAR)) {
-+            return;
-+        }
-+        // Leaves end - fakeplayer
-         this.waypoints.add(waypoint);
- 
-         for (ServerPlayer serverPlayer : this.players) {
-@@ -64,6 +69,11 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
-         // Folia - region threading
-         // Lophine start - unsafe waypoint bar
-         if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
-+        // Leaves start - fakeplayer
-+        if (player instanceof org.leavesmc.leaves.bot.ServerBot) {
-+            return;
-+        }
-+        // Leaves end - fakeplayer
-         this.players.add(player);
- 
-         for (WaypointTransmitter waypointTransmitter : this.waypoints) {
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 0f213d1cfab6066f6713c5b2124b76409510454c..5bcf646ef600a2aae7633453d3331fde2f141aff 100644
+index 22e68cabb4554c3e21e6f4ef316186f60ec77511..5ac53fcdca5fa6aae0452840e78d67653ceececb 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -1252,7 +1252,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -1235,7 +1235,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
 
             BlockPos onPosLegacy = this.getOnPosLegacy();
             BlockState blockState = this.level().getBlockState(onPosLegacy);
@@ -525,7 +518,7 @@ index 0f213d1cfab6066f6713c5b2124b76409510454c..5bcf646ef600a2aae7633453d3331fde
                 this.checkFallDamage(vec3.y, this.onGround(), blockState, onPosLegacy);
             }
 
-@@ -1577,7 +1577,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -1570,7 +1570,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
     }
 
     // Paper start - optimise collisions
@@ -535,10 +528,10 @@ index 0f213d1cfab6066f6713c5b2124b76409510454c..5bcf646ef600a2aae7633453d3331fde
         final boolean yZero = movement.y == 0.0;
         final boolean zZero = movement.z == 0.0;
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 67faf1ed52806ee2c1e2ea080b39959ad9ae986d..f80f5533c1c3c64ee1b8b2c43e2bc2dea8ab567f 100644
+index 3fe9afe55b4d61db8030479d3d74b8656679cb10..c0ebd700caa950948c58846eaf164afc14f87f09 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -3304,7 +3304,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -3319,7 +3319,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
     private void travelRidden(Player player, Vec3 travelVector) {
         Vec3 riddenInput = this.getRiddenInput(player, travelVector);
         this.tickRidden(player, riddenInput);
@@ -547,16 +540,16 @@ index 67faf1ed52806ee2c1e2ea080b39959ad9ae986d..f80f5533c1c3c64ee1b8b2c43e2bc2de
             this.setSpeed(this.getRiddenSpeed(player));
             this.travel(riddenInput);
         } else {
-@@ -4213,7 +4213,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -4228,7 +4228,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
         // Paper start - lag compensate eating
         // we add 1 to the expected time to avoid lag compensating when we should not
         final boolean shouldLagCompensate = this.useItem.has(DataComponents.FOOD) && this.eatStartTime != -1 && (System.nanoTime() - this.eatStartTime) > ((1L + this.totalEatTimeTicks) * 50L * (1000L * 1000L));
 -        if ((--this.useItemRemaining == 0 || shouldLagCompensate) && !this.level().isClientSide() && !usingItem.useOnRelease()) {
-+        if ((--this.useItemRemaining == 0 || shouldLagCompensate) && !(this instanceof org.leavesmc.leaves.bot.ServerBot) && !this.level().isClientSide() && !usingItem.useOnRelease()) { // Leaves - Fakeplayer skip this check
+        if ((--this.useItemRemaining == 0 || shouldLagCompensate) && !(this instanceof org.leavesmc.leaves.bot.ServerBot) && !this.level().isClientSide() && !usingItem.useOnRelease()) {
             this.useItemRemaining = 0;
             // Paper end - lag compensate eating
             this.completeUsingItem();
-@@ -4397,6 +4397,23 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -4413,6 +4413,23 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
         this.stopUsingItem();
     }
 
@@ -581,7 +574,7 @@ index 67faf1ed52806ee2c1e2ea080b39959ad9ae986d..f80f5533c1c3c64ee1b8b2c43e2bc2de
         if (!this.level().isClientSide()) {
             boolean isUsingItem = this.isUsingItem();
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index 1e3ac806c3f111ee0a4f8ef47134941ec85fbe6e..52c41d1e526dc0d42dde3773ab20ee7252737e5d 100644
+index 83612969b6058f444fc17e360cdcc4a8846f79aa..29ca31b05ec5636243b13fee8b3399d5e21808b4 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
@@ -168,7 +168,7 @@ public abstract class Player extends Avatar implements ContainerUser {
@@ -668,7 +661,7 @@ index fc1b3501114108d0166256c514a225337955e461..56bc87fefc82c77077bfed50accbde77
         return switch (this.getStatus()) {
             case IN_WATER, UNDER_WATER, UNDER_FLOWING_WATER -> SoundEvents.BOAT_PADDLE_WATER;
 diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java
-index a67901ed3bcb67fb2cab05894bc386db2f0f90f8..3456712f837f91101cc1d38c953af1d7237603b9 100644
+index e7ea8849e8fa942709f505145e8076f064476206..4935234fba5977246aa303bf8162404813b5491e 100644
 --- a/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/net/minecraft/world/inventory/AbstractContainerMenu.java
@@ -404,6 +404,7 @@ public abstract class AbstractContainerMenu {
@@ -679,7 +672,7 @@ index a67901ed3bcb67fb2cab05894bc386db2f0f90f8..3456712f837f91101cc1d38c953af1d7
         if (clickType == ClickType.QUICK_CRAFT) {
             int i = this.quickcraftStatus;
             this.quickcraftStatus = getQuickcraftHeader(button);
-@@ -682,6 +683,22 @@ public abstract class AbstractContainerMenu {
+@@ -678,6 +679,22 @@ public abstract class AbstractContainerMenu {
         }
     }
 
@@ -703,7 +696,7 @@ index a67901ed3bcb67fb2cab05894bc386db2f0f90f8..3456712f837f91101cc1d38c953af1d7
         FeatureFlagSet featureFlagSet = player.level().enabledFeatures();
         return carriedItem.isItemEnabled(featureFlagSet) && carriedItem.overrideStackedOnOther(slot, action, player)
 diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
-index a688da5bc71799c13548d390ab58645da9128229..e63cca6f7f63a2b5f249ae01033167186e710fdb 100644
+index 73a97f4f62fe7d27b441cab58c6c86ffce011060..ea6285b7f53f391c84519aa7ae39164cf5740b81 100644
 --- a/net/minecraft/world/item/ItemStack.java
 +++ b/net/minecraft/world/item/ItemStack.java
@@ -456,7 +456,7 @@ public final class ItemStack implements DataComponentHolder, ChangePublisher<net
@@ -737,7 +730,7 @@ index a688da5bc71799c13548d390ab58645da9128229..e63cca6f7f63a2b5f249ae0103316718
         return this.getItem().useOnRelease(this);
     }
 diff --git a/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
-index adc8c8a7b8a02cf395e919eb51aefc47ff6ed9ab..225fedb32b100a0f24e001e442c0bae44acb0284 100644
+index 557ea70254a8d6dd87c656098c5632bdcbe3df8f..1d60054146f970ec24054d2c76a27e2d8620ec67 100644
 --- a/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
 +++ b/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
@@ -145,7 +145,7 @@ public class PistonMovingBlockEntity extends BlockEntity {
@@ -778,16 +771,3 @@ index bef794c3f58c41d910aa0bcc63fbdeea7225fddf..a601da588e6973cc5b87d3e3eeba49b5
         this.id = id;
     }
 
-diff --git a/net/minecraft/world/level/storage/PlayerDataStorage.java b/net/minecraft/world/level/storage/PlayerDataStorage.java
-index b8ef50bc3d07890c9da2c98d5f009a3adc52f4b0..f37de9384005f53631cc3e122c74e4793dff4be0 100644
--- a/net/minecraft/world/level/storage/PlayerDataStorage.java
-+++ b/net/minecraft/world/level/storage/PlayerDataStorage.java
-@@ -19,7 +19,7 @@ import net.minecraft.util.datafix.DataFixTypes;
- import net.minecraft.world.entity.player.Player;
- import org.slf4j.Logger;
- 
-public class PlayerDataStorage {
-+public class PlayerDataStorage implements org.leavesmc.leaves.bot.IPlayerDataStorage {
-     private static final Logger LOGGER = LogUtils.getLogger();
-     private final File playerDir;
-     protected final DataFixer fixerUpper;
@@ -9,7 +9,7 @@ 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/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index df6ad5831f83fcc869b0b4ed844a73b3cb81c469..5c81be29f7ecc3389b5b578f85774035def96e26 100644
+index d35ef52a6adb9a560138d1a2af32969c3a73f42b..df66e24c61af9d57d619c91849e28f1bec64a036 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -338,9 +338,12 @@ public class ServerGamePacketListenerImpl
@@ -8,7 +8,7 @@ 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/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
-index 173a55715b9c459eeb93cdc065c69e64fc704b43..b2694cb60505766877398fa526b9bfe60e6b6404 100644
+index 435acf0fe5e80ca371d1145befc2cfaa917a89e3..77577d0df9b14a7ad55b2866c2ac31863226458b 100644
 --- a/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/net/minecraft/world/level/chunk/LevelChunk.java
@@ -758,6 +758,11 @@ public class LevelChunk extends ChunkAccess implements DebugValueSource, ca.spot
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: violetc <58360096+s-yh-china@users.noreply.github.com>
-Date: Mon, 3 Feb 2025 13:33:19 +0800
+From: Bacteriawa <A3167717663@hotmail.com>
+Date: Fri, 13 Feb 2026 16:17:36 +0800
 Subject: [PATCH] Leaves: Jade Protocol

 This patch is Powered by Jade(https://github.com/Snownee/Jade)
@@ -9,10 +9,10 @@ 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/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index daff493e4ea944afa91ce99a3596931a487304a3..f79735abf21b6eecc02e5b5f1ce3140dfef3ede9 100644
+index 7c2d53ca863c2e50c6871938efc426ddefff9b5c..8c1e6837b0328c66fdda322c3c7ceba31c4f017f 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -1458,7 +1458,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -1451,7 +1451,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
         } else if (fun.bm.lophine.config.modules.experiment.EntityDamageSourceTraceConfig.enabled) {
             final LivingEntity entitylivingnew = this.getKillCreditOrigin();
             if (entitylivingnew != null) {
@@ -22,18 +22,18 @@ index daff493e4ea944afa91ce99a3596931a487304a3..f79735abf21b6eecc02e5b5f1ce3140d
         // Luminol End - Cross Region Damage trace
         }
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5c81be29f7ecc3389b5b578f85774035def96e26..98d641b2e8ca340cb10fe0448f8a8b4f8446f616 100644
+index df66e24c61af9d57d619c91849e28f1bec64a036..8386757c5fd3d8df3ae77a4eeeb25a2f28840cda 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3798,7 +3798,7 @@ public class ServerGamePacketListenerImpl
-         } else if (this.clientLoadedTimeoutTimer == 1) markClientLoaded(); // Paper - Add PlayerLoadedWorldEvent - decrement by calling #markClientLoaded which will set the value to 0 *and* call the event.
+@@ -3843,7 +3843,7 @@ public class ServerGamePacketListenerImpl
     }
 
+     @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper - Add PlayerLoadedWorldEvent
 -    private void markClientLoaded() {
 +    public void markClientLoaded() { // Lophine - private -> public
         // Paper start - Add PlayerLoadedWorldEvent
-         if (!hasClientLoaded()) {
-             final io.papermc.paper.event.player.PlayerClientLoadedWorldEvent event = new io.papermc.paper.event.player.PlayerClientLoadedWorldEvent(this.player.getBukkitEntity(), true);
+         this.markClientLoaded(false);
+     }
 diff --git a/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/net/minecraft/world/entity/animal/armadillo/Armadillo.java
 index 901e4e9897e76cd4158d7f8bb8ec829df8ff8196..59b9373c7a14e42d9e5f691354a7616d16856215 100644
 --- a/net/minecraft/world/entity/animal/armadillo/Armadillo.java
@@ -8,10 +8,10 @@ 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/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 293b154dc027694acd2dceaf00c61b3e42cf7a1c..63e0c4f64f99b230c5779095382f93fad0ac2cf6 100644
+index 3a5319739f0687fc6f09b2ac8ee31716593fe0de..36cd1a0307ff1a734eb5f4f3cc013781692e7ad8 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -1127,6 +1127,7 @@ public abstract class PlayerList {
+@@ -1126,6 +1126,7 @@ public abstract class PlayerList {
         //player.connection.send(new ClientboundSetChunkCacheRadiusPacket(io.papermc.paper.FeatureHooks.getViewDistance(level))); // Paper - rewrite chunk system
         //player.connection.send(new ClientboundSetSimulationDistancePacket(io.papermc.paper.FeatureHooks.getSimulationDistance(level))); // Paper - rewrite chunk system
         // Paper end - view distances
@@ -10,7 +10,7 @@ Licensed under: MIT
 This patch is Powered by fabric-carpet(https://github.com/gnembon/fabric-carpet)

 diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 6a51bace3151646afae9de820d9c8977a0221df4..8dd50507bbc9f61c9ae019eecc5e9338d20addff 100644
+index 6cdb59762b5b223a220d420ff99fa9eadc64f3e0..fe93f0d6b2b7e8503da068179f5d7667634c7ff3 100644
 --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -229,8 +229,30 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -72,7 +72,7 @@ index 6a51bace3151646afae9de820d9c8977a0221df4..8dd50507bbc9f61c9ae019eecc5e9338
 +            for (int i = 0; i < container.getContainerSize(); ++i) {
 +                if (!container.getItem(i).isEmpty()) {
 +                    ItemStack itemstack = container.getItem(i);
-+                    org.leavesmc.leaves.util.HopperCounter.getCounter(woolColor).add(level, itemstack);
+                    org.leavesmc.leaves.util.HopperCounter.getCounter(woolColor).add(level.getServer(), itemstack);
 +                    container.setItem(i, ItemStack.EMPTY);
 +                }
 +            }
@@ -13,10 +13,10 @@ MasaGadget(https://github.com/plusls/MasaGadget)
 litematica(https://github.com/maruohon/litematica)

 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 98d641b2e8ca340cb10fe0448f8a8b4f8446f616..878f5c5801b68e3a6d01d63caf44737841387600 100644
+index 8386757c5fd3d8df3ae77a4eeeb25a2f28840cda..fd74636d911596daae8cfe563c2dd5e3d37a1549 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2128,7 +2128,7 @@ public class ServerGamePacketListenerImpl
+@@ -2134,7 +2134,7 @@ public class ServerGamePacketListenerImpl
                 if (ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this.player.level(), blockPos.getX() >> 4, blockPos.getZ() >> 4, 8) && this.player.isWithinBlockInteractionRange(blockPos, 1.0)) { // Folia - do not allow players to interact with blocks outside the current region
                     Vec3 vec3 = location.subtract(Vec3.atCenterOf(blockPos));
                     double d = 1.0000001;
@@ -60,7 +60,7 @@ index d75c95d728efc0b4064f562ca80b68b23883feaf..be685383b8e7c8111e976fc560f16d43
                     blockState = blockState1;
                     break;
 diff --git a/net/minecraft/world/level/block/Block.java b/net/minecraft/world/level/block/Block.java
-index 13f06f1fbdf77b88493333b481b951d729579f11..e0ab4f7372ed11c9d17b341c8a24a82350c714fa 100644
+index 492b1615d96133c5082e0f16015f114299f8082f..fb47a2acb0e4232359f5da061c1620a7b1d6c476 100644
 --- a/net/minecraft/world/level/block/Block.java
 +++ b/net/minecraft/world/level/block/Block.java
@@ -489,6 +489,32 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -84,10 +84,10 @@ index af71e0e1eb1c93745f3e4954ecc8fbd2ad4808a3..f3829564681faff3ae8971ed90b947b4
                             players.add(serverPlayer1);
                             if (players.size() >= resultLimit) {
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 324f9d259c6e0fd814ffe11b62d07fb4d2197da3..9d334ed3307f3c4c82bb5300219a465408bf341a 100644
+index 385c71d70ed9e5a3ae25fbecaefd6773c467d31d..24f83a6875219aaf4b29e2461afcd0478a391014 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1894,7 +1894,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1896,7 +1896,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
     }
 
     private ServerStatus.Players buildPlayerStatus() {
@@ -96,7 +96,7 @@ index 324f9d259c6e0fd814ffe11b62d07fb4d2197da3..9d334ed3307f3c4c82bb5300219a4654
         int maxPlayers = this.getMaxPlayers();
         if (this.hidesOnlinePlayers()) {
             return new ServerStatus.Players(maxPlayers, players.size(), List.of());
-@@ -2103,7 +2103,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2111,7 +2111,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
     @Override
     public int getPlayerCount() {
@@ -105,7 +105,7 @@ index 324f9d259c6e0fd814ffe11b62d07fb4d2197da3..9d334ed3307f3c4c82bb5300219a4654
     }
 
     public String[] getPlayerNames() {
-@@ -2307,7 +2307,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2315,7 +2315,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         } else {
             int i = 0;
 
@@ -114,7 +114,7 @@ index 324f9d259c6e0fd814ffe11b62d07fb4d2197da3..9d334ed3307f3c4c82bb5300219a4654
                 serverPlayer.getBukkitEntity().taskScheduler.schedule((ServerPlayer player) -> { // Folia - region threading
                 // Paper start - Expand PlayerGameModeChangeEvent
                 org.bukkit.event.player.PlayerGameModeChangeEvent event = player.setGameMode(gameMode, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.DEFAULT_GAMEMODE, null); // Folia - region threading
-@@ -2492,7 +2492,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2500,7 +2500,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                     if (Thread.currentThread() != this.serverThread) return; // Paper
                     // Paper start - we don't need to save everything, just advancements
                     // this.getPlayerList().saveAll();
@@ -123,7 +123,7 @@ index 324f9d259c6e0fd814ffe11b62d07fb4d2197da3..9d334ed3307f3c4c82bb5300219a4654
                         player.getAdvancements().save();
                     }
                     // Paper end - we don't need to save everything, just advancements
-@@ -2630,7 +2630,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2638,7 +2638,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
             PlayerList playerList = this.getPlayerList();
             UserWhiteList whiteList = playerList.getWhiteList();
 
@@ -133,7 +133,7 @@ index 324f9d259c6e0fd814ffe11b62d07fb4d2197da3..9d334ed3307f3c4c82bb5300219a4654
                     serverPlayer.connection.disconnect(net.kyori.adventure.text.Component.text(org.spigotmc.SpigotConfig.whitelistMessage), org.bukkit.event.player.PlayerKickEvent.Cause.WHITELIST); // Paper - use configurable message & kick event cause
                 }
 diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java
-index cd968c6971d054d9b66a0eaea4753a51ebb75b02..9525d77c379264289db4256e8275378d9cfa9f63 100644
+index 5bf7eb5b906cefa57a1dfcf828ff7872dbceac4f..85923708c32a0597e98e028eeec501f2ea07b63b 100644
 --- a/net/minecraft/server/PlayerAdvancements.java
 +++ b/net/minecraft/server/PlayerAdvancements.java
@@ -167,7 +167,7 @@ public class PlayerAdvancements {
@@ -146,7 +146,7 @@ index cd968c6971d054d9b66a0eaea4753a51ebb75b02..9525d77c379264289db4256e8275378d
         }
         // Leaves end - bot can't get advancement
 diff --git a/net/minecraft/server/ServerScoreboard.java b/net/minecraft/server/ServerScoreboard.java
-index a938ae0f340aaece1fdbe3f6d517809563b1b0f5..e9f2c50c0e87b32627ad16910e1f4a816f4efc5f 100644
+index 04a62e5ab9c0d0b9b7959280b0e0ea3ff388c017..e4260ec1938a43d41e007ad67a2b5be96a00227c 100644
 --- a/net/minecraft/server/ServerScoreboard.java
 +++ b/net/minecraft/server/ServerScoreboard.java
@@ -249,7 +249,7 @@ public class ServerScoreboard extends Scoreboard {
@@ -181,7 +181,7 @@ index e7c778a7f292fd0749cbd5e6586ad1b93ac7f29e..024b56405bb58801b17a6adad7fec7a4
             org.bukkit.entity.Player sender = (org.bukkit.entity.Player) source.getBukkitSender();
             playersTemp = playersTemp.stream().filter((ep) -> sender.canSee(ep.getBukkitEntity())).collect(java.util.stream.Collectors.toList());
 diff --git a/net/minecraft/server/commands/OpCommand.java b/net/minecraft/server/commands/OpCommand.java
-index 3798c1ea92ead20b3b7e67d88d2405f29e324d2c..922383a284c8fb3c183d8a15dc41d813451adfb3 100644
+index 590891d70a71ab30ceae3a3cf1923745e7c20b26..0ede1e5c73a0071e854de70f81ae1fc6a1d6dc59 100644
 --- a/net/minecraft/server/commands/OpCommand.java
 +++ b/net/minecraft/server/commands/OpCommand.java
@@ -25,7 +25,7 @@ public class OpCommand {
@@ -284,10 +284,10 @@ index 5a8cd3e6b448a4472092690cf589bca10b142126..158593b1a6384db635a1f224919b24c1
 
             this.setListData(list);
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index c09af6b81987df8e681689ecce9932a2e39af1a3..b3c593474e889d254f59813e7f42299b7b77d9ce 100644
+index 88efbe2bcb5621432b67366116150a3dab52e510..9345bdb2770e7c27488c547012020337fc651edc 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -2951,7 +2951,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -3000,7 +3000,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
             if (entity instanceof ServerPlayer serverPlayer) {
                 ServerLevel.this.players.add(serverPlayer);
                 // Leaves start - skip
@@ -296,7 +296,7 @@ index c09af6b81987df8e681689ecce9932a2e39af1a3..b3c593474e889d254f59813e7f42299b
                     ServerLevel.this.realPlayers.add(serverPlayer);
                 }
                 // Leaves end - skip
-@@ -3043,7 +3043,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -3086,7 +3086,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
             if (entity instanceof ServerPlayer serverPlayer) {
                 ServerLevel.this.players.remove(serverPlayer);
                 // Leaves start - skip
@@ -306,7 +306,7 @@ index c09af6b81987df8e681689ecce9932a2e39af1a3..b3c593474e889d254f59813e7f42299b
                 }
                 // Leaves end - skip
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index f79735abf21b6eecc02e5b5f1ce3140dfef3ede9..04a600d96f4ae7c08d06dc4fb8f71b3f0eb1be07 100644
+index 8c1e6837b0328c66fdda322c3c7ceba31c4f017f..ca751564d9189e873d4a53be9a2c68b2a04a8624 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
@@ -202,7 +202,7 @@ import org.jspecify.annotations.Nullable;
@@ -318,7 +318,7 @@ index f79735abf21b6eecc02e5b5f1ce3140dfef3ede9..04a600d96f4ae7c08d06dc4fb8f71b3f
     public static final long LAST_SAVE_ABSENT = Long.MIN_VALUE; public long lastSave = LAST_SAVE_ABSENT; // Paper // Folia - threaded regions - changed to nanoTime
     private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_XZ = 32;
     private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
-@@ -673,7 +673,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -669,7 +669,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
         // Paper start - Expand PlayerGameModeChangeEvent
         this.loadGameTypes(input);
     }
@@ -328,7 +328,7 @@ index f79735abf21b6eecc02e5b5f1ce3140dfef3ede9..04a600d96f4ae7c08d06dc4fb8f71b3f
             if (new org.bukkit.event.player.PlayerGameModeChangeEvent(this.getBukkitEntity(), org.bukkit.GameMode.getByValue(this.server.getDefaultGameType().getId()), org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.DEFAULT_GAMEMODE, null).callEvent()) {
                 this.gameMode.setGameModeForPlayer(this.server.getForcedGameType(), GameType.DEFAULT_MODE);
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 98f2ced8e6afdf0074ade94e0bbf5498bd6c505f..4dcb90709200b33fc9155f6dea4281ed32427889 100644
+index 36cd1a0307ff1a734eb5f4f3cc013781692e7ad8..0c3e6c1f70289c63bfe424a49374602f25ff5c0b 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
@@ -130,6 +130,7 @@ public abstract class PlayerList {
@@ -356,7 +356,7 @@ index 98f2ced8e6afdf0074ade94e0bbf5498bd6c505f..4dcb90709200b33fc9155f6dea4281ed
 +
 +        LevelData worlddata = worldserver1.getLevelData();
 +
-+        player.loadGameTypes(null);
+        //player.loadGameTypes(null); // simply fix for https://github.com/MC-XiaoHei/ISeeYou/issues/70
 +        ServerGamePacketListenerImpl playerconnection = new ServerGamePacketListenerImpl(this.server, connection, player, CommonListenerCookie.createInitial(player.gameProfile, false));
 +        GameRules gamerules = worldserver1.getGameRules();
 +        boolean flag = gamerules.get(GameRules.IMMEDIATE_RESPAWN);
@@ -405,7 +405,7 @@ index 98f2ced8e6afdf0074ade94e0bbf5498bd6c505f..4dcb90709200b33fc9155f6dea4281ed
 +        if (fun.bm.lophine.config.modules.function.FakeplayerConfig.enable) {
 +            org.leavesmc.leaves.bot.ServerBot bot = this.server.getBotList().getBotByName(player.getScoreboardName());
 +            if (bot != null) {
-+                this.server.getBotList().removeBot(bot, org.leavesmc.leaves.event.bot.BotRemoveEvent.RemoveReason.INTERNAL, player.getBukkitEntity(), false);
+                this.server.getBotList().removeBot(bot, org.leavesmc.leaves.event.bot.BotRemoveEvent.RemoveReason.INTERNAL, player.getBukkitEntity(), false, false);
 +            }
 +            this.server.getBotList().bots.forEach(bot1 -> {
 +                bot1.sendPlayerInfo(player);
@@ -532,7 +532,7 @@ index 98f2ced8e6afdf0074ade94e0bbf5498bd6c505f..4dcb90709200b33fc9155f6dea4281ed
         this.playersByName.remove(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
         this.server.getCustomBossEvents().onPlayerDisconnect(player);
         UUID uuid = player.getUUID();
-@@ -911,15 +1070,15 @@ public abstract class PlayerList {
+@@ -910,15 +1069,15 @@ public abstract class PlayerList {
     }
 
     public String[] getPlayerNamesArray() {
@@ -553,7 +553,7 @@ index 98f2ced8e6afdf0074ade94e0bbf5498bd6c505f..4dcb90709200b33fc9155f6dea4281ed
         // Leaves end - fakeplayer support
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index f80f5533c1c3c64ee1b8b2c43e2bc2dea8ab567f..aa9cbb5f02b87789fd94521792aefac5c840c95a 100644
+index c0ebd700caa950948c58846eaf164afc14f87f09..e4ae4354e81f34f0db410333fc9b8e17383a5f41 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
@@ -262,7 +262,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Bacteriawa <A3167717663@hotmail.com>
-Date: Sat, 15 Nov 2025 01:06:20 +0800
+Date: Sat, 7 Feb 2026 23:57:50 +0800
 Subject: [PATCH] Leaves: Catch update suppression crash

 Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
@@ -8,7 +8,7 @@ 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/net/minecraft/network/PacketProcessor.java b/net/minecraft/network/PacketProcessor.java
-index e07e5eced7e32d1c3a0ac14e8639c1f19b0f641a..fe7483581e5c3f5cb523601b394750a94a178e10 100644
+index cf162ec136309d05c5aa03042652ab3932935917..469ffd54eb5af980f49061bbec0a72f4e888f8a3 100644
 --- a/net/minecraft/network/PacketProcessor.java
 +++ b/net/minecraft/network/PacketProcessor.java
@@ -107,7 +107,20 @@ public class PacketProcessor implements AutoCloseable {
@@ -46,10 +46,10 @@ index ab80a66646a7ebe2862221ac342b06c14fcfc734..7834f3da4d0ff4a5cdec46b023d73483
             fillCrashReport(reportedException.getReport(), packetListener, packet);
             return reportedException;
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 9d334ed3307f3c4c82bb5300219a465408bf341a..f2f57cfcd7739a951123c81f82cac1c2bbd3a3bd 100644
+index 24f83a6875219aaf4b29e2461afcd0478a391014..9457d86461b032ff2dac338620c3d4a54e6c7071 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1973,8 +1973,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1978,11 +1978,27 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
             try {
                 profiler.startTimer(serverLevel.tickTimerId); try { // Folia - profiler
                 serverLevel.tick(hasTimeLeft, region); // Folia - region threading
@@ -59,19 +59,32 @@ index 9d334ed3307f3c4c82bb5300219a465408bf341a..f2f57cfcd7739a951123c81f82cac1c2
 +                    exception.consume();
                 } finally { profiler.stopTimer(serverLevel.tickTimerId); } // Folia - profiler
             } catch (Throwable var7) {
-+                if (var7.getCause() instanceof org.leavesmc.leaves.util.UpdateSuppressionException exception) {
-+                    exception.provideLevel(serverLevel);
-+                    exception.consume();
+-                CrashReport crashReport = CrashReport.forThrowable(var7, "Exception ticking world");
+-                serverLevel.fillReportDetails(crashReport);
+-                throw new ReportedException(crashReport);
+                org.leavesmc.leaves.util.UpdateSuppressionException updateSuppressionException = null;
+                if (var7 instanceof org.leavesmc.leaves.util.UpdateSuppressionException exception) {
+                    updateSuppressionException = exception;
+                } else if (var7.getCause() instanceof org.leavesmc.leaves.util.UpdateSuppressionException exception) {
+                    updateSuppressionException = exception;
 +                }
-+                // Leaves end - update suppression crash fix
-                 CrashReport crashReport = CrashReport.forThrowable(var7, "Exception ticking world");
-                 serverLevel.fillReportDetails(crashReport);
-                 throw new ReportedException(crashReport);
+                if (updateSuppressionException != null) {
+                    updateSuppressionException.provideLevel(serverLevel);
+                    updateSuppressionException.consume();
+                } else {
+                    // Leaves end - update suppression crash fix
+                    CrashReport crashReport = CrashReport.forThrowable(var7, "Exception ticking world");
+                    serverLevel.fillReportDetails(crashReport);
+                    throw new ReportedException(crashReport);
+                }
+             }
+ 
+             profilerFiller.pop();
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index b3c593474e889d254f59813e7f42299b7b77d9ce..b878f5a8316dfee582180a6bbe7122a78581fae2 100644
+index 9345bdb2770e7c27488c547012020337fc651edc..447b3e6149716a3ca4b9721746ea471c94c56e67 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -878,7 +878,20 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -894,7 +894,20 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
                                     // Kaiiju end
 
                                     profilerFiller.push("tick");
@@ -79,7 +92,7 @@ index b3c593474e889d254f59813e7f42299b7b77d9ce..b878f5a8316dfee582180a6bbe7122a7
 +                                    // Lophine start - update suppression crash fix
 +                                    if (fun.bm.lophine.config.modules.fixes.UpdateSuppressionCrashFixConfig.enabled) {
 +                                        try {
-+                                            this.tickNonPassenger(entity); // Lophine changed
+                                            this.guardEntityTick(this::tickNonPassenger, entity); // Lophine changed
 +                                            // Leaves start - update suppression crash fix - for dragon dupe
 +                                        } catch (org.leavesmc.leaves.util.UpdateSuppressionException exception) {
 +                                            exception.provideLevel(this);
@@ -94,12 +107,12 @@ index b3c593474e889d254f59813e7f42299b7b77d9ce..b878f5a8316dfee582180a6bbe7122a7
                                 }
                             }
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 04a600d96f4ae7c08d06dc4fb8f71b3f0eb1be07..45e4e3243c72b01d94dc440b26230a48b3909367 100644
+index ca751564d9189e873d4a53be9a2c68b2a04a8624..e6ec0788b88d3431c06134c879b4bae9c769dac1 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -1115,6 +1115,12 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
-                 ((org.bukkit.craftbukkit.CraftWorldBorder) this.getBukkitEntity().getWorldBorder()).getHandle().tick();
-             }
+@@ -1108,6 +1108,12 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+ 
+             // Folia - region threading - move to main tick loop where we can detect duplicates
             // CraftBukkit end
 +        // Leaves start - update suppression crash fix
 +        } catch (org.leavesmc.leaves.util.UpdateSuppressionException exception) {
@@ -111,10 +124,10 @@ index 04a600d96f4ae7c08d06dc4fb8f71b3f0eb1be07..45e4e3243c72b01d94dc440b26230a48
             CrashReport crashReport = CrashReport.forThrowable(var4, "Ticking player");
             CrashReportCategory crashReportCategory = crashReport.addCategory("Player being ticked");
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 5bcf646ef600a2aae7633453d3331fde2f141aff..5d5c3694e821954e6ede4d5c3de8844a84f71f45 100644
+index 5ac53fcdca5fa6aae0452840e78d67653ceececb..26de0d418e0dcbb4ecd88630d75c677fdc7ff93d 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -1434,9 +1434,19 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -1427,9 +1427,19 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
                     this.walkingStepSound(pos, state);
                 }
 
@@ -181,7 +194,7 @@ index c020d1944a25e2cd247e30a97c35bf93731d694a..74967f20099ea58cea1f9fc0f2387d8c
     }
 
 diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
-index b2694cb60505766877398fa526b9bfe60e6b6404..7c354894f48a5540eb2554d8b1428306e8929066 100644
+index 77577d0df9b14a7ad55b2866c2ac31863226458b..5551d80a81c2878136f96b3e695c4888c7105a49 100644
 --- a/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/net/minecraft/world/level/chunk/LevelChunk.java
@@ -383,7 +383,7 @@ public class LevelChunk extends ChunkAccess implements DebugValueSource, ca.spot
@@ -5,10 +5,10 @@ Subject: [PATCH] Instant Block Updater


 diff --git a/io/papermc/paper/threadedregions/RegionizedWorldData.java b/io/papermc/paper/threadedregions/RegionizedWorldData.java
-index 56e09b99c2901882483c5f2b3216bf0a11406e2e..1480bd04597001cd7c54e53ded46d7f75908a65a 100644
+index 33d186d660ce3e3dc8cf26cd521fa99291ff78a5..ce1918d12b88835ea79a5c0dc90e0315c408830b 100644
 --- a/io/papermc/paper/threadedregions/RegionizedWorldData.java
 +++ b/io/papermc/paper/threadedregions/RegionizedWorldData.java
-@@ -468,7 +468,7 @@ public final class RegionizedWorldData {
+@@ -494,7 +494,7 @@ public final class RegionizedWorldData {
     public long lastMidTickExecuteFailure;
     // From Level
     public boolean populating;
@@ -17,7 +17,7 @@ index 56e09b99c2901882483c5f2b3216bf0a11406e2e..1480bd04597001cd7c54e53ded46d7f7
     public boolean captureBlockStates = false;
     public boolean captureTreeGeneration = false;
     public final Map<BlockPos, CraftBlockState> capturedBlockStates = new java.util.LinkedHashMap<>(); // Paper
-@@ -527,7 +527,7 @@ public final class RegionizedWorldData {
+@@ -582,7 +582,7 @@ public final class RegionizedWorldData {
         this.world = world;
         this.blockLevelTicks = new LevelTicks<>(world::isPositionTickingWithEntitiesLoaded, world, true);
         this.fluidLevelTicks = new LevelTicks<>(world::isPositionTickingWithEntitiesLoaded, world, false);
@@ -27,10 +27,10 @@ index 56e09b99c2901882483c5f2b3216bf0a11406e2e..1480bd04597001cd7c54e53ded46d7f7
         this.wireHandler = new alternate.current.wire.WireHandler(world);
         this.turbo = new io.papermc.paper.redstone.RedstoneWireTurbo((RedStoneWireBlock)Blocks.REDSTONE_WIRE);
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index b878f5a8316dfee582180a6bbe7122a78581fae2..a906e7a34d048369f9357b0371339b4cccac5f25 100644
+index 447b3e6149716a3ca4b9721746ea471c94c56e67..d8a2f8a1fbf0189e86ccbce70a84641a143cdb91 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -911,12 +911,16 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -927,12 +927,16 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
         // Paper - rewrite chunk system
         profilerFiller.pop();
         profilerFiller.push("debugSynchronizers");
@@ -9,7 +9,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/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java
-index 8d28b29348c255c901375af161210a2041de1985..86f7cfd5816917bd03aca0a796f1eaca938d65aa 100644
+index 3301e521a79adbc6dd76be05e69cce1c97f8697e..8dc1db0e6bafba19e07a7fa78f3920d572d38466 100644
 --- a/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -386,7 +386,18 @@ public class ServerPlayerGameMode {
@@ -553,7 +553,7 @@ index d1dbfc821f068f14bf975842f66251816ea5c985..fe13504a7d2d685e43183dd7b3219f16
     protected void affectNeighborsAfterRemoval(BlockState state, ServerLevel level, BlockPos pos, boolean movedByPiston) {
         if (!movedByPiston) {
 diff --git a/net/minecraft/world/level/block/SculkSensorBlock.java b/net/minecraft/world/level/block/SculkSensorBlock.java
-index 5ef593a61c74af7077d02f4b18d936bf9b2507b9..a94d69927b78089b2e9eb0ee74f693821c3d93fc 100644
+index 80e6ba8f026a6565696f18304507b2d0a347650c..593fab3d2a70bcd6832dd777afa4973f22abbaeb 100644
 --- a/net/minecraft/world/level/block/SculkSensorBlock.java
 +++ b/net/minecraft/world/level/block/SculkSensorBlock.java
@@ -128,6 +128,18 @@ public class SculkSensorBlock extends BaseEntityBlock implements SimpleWaterlogg
@@ -732,7 +732,7 @@ index b369e80a4fc371a3762e34e7d4d180b86d1d190f..0b412e360b090dc85d1726eb8f51c69b
     protected void affectNeighborsAfterRemoval(BlockState state, ServerLevel level, BlockPos pos, boolean movedByPiston) {
         BlockPos blockPos = pos.relative(state.getValue(FACING).getOpposite());
 diff --git a/net/minecraft/world/level/block/state/BlockBehaviour.java b/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 10f9f617123e7ef582707038230f43350d5c5810..d96385dc19b7d6409d65ae37549b6d8f3f955cd2 100644
+index 418517faeaf40ae2f7dea5635e4232cd89db3ead..0de2f6627fb6295d7927ac3e37026f4daf68cfd3 100644
 --- a/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/net/minecraft/world/level/block/state/BlockBehaviour.java
@@ -171,6 +171,15 @@ public abstract class BlockBehaviour implements FeatureElement, org.leavesmc.lea
@@ -765,7 +765,7 @@ index 10f9f617123e7ef582707038230f43350d5c5810..d96385dc19b7d6409d65ae37549b6d8f
             this.getBlock().affectNeighborsAfterRemoval(this.asState(), level, pos, movedByPiston);
         }
 diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
-index 7c354894f48a5540eb2554d8b1428306e8929066..de82e9a7f0cc190f8cf8c66eee9dc178241f6a27 100644
+index 5551d80a81c2878136f96b3e695c4888c7105a49..73dd8e67938fbfff745b189c06a93174976ba1bf 100644
 --- a/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/net/minecraft/world/level/chunk/LevelChunk.java
@@ -406,22 +406,28 @@ public class LevelChunk extends ChunkAccess implements DebugValueSource, ca.spot
@@ -46,7 +46,7 @@ index a5d3caab2072b2c9bf8fdcbdb7c52c2dee16cfaf..4bb36d2965785fadf628a9bfac4fa2aa
                         // CraftBukkit start
                         if (bukkitState != null) {
 diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
-index de82e9a7f0cc190f8cf8c66eee9dc178241f6a27..f5b128a993fab7af71a098b2128537ac749edc2f 100644
+index 73dd8e67938fbfff745b189c06a93174976ba1bf..8e56c2237f9d49d0b09b62c0933283f77aaae679 100644
 --- a/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/net/minecraft/world/level/chunk/LevelChunk.java
@@ -1001,12 +1001,14 @@ public class LevelChunk extends ChunkAccess implements DebugValueSource, ca.spot
@@ -5,11 +5,11 @@ Subject: [PATCH] Global Entities Counter


 diff --git a/io/papermc/paper/threadedregions/RegionizedWorldData.java b/io/papermc/paper/threadedregions/RegionizedWorldData.java
-index 1480bd04597001cd7c54e53ded46d7f75908a65a..c49be29a91422bea393f0acd6daa6ef948bd77ec 100644
+index ce1918d12b88835ea79a5c0dc90e0315c408830b..c5caad99caed20e2bb4475fcf057417ee27d737c 100644
 --- a/io/papermc/paper/threadedregions/RegionizedWorldData.java
 +++ b/io/papermc/paper/threadedregions/RegionizedWorldData.java
-@@ -521,6 +521,9 @@ public final class RegionizedWorldData {
-     public final Map<Long, ChunkSectionItemEntityMovementTracker> itemEntityMovementTrackerMap = new it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap<>();
+@@ -576,6 +576,9 @@ public final class RegionizedWorldData {
+     }
     // Luminol end
 
 +    public int uniqueId = -1; // Lophine - Global Entities Counter
@@ -18,7 +18,7 @@ index 1480bd04597001cd7c54e53ded46d7f75908a65a..c49be29a91422bea393f0acd6daa6ef9
     public final TickRegions.TickRegionData regionData;
 
     public RegionizedWorldData(final ServerLevel world, final TickRegions.TickRegionData regionData) {
-@@ -533,6 +536,15 @@ public final class RegionizedWorldData {
+@@ -588,6 +591,15 @@ public final class RegionizedWorldData {
         this.turbo = new io.papermc.paper.redstone.RedstoneWireTurbo((RedStoneWireBlock)Blocks.REDSTONE_WIRE);
         this.regionData = regionData;
 
@@ -97,10 +97,10 @@ index f4c9c551fc39bae38e283ccbbc3cd116f0536a64..db13211b24208d8addd3c210155bc244
                 NaturalSpawner.spawnForChunk(this.level, chunk, spawnState, spawnCategories);
             }
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index a906e7a34d048369f9357b0371339b4cccac5f25..b5be74243607fb34812dcbad26aad76e44bf0b19 100644
+index d8a2f8a1fbf0189e86ccbce70a84641a143cdb91..76930a603a5bf07e62e8ef3a41bbb5213dcc8aea 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -763,6 +763,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -765,6 +765,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
     }
 
     public void tick(BooleanSupplier hasTimeLeft, io.papermc.paper.threadedregions.TickRegions.TickRegionData region) { // Folia - regionised ticking
@@ -112,6 +112,55 @@ index a906e7a34d048369f9357b0371339b4cccac5f25..b5be74243607fb34812dcbad26aad76e
         final io.papermc.paper.threadedregions.RegionizedWorldData regionizedWorldData = this.getCurrentWorldData(); // Folia - regionised ticking
         final ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle profiler = io.papermc.paper.threadedregions.TickRegionScheduler.getProfiler(); // Folia - profiler
         ProfilerFiller profilerFiller = Profiler.get();
+diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
+index c6985d2a9d1093943d754d77089bd4c3d5baf3ee..a8807f80f1b11d7f5dae3b96a0e215e3e105fdd0 100644
+--- a/net/minecraft/world/entity/Mob.java
+++ b/net/minecraft/world/entity/Mob.java
+@@ -806,6 +806,44 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+                 }
+             }
+         } else {
+            // Lophine start - fix some bug if player is cross scheduler >> to remove monster if the region don't have any valid player
+            if (fun.bm.lophine.config.modules.experiment.GlobalEntitiesCounter.enabled) {
+                List<net.minecraft.server.level.ServerPlayer> playerList = this.level().getServer().getPlayerList().getPlayers();
+                if (!playerList.isEmpty()) {
+                    double d = -1.0;
+                    Vec3 vec3 = null;
+                    for (net.minecraft.server.level.ServerPlayer player1 : playerList) {
+                        if (player1.level() != this.level()) continue;
+                        double d1 = player1.distanceToSqr(this.position());
+                        if (d == -1.0 || d1 < d) {
+                            d = d1;
+                            vec3 = player1.position();
+                        }
+                    }
+                    if (vec3 != null) {
+                        // copy from PaperMC
+                        // Paper start - Configurable despawn distances
+                        final io.papermc.paper.configuration.WorldConfiguration.Entities.Spawning.DespawnRangePair despawnRangePair = this.level().paperConfig().entities.spawning.despawnRanges.get(this.getType().getCategory());
+                        final io.papermc.paper.configuration.type.DespawnRange.Shape shape = this.level().paperConfig().entities.spawning.despawnRangeShape;
+                        final double dy = Math.abs(vec3.y - this.getY());
+                        final double dySqr = Mth.square(dy);
+                        final double dxSqr = Mth.square(vec3.x - this.getX());
+                        final double dzSqr = Mth.square(vec3.z - this.getZ());
+                        final double distanceSquared = dxSqr + dzSqr + dySqr;
+                        // Despawn if hard/soft limit is exceeded
+                        if (despawnRangePair.hard().shouldDespawn(shape, dxSqr, dySqr, dzSqr, dy) && this.removeWhenFarAway(distanceSquared)) {
+                            this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+                        }
+
+                        if (despawnRangePair.soft().shouldDespawn(shape, dxSqr, dySqr, dzSqr, dy)) {
+                            if (this.noActionTime > 600 && this.random.nextInt(800) == 0 && this.removeWhenFarAway(distanceSquared)) {
+                                this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+                            }
+                        }
+                    }
+                }
+            }
+            // Lophine end
+             this.noActionTime = 0;
+         }
+     }
 diff --git a/net/minecraft/world/level/NaturalSpawner.java b/net/minecraft/world/level/NaturalSpawner.java
 index 91f0fbd75bc93355dc872390d91af83c76dc1dce..e7223540a7cef20b661bdb857ffba962d0f5d348 100644
 --- a/net/minecraft/world/level/NaturalSpawner.java
@@ -6,10 +6,10 @@ Subject: [PATCH] Add null check in RegionizedWorldData >> conections
 some of our function patches will crash because of get null in conn.getPlayer(), then when we process player.chunkPosition() will get NPE, so we need to fix it.

 diff --git a/io/papermc/paper/threadedregions/RegionizedWorldData.java b/io/papermc/paper/threadedregions/RegionizedWorldData.java
-index c49be29a91422bea393f0acd6daa6ef948bd77ec..9b25483472a606168e6860e0a96f05b78d3e5b02 100644
+index c5caad99caed20e2bb4475fcf057417ee27d737c..c2e50a03a41958d9b44753adc9a9bf4ea1fb24a4 100644
 --- a/io/papermc/paper/threadedregions/RegionizedWorldData.java
 +++ b/io/papermc/paper/threadedregions/RegionizedWorldData.java
-@@ -229,14 +229,17 @@ public final class RegionizedWorldData {
+@@ -251,14 +251,17 @@ public final class RegionizedWorldData {
                 regionToData.get(CoordinateUtils.getChunkKey(pos.x >> chunkToRegionShift, pos.z >> chunkToRegionShift)).itemEntityMovementTrackerMap.put(key, tracker);
             }
             // Luminol end
@@ -27,7 +27,7 @@ index c49be29a91422bea393f0acd6daa6ef948bd77ec..9b25483472a606168e6860e0a96f05b7
             }
             // entities
             for (final ServerPlayer player : from.localPlayers) {
-@@ -247,6 +250,13 @@ public final class RegionizedWorldData {
+@@ -269,6 +272,13 @@ public final class RegionizedWorldData {
                 into.localPlayers.add(player);
                 player.getBukkitEntity().updateRegion(into);
                 into.nearbyPlayers.addPlayer(player);
@@ -41,7 +41,7 @@ index c49be29a91422bea393f0acd6daa6ef948bd77ec..9b25483472a606168e6860e0a96f05b7
             }
             for (final Entity entity : from.allEntities) {
                 final ChunkPos pos = entity.chunkPosition();
-@@ -581,6 +591,7 @@ public final class RegionizedWorldData {
+@@ -636,6 +646,7 @@ public final class RegionizedWorldData {
     private static void cleanUpConnection(final Connection conn) {
         // note: ALL connections HERE have a player
         final ServerPlayer player = conn.getPlayer();
@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Tue, 13 Jan 2026 21:04:59 +0800
+Subject: [PATCH] Add removed check before all checks start in addEffect
+
+
+diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
+index e4ae4354e81f34f0db410333fc9b8e17383a5f41..fc8833655102ca98bb331782a624af79cbef414f 100644
+--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
+@@ -1186,6 +1186,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+     public boolean addEffect(MobEffectInstance effectInstance, @Nullable Entity entity, EntityPotionEffectEvent.Cause cause, boolean fireEvent) {
+         // Paper end - Don't fire sync event during generation
+         // org.spigotmc.AsyncCatcher.catchOp("effect add"); // Spigot // Paper - move to API
+        if (this.isRemoved()) return false; // Lophine - shouldn't be possible to add effects to removed entity
+         if (!this.hasNullCallback()) ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this, "Cannot add effects to entities asynchronously"); // Folia - region threading
+         if (this.isTickingEffects) {
+             this.effectsToProcess.add(new ProcessableEffect(effectInstance, cause));
@@ -0,0 +1,148 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Sun, 8 Mar 2026 23:56:06 +0800
+Subject: [PATCH] Leaves: Creative fly no clip
+
+Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
+As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/da12a58e8d3bd3cd13b52a60676d5a1e03acd30a/leaves-server/minecraft-patches/features/0049-Creative-fly-no-clip.patch)
+Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+
+diff --git a/net/minecraft/world/entity/ExperienceOrb.java b/net/minecraft/world/entity/ExperienceOrb.java
+index f2ec0bd8cca3c08d558790537e17a8a2f95f1953..29d904b02a2c7b3d25261ca26c7c0479b00999ef 100644
+--- a/net/minecraft/world/entity/ExperienceOrb.java
+++ b/net/minecraft/world/entity/ExperienceOrb.java
+@@ -199,7 +199,7 @@ public class ExperienceOrb extends Entity {
+         Player prevTarget = this.followingPlayer; // CraftBukkit - store old target
+         if (this.followingPlayer == null || this.followingPlayer.isSpectator() || this.followingPlayer.distanceToSqr(this) > 64.0) {
+             Player nearestPlayer = this.level().getNearestPlayer(this, 8.0);
+-            if (nearestPlayer != null && !nearestPlayer.isSpectator() && !nearestPlayer.isDeadOrDying()) {
+            if (nearestPlayer != null && !nearestPlayer.isCreativeFlyOrSpectator() && !nearestPlayer.isDeadOrDying()) { // Leaves - creative no clip
+                 this.followingPlayer = nearestPlayer;
+             } else {
+                 this.followingPlayer = null;
+diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
+index 29ca31b05ec5636243b13fee8b3399d5e21808b4..8966953ee80a1527c9c4cc4d0a7a3bdb2197a2da 100644
+--- a/net/minecraft/world/entity/player/Player.java
+++ b/net/minecraft/world/entity/player/Player.java
+@@ -285,8 +285,8 @@ public abstract class Player extends Avatar implements ContainerUser {
+         if (this.cullTask != null) this.cullTask.requestCullSignal(); // Luminol - Ray tracing entity tracker
+         // Luminol end
+ 
+-        this.noPhysics = this.isSpectator();
+-        if (this.isSpectator() || this.isPassenger()) {
+        this.noPhysics = this.isCreativeFlyOrSpectator(); // Leaves - creative no clip
+        if (this.isCreativeFlyOrSpectator() || this.isPassenger()) { // Leaves - creative no clip
+             this.setOnGround(false);
+         }
+ 
+@@ -415,7 +415,7 @@ public abstract class Player extends Avatar implements ContainerUser {
+         if (this.canPlayerFitWithinBlocksAndEntitiesWhen(Pose.SWIMMING)) {
+             Pose desiredPose = this.getDesiredPose();
+             Pose pose;
+-            if (this.isSpectator() || this.isPassenger() || this.canPlayerFitWithinBlocksAndEntitiesWhen(desiredPose)) {
+            if (this.isCreativeFlyOrSpectator() || this.isPassenger() || this.canPlayerFitWithinBlocksAndEntitiesWhen(desiredPose)) { // Leaves - creative no clip
+                 pose = desiredPose;
+             } else if (this.canPlayerFitWithinBlocksAndEntitiesWhen(Pose.CROUCHING)) {
+                 pose = Pose.CROUCHING;
+@@ -544,7 +544,7 @@ public abstract class Player extends Avatar implements ContainerUser {
+         this.updateSwingTime();
+         this.yHeadRot = this.getYRot();
+         this.setSpeed((float)this.getAttributeValue(Attributes.MOVEMENT_SPEED));
+-        if (this.getHealth() > 0.0F && !this.isSpectator()) {
+        if (this.getHealth() > 0.0F && !this.isCreativeFlyOrSpectator()) { // Leaves - creative no clip
+             AABB aabb;
+             if (this.isPassenger() && !this.getVehicle().isRemoved()) {
+                 aabb = this.getBoundingBox().minmax(this.getVehicle().getBoundingBox()).inflate(1.0, 0.0, 1.0);
+@@ -1877,9 +1877,29 @@ public abstract class Player extends Avatar implements ContainerUser {
+         return this.gameMode() == GameType.SPECTATOR;
+     }
+ 
+    // Leaves start - creative no clip
+    public boolean isCreativeFlyOrSpectator() {
+        return isSpectator() || (fun.bm.lophine.config.modules.function.CreativeFlyNoClipConfig.enabled && isCreative() && getAbilities().flying);
+    }
+
+    public boolean canSpectatingPlace(net.minecraft.world.level.LevelReader world, BlockState state, BlockPos pos, net.minecraft.world.phys.shapes.CollisionContext context) {
+        if (this.isCreativeFlyOrSpectator()) {
+            net.minecraft.world.phys.shapes.VoxelShape voxelShape = state.getCollisionShape(world, pos, context);
+            return voxelShape.isEmpty() || world.isUnobstructed(this, voxelShape.move(pos.getX(), pos.getY(), pos.getZ()));
+        } else {
+            return world.isUnobstructed(state, pos, context);
+        }
+    }
+
+    @Override
+    public boolean isCollidable(boolean ignoreClimbing) {
+        return !isCreativeFlyOrSpectator() && super.isCollidable(ignoreClimbing);
+    }
+    // Leaves end - creative no clip
+
+     @Override
+     public boolean canBeHitByProjectile() {
+-        return !this.isSpectator() && super.canBeHitByProjectile();
+        return !this.isCreativeFlyOrSpectator() && super.canBeHitByProjectile(); // Leaves - creative no clip
+     }
+ 
+     @Override
+diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java
+index 4bb36d2965785fadf628a9bfac4fa2aa305aaf65..44786e4f77285f1fbd4643f560105e410035afeb 100644
+--- a/net/minecraft/world/item/BlockItem.java
+++ b/net/minecraft/world/item/BlockItem.java
+@@ -170,8 +170,9 @@ public class BlockItem extends Item {
+     protected boolean canPlace(BlockPlaceContext context, BlockState state) {
+         Player player = context.getPlayer();
+         // CraftBukkit start
+        CollisionContext collisionContext = player == null ? CollisionContext.empty() : CollisionContext.placementContext(player);
+         Level world = context.getLevel(); // Paper - Cancel hit for vanished players
+-        boolean canBuild = (!this.mustSurvive() || state.canSurvive(world, context.getClickedPos())) && world.checkEntityCollision(state, player, CollisionContext.placementContext(player), context.getClickedPos(), true); // Paper - Cancel hit for vanished players
+        boolean canBuild = (!this.mustSurvive() || state.canSurvive(world, context.getClickedPos())) && ((fun.bm.lophine.config.modules.function.CreativeFlyNoClipConfig.enabled && context.getPlayer() != null) ? context.getPlayer().canSpectatingPlace(world, state, context.getClickedPos(), collisionContext) : world.checkEntityCollision(state, player, collisionContext, context.getClickedPos(), true)); // Paper - Cancel hit for vanished players // Leaves - creative no clip
+         org.bukkit.entity.Player bukkitPlayer = (context.getPlayer() instanceof ServerPlayer) ? (org.bukkit.entity.Player) context.getPlayer().getBukkitEntity() : null;
+ 
+         org.bukkit.event.block.BlockCanBuildEvent event = new org.bukkit.event.block.BlockCanBuildEvent(
+diff --git a/net/minecraft/world/item/StandingAndWallBlockItem.java b/net/minecraft/world/item/StandingAndWallBlockItem.java
+index be685383b8e7c8111e976fc560f16d43d6545a34..6a2219b45eae0ff6fc48de9a6e6cabf2ec60cb07 100644
+--- a/net/minecraft/world/item/StandingAndWallBlockItem.java
+++ b/net/minecraft/world/item/StandingAndWallBlockItem.java
+@@ -44,7 +44,7 @@ public class StandingAndWallBlockItem extends BlockItem {
+         // return blockState != null && level.isUnobstructed(blockState, clickedPos, CollisionContext.empty()) ? blockState : null;
+         // CraftBukkit start
+         if (blockState != null) {
+-            boolean defaultReturn = level.isUnobstructed(blockState, clickedPos, CollisionContext.empty());
+            boolean defaultReturn = (fun.bm.lophine.config.modules.function.CreativeFlyNoClipConfig.enabled && context.getPlayer() != null) ? context.getPlayer().canSpectatingPlace(level, blockState, clickedPos, CollisionContext.empty()) : level.isUnobstructed(blockState, clickedPos, CollisionContext.empty()); // Leaves - creative no clip
+             org.bukkit.entity.Player player = (context.getPlayer() instanceof net.minecraft.server.level.ServerPlayer serverPlayer) ? serverPlayer.getBukkitEntity() : null;
+ 
+             org.bukkit.event.block.BlockCanBuildEvent event = new org.bukkit.event.block.BlockCanBuildEvent(org.bukkit.craftbukkit.block.CraftBlock.at(context.getLevel(), clickedPos), player, org.bukkit.craftbukkit.block.data.CraftBlockData.fromData(blockState), defaultReturn, org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(context.getHand())); // Paper - Expose hand in BlockCanBuildEvent
+diff --git a/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java b/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
+index 17110035f4b0f144c29b8ff8bf7d0d39efc8103a..1b7f0bfa66e632678164ac64e03855e75bab1305 100644
+--- a/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
+@@ -153,7 +153,7 @@ public class ShulkerBoxBlockEntity extends RandomizableContainerBlockEntity impl
+             List<Entity> entities = level.getEntities(null, progressDeltaAabb);
+             if (!entities.isEmpty()) {
+                 for (Entity entity : entities) {
+-                    if (entity.getPistonPushReaction() != PushReaction.IGNORE) {
+                    if (entity.getPistonPushReaction() != PushReaction.IGNORE && !(entity instanceof net.minecraft.world.entity.player.Player player && player.isCreativeFlyOrSpectator())) { // Leaves - creative no clip
+                         entity.move(
+                             MoverType.SHULKER_BOX,
+                             new Vec3(
+diff --git a/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
+index 1d60054146f970ec24054d2c76a27e2d8620ec67..a5469971734a3f4f08d676426821fbf059c526dc 100644
+--- a/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
+++ b/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
+@@ -161,7 +161,7 @@ public class PistonMovingBlockEntity extends BlockEntity {
+                                         d3 = movementDirection.getStepZ();
+                                 }
+ 
+-                                entity.setDeltaMovement(d1, d2, d3);
+                                if (!(entity instanceof net.minecraft.world.entity.player.Player player) || !player.isCreativeFlyOrSpectator()) entity.setDeltaMovement(d1, d2, d3); // Leaves - creative no clip
+                                 // Paper - EAR items stuck in slime pushed by a piston
+                                 entity.activatedTick = Math.max(entity.activatedTick, io.papermc.paper.threadedregions.RegionizedServer.getCurrentTick() + 10); // Folia - region threading
+                                 entity.activatedImmunityTick = Math.max(entity.activatedImmunityTick, io.papermc.paper.threadedregions.RegionizedServer.getCurrentTick() + 10); // Folia - region threading
+@@ -197,6 +197,7 @@ public class PistonMovingBlockEntity extends BlockEntity {
+     }
+ 
+     private static void moveEntityByPiston(Direction noClipDirection, Entity entity, double progress, Direction direction) {
+        if (entity instanceof net.minecraft.world.entity.player.Player player && player.isCreativeFlyOrSpectator()) return; // Leaves - creative no clip
+         NOCLIP.set(noClipDirection);
+         Vec3 vec3 = entity.position();
+         entity.move(MoverType.PISTON, new Vec3(progress * direction.getStepX(), progress * direction.getStepY(), progress * direction.getStepZ()));
@@ -35,27 +35,20 @@ index fcdfd4f6de5e1c2d5e80c7f3d8cb0b33a62d257d..6eaa4e9bd1ecbfa531313ce1f470d55e
                 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                     Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 22125dbe1765f930fe10fe420be1c275ec553139..d5b070d1a3d84e228960dacd614e0f1abe968e79 100644
+index a5f2e4454258886536251288c3694f58386c7420..28371ecf31d5fc280aaa03ed9a86f5b565cf32f6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -35,7 +35,7 @@ public class PaperVersionFetcher implements VersionFetcher {
-     private static final Logger LOGGER = LogUtils.getClassLogger();
+@@ -40,8 +40,8 @@ public class PaperVersionFetcher implements VersionFetcher {
+     private static final ComponentLogger COMPONENT_LOGGER = ComponentLogger.logger(LogManager.getRootLogger().getName());
     private static final int DISTANCE_ERROR = -1;
     private static final int DISTANCE_UNKNOWN = -2;
-    private static final String DOWNLOAD_PAGE = "https://github.com/LuminolMC/Luminol"; //Luminol
-+    private static final String DOWNLOAD_PAGE = "https://github.com/LuminolMC/Lophine"; //Luminol // Lophine
- 
-     @Override
-     public long getCacheTime() {
-@@ -49,7 +49,7 @@ public class PaperVersionFetcher implements VersionFetcher {
-         if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) {
-             updateMessage = text("You are running a development version without access to version information", color(0xFF5300));
-         } else {
-            updateMessage = getUpdateStatusMessage("LuminolMC/Luminol", build); // Folia // Luminol
-+            updateMessage = getUpdateStatusMessage("LuminolMC/Lophine", build); // Folia // Luminol // Lophine
-         }
-         final @Nullable Component history = this.getHistory();
- 
+-    private static final String DOWNLOAD_PAGE = "https://github.com/LuminolMC/Luminol"; // Luminol
+-    private static final String REPOSITORY = "LuminolMC/Luminol"; // Luminol
+    private static final String DOWNLOAD_PAGE = "https://github.com/LuminolMC/Lophine"; // Luminol // Lophine
+    private static final String REPOSITORY = "LuminolMC/Lophine"; // Luminol // Lophine
+     private static final ServerBuildInfo BUILD_INFO = ServerBuildInfo.buildInfo();
+     private static final String USER_AGENT = BUILD_INFO.brandName() + "/" + BUILD_INFO.asString(VERSION_SIMPLE) + " (https://papermc.io)";
+     private static final Gson GSON = new Gson();
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
 index 4ada790812957657d580cb748077c4961987d0cb..3a539df860305e777e85ed6dc72b5effe76734b4 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
@@ -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 92de192c7b420ebb4510354f347003127595e141..e28c7043c04a4df34733b9bfc5fd55ee6082d010 100644
+index 507204301b5e3cd545e66c510842c0a6391f0241..dfcfc83474443638e30f87d54472e5a38947dfad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -485,6 +485,7 @@ public final class CraftServer implements Server {
@@ -53,7 +53,7 @@ index 21d594a39d09b2d17f05c40ce5323d57949d0b0b..46859fc70795097366f02dba48fdaab8
         if (nmsEntity.level() != this.getHandle().getLevel()) {
             throw new IllegalArgumentException(entity + " wasn't created with this world, you must create the entity with the world you want to add it to.");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 73e470e0c318568c2f2e82de4f8e170857a20c9a..401f977483b6e809b9b10c601900e35110ae7396 100644
+index dfcfc83474443638e30f87d54472e5a38947dfad..973f064fc5e089dc892d4b4077a807517fd199b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -305,6 +305,7 @@ public final class CraftServer implements Server {
@@ -96,10 +96,10 @@ index 73e470e0c318568c2f2e82de4f8e170857a20c9a..401f977483b6e809b9b10c601900e351
     /**
      * Gets the TPS from the region which owns the specified location, or {@code null} if no region owns
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 99ac14e749e6b0f64088df48a984520be724adab..d959e1ac33c62f9ab16c359a2e4601150196cf88 100644
+index dcd32c1e32fd67ec13bb7fca8af20aa665407594..b7f83e66227b5a1f5ad9b424e425eee118cc0692 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -249,7 +249,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -247,7 +247,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
 
     @Override
     public int getPlayerCount() {
@@ -108,7 +108,7 @@ index 99ac14e749e6b0f64088df48a984520be724adab..d959e1ac33c62f9ab16c359a2e460115
     }
 
     @Override
-@@ -1124,9 +1124,9 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1121,9 +1121,9 @@ public class CraftWorld extends CraftRegionAccessor implements World {
 
     @Override
     public List<Player> getPlayers() {
@@ -120,7 +120,7 @@ index 99ac14e749e6b0f64088df48a984520be724adab..d959e1ac33c62f9ab16c359a2e460115
             HumanEntity bukkitEntity = human.getBukkitEntity();
 
             if ((bukkitEntity != null) && (bukkitEntity instanceof Player)) {
-@@ -1628,7 +1628,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1622,7 +1622,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
     public void playSound(final net.kyori.adventure.sound.Sound sound) {
         org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper
         final long seed = sound.seed().orElseGet(this.world.getRandom()::nextLong);
@@ -129,7 +129,7 @@ index 99ac14e749e6b0f64088df48a984520be724adab..d959e1ac33c62f9ab16c359a2e460115
             player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player.getX(), player.getY(), player.getZ(), seed, null));
         }
     }
-@@ -1656,7 +1656,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1650,7 +1650,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
         org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper
         final long seed = sound.seed().orElseGet(this.getHandle().getRandom()::nextLong);
         if (emitter == net.kyori.adventure.sound.Sound.Emitter.self()) {
@@ -138,7 +138,7 @@ index 99ac14e749e6b0f64088df48a984520be724adab..d959e1ac33c62f9ab16c359a2e460115
                 player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player, seed, null));
             }
         } else if (emitter instanceof CraftEntity craftEntity) {
-@@ -1797,7 +1797,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1791,7 +1791,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
             Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
         }
         this.getHandle().sendParticlesSource(
@@ -161,7 +161,7 @@ index e6cd1c4a50b32b74f70a264e869b1ab4ac9b9eb0..6867064de52d810f1fd3869463ae2786
         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 3d465c857b3560a2cd57825c9cbd0a3c9029e6d3..a41b5eeb1e82725948c448c7c3c4f5b2d1e06af6 100644
+index 0429ffda4aa4410f6f53bd163be8dee71b134637..9274f4ef639ed9b3028321566173d6612663082b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1014,7 +1014,11 @@ public class CraftEventFactory {
@@ -21,7 +21,7 @@ index e1f456b31ffda9370b63e51f343847d6f9f62263..8a0f85241cc1530aacccc8b6ea24b9de
         }
         // Leaves end - skip bot
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 401f977483b6e809b9b10c601900e35110ae7396..030a9cf9a95fcea1410e825df76f817f73d4db78 100644
+index 973f064fc5e089dc892d4b4077a807517fd199b5..06766a9058595aeee25e8fd3e3d01aeec2a55116 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -306,6 +306,7 @@ public final class CraftServer implements Server {
@@ -66,10 +66,10 @@ index 6867064de52d810f1fd3869463ae27868ed0fb07..69a0de762cfde089e8aaa6e6be79a8c8
         // Special case complex part, since there is no extra entity type for them
         if (entity instanceof EnderDragonPart complexPart) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a8838e45dd7d44c25442c14d49b53583f9f2a2d2..effb56daac89b7cc3106ed4b394a6c583b654735 100644
+index 6e745c7ddf417ec2fdcf102edd6a592047b5f73e..2f59107642d43719159872d5df37107d8a1a5b97 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2091,7 +2091,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
+@@ -2085,7 +2085,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
 
     @Override
     public boolean canSee(Player player) {
@@ -79,10 +79,10 @@ index a8838e45dd7d44c25442c14d49b53583f9f2a2d2..effb56daac89b7cc3106ed4b394a6c58
 
     @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index dcec69554213bfb8608b77341819b09e31a96e09..5dce7416f42902de34bff6398cf402c610be600c 100644
+index 6f608ad5d1151925ad0f38596dfe15290d20d753..9c1a48dd4a8957200d8c05cf7e142c621132bb74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -338,7 +338,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -344,7 +344,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
                     Bukkit.getLogger().log(Level.SEVERE, "Error saving advancement " + key, ex);
                 }
 
@@ -4,5 +4,5 @@ import com.mojang.logging.LogUtils;
 import org.slf4j.Logger;

 public class LophineLogger {
-    public static final Logger LOGGER = LogUtils.getClassLogger(); // only provided for some Logger can not be initialized
+    public static final Logger LOGGER = LogUtils.getLogger();
 }
@@ -0,0 +1,42 @@
+package fun.bm.lophine.carpet;
+
+import fun.bm.lophine.carpet.config.modules.GeneralCompatConfig;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.objecthunter.exp4j.ExpressionBuilder;
+
+import java.math.BigDecimal;
+
+public final class CarpetCalculatorCompatHelper {
+
+    public static boolean handleChat(ServerPlayer player, String rawMessage) {
+        if (!GeneralCompatConfig.simpleInGameCalculator || !rawMessage.startsWith("=")) {
+            return false;
+        }
+
+        String expression = rawMessage.substring(1).trim();
+        if (expression.isEmpty()) {
+            return false;
+        }
+
+        Component response;
+        try {
+            double result = new ExpressionBuilder(expression).build().evaluate();
+            response = Component.literal(expression + " = " + formatNumber(result)).withStyle(ChatFormatting.YELLOW);
+        } catch (RuntimeException exception) {
+            response = Component.literal("Calculator error: " + exception.getMessage()).withStyle(ChatFormatting.RED);
+        }
+
+        Component scheduledResponse = response;
+        player.getBukkitEntity().taskScheduler.schedule((ServerPlayer scheduledPlayer) -> scheduledPlayer.sendSystemMessage(scheduledResponse), null, 1L);
+        return true;
+    }
+
+    private static String formatNumber(double value) {
+        if (Double.isFinite(value) && Math.rint(value) == value && value >= Long.MIN_VALUE && value <= Long.MAX_VALUE) {
+            return Long.toString((long) value);
+        }
+        return BigDecimal.valueOf(value).stripTrailingZeros().toPlainString();
+    }
+}
@@ -0,0 +1,138 @@
+package fun.bm.lophine.carpet;
+
+import fun.bm.lophine.carpet.config.modules.CoreConfig;
+import fun.bm.lophine.carpet.config.modules.CounterCompatConfig;
+import fun.bm.lophine.carpet.config.modules.FakePlayerCompatConfig;
+import fun.bm.lophine.carpet.config.modules.GeneralCompatConfig;
+import fun.bm.lophine.config.modules.experiment.CommandConfig;
+import fun.bm.lophine.config.modules.experiment.RedStoneConfig;
+import fun.bm.lophine.config.modules.fixes.UpdateSuppressionCrashFixConfig;
+import fun.bm.lophine.config.modules.function.CreativeFlyNoClipConfig;
+import fun.bm.lophine.config.modules.function.FakeplayerConfig;
+import fun.bm.lophine.config.modules.function.LanguageConfig;
+import fun.bm.lophine.config.modules.function.WoolHopperCounterConfig;
+import fun.bm.lophine.protocol.CarpetLoggerProtocol;
+import me.earthme.luminol.config.modules.optimizations.OptimizedDragonRespawnConfig;
+import org.leavesmc.leaves.bot.ServerBot;
+import org.leavesmc.leaves.protocol.CarpetServerProtocol;
+
+import java.util.List;
+
+// WARNING: THIS FILE NEED TO FULLY REWRITTEN
+public final class CarpetCompatSync {
+    private static boolean init = false;
+
+    public static void apply() {
+        if (init) return;
+        if (CoreConfig.enabled) {
+            applyGeneralRules();
+            applyFakePlayerRules();
+            applyCounterRules();
+        }
+        CarpetLoggerProtocol.refreshConfiguredDefaults(!init);
+        registerProtocolRules();
+        init = true;
+    }
+
+    private static void applyGeneralRules() {
+        LanguageConfig.lang = GeneralCompatConfig.language;
+        UpdateSuppressionCrashFixConfig.enabled = GeneralCompatConfig.amsUpdateSuppressionCrashFix || GeneralCompatConfig.yeetUpdateSuppressionCrash;
+        RedStoneConfig.redstoneIgnoreUpwardsUpdate = GeneralCompatConfig.dustTrapdoorReintroduced;
+        RedStoneConfig.cce = GeneralCompatConfig.shulkerBoxCCEReintroduced;
+        RedStoneConfig.instantBlockUpdater = GeneralCompatConfig.instantBlockUpdaterReintroduced;
+        CommandConfig.tick = GeneralCompatConfig.commandTick;
+        CreativeFlyNoClipConfig.enabled = GeneralCompatConfig.creativeNoClip;
+        OptimizedDragonRespawnConfig.optimizedRespawn = GeneralCompatConfig.optimizedDragonRespawn;
+    }
+
+    private static void applyFakePlayerRules() {
+        FakeplayerConfig.enable = FakePlayerCompatConfig.commandBot || FakePlayerCompatConfig.commandPlayer;
+        FakeplayerConfig.canResident = FakePlayerCompatConfig.fakePlayerResident;
+        FakeplayerConfig.canOpenInventory = FakePlayerCompatConfig.openFakePlayerInventory;
+        FakeplayerConfig.tickType = FakePlayerCompatConfig.fakePlayerTicksLikeRealPlayer
+                ? ServerBot.TickType.NETWORK
+                : ServerBot.TickType.ENTITY_LIST;
+    }
+
+    private static void applyCounterRules() {
+        WoolHopperCounterConfig.enabled = CounterCompatConfig.hopperCounters;
+        WoolHopperCounterConfig.unlimitedSpeed = CounterCompatConfig.hopperCountersUnlimitedSpeed;
+    }
+
+    private static List<String> sanitizeDefaultLoggers(List<String> configuredLoggers) {
+        return configuredLoggers == null ? List.of() : List.copyOf(configuredLoggers);
+    }
+
+    private static void registerProtocolRules() {
+        CarpetServerProtocol.CarpetRules.clear();
+
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "language", GeneralCompatConfig.language));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpetamsaddition", "amsUpdateSuppressionCrashFix", GeneralCompatConfig.amsUpdateSuppressionCrashFix));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "yeetUpdateSuppressionCrash", GeneralCompatConfig.yeetUpdateSuppressionCrash));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "dustTrapdoorReintroduced", GeneralCompatConfig.dustTrapdoorReintroduced));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "shulkerBoxCCEReintroduced", GeneralCompatConfig.shulkerBoxCCEReintroduced));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "instantBlockUpdaterReintroduced", GeneralCompatConfig.instantBlockUpdaterReintroduced));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "commandTick", GeneralCompatConfig.commandTick));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "creativeNoClip", GeneralCompatConfig.creativeNoClip));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "optimizedDragonRespawn", GeneralCompatConfig.optimizedDragonRespawn));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "antiSpamDisabled", GeneralCompatConfig.antiSpamDisabled));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "blockPlacementIgnoreEntity", GeneralCompatConfig.blockPlacementIgnoreEntity));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "creativeOpenContainerForcibly", GeneralCompatConfig.creativeOpenContainerForcibly));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpetamsaddition", "creativeOneHitKill", GeneralCompatConfig.creativeOneHitKill));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "observerNoDetection", GeneralCompatConfig.observerNoDetection));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpetamsaddition", "bambooModelNoOffset", GeneralCompatConfig.bambooModelNoOffset));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "creativeNoItemCooldown", GeneralCompatConfig.creativeNoItemCooldown));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "ctrlQCraftingFix", GeneralCompatConfig.ctrlQCraftingFix));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpetamsaddition", "carpetAlwaysSetDefault", GeneralCompatConfig.carpetAlwaysSetDefault));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "placementRotationFix", GeneralCompatConfig.placementRotationFix));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "tntDoNotUpdate", GeneralCompatConfig.tntDoNotUpdate));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "totallyNoBlockUpdate", GeneralCompatConfig.totallyNoBlockUpdate));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "tiscmNetworkProtocol", GeneralCompatConfig.tiscmNetworkProtocol));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpetorgaddition", "hopperNoItemCost", GeneralCompatConfig.hopperNoItemCost));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "explosionNoBlockDamage", GeneralCompatConfig.explosionNoBlockDamage));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "optimizedTNTHighPriority", GeneralCompatConfig.optimizedTNTHighPriority));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "tntPrimerMomentumRemoved", GeneralCompatConfig.tntPrimerMomentumRemoved));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "tntIgnoreRedstoneSignal", GeneralCompatConfig.tntIgnoreRedstoneSignal));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "tntDupingFix", GeneralCompatConfig.tntDupingFix));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "interactionUpdates", GeneralCompatConfig.interactionUpdates));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "xpNoCooldown", GeneralCompatConfig.xpNoCooldown));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpetamsaddition", "powerfulExpMending", GeneralCompatConfig.powerfulExpMending));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "clientSettingsLostOnRespawnFix", GeneralCompatConfig.clientSettingsLostOnRespawnFix));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpetamsaddition", "sensibleEnderman", GeneralCompatConfig.sensibleEnderman));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "entityInstantDeathRemoval", GeneralCompatConfig.entityInstantDeathRemoval));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "farmlandTrampledDisabled", GeneralCompatConfig.farmlandTrampledDisabled));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpetamsaddition", "shulkerGolem", GeneralCompatConfig.shulkerGolem));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpetamsaddition", "preventEndSpikeRespawn", GeneralCompatConfig.preventEndSpikeRespawn));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "yeetOutOfOrderChatKick", GeneralCompatConfig.yeetOutOfOrderChatKick));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpetamsaddition", "betterCraftableBoneBlock", GeneralCompatConfig.betterCraftableBoneBlock));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpetamsaddition", "betterCraftableDispenser", GeneralCompatConfig.betterCraftableDispenser));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "viewDistance", GeneralCompatConfig.viewDistance));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "tickCommandPermission", GeneralCompatConfig.normalizedTickCommandPermission()));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "tickFreezeCommandToggleable", GeneralCompatConfig.tickFreezeCommandToggleable));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "syncServerMsptMetricsData", GeneralCompatConfig.syncServerMsptMetricsData));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpetorgaddition", "simpleInGameCalculator", GeneralCompatConfig.simpleInGameCalculator));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "microTiming", GeneralCompatConfig.microTiming));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "fastRedstoneDust", GeneralCompatConfig.fastRedstoneDust));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "lagFreeSpawning", GeneralCompatConfig.lagFreeSpawning));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "optimizedFastEntityMovement", GeneralCompatConfig.optimizedFastEntityMovement));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "optimizedHardHitBoxEntityCollision", GeneralCompatConfig.optimizedHardHitBoxEntityCollision));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "tntFuseDuration", GeneralCompatConfig.normalizedTntFuseDuration()));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "defaultLoggers", CarpetLoggerProtocol.serializeConfiguredDefaults(sanitizeDefaultLoggers(GeneralCompatConfig.defaultLoggers))));
+
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("lophine", "commandBot", FakePlayerCompatConfig.commandBot));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "commandPlayer", FakePlayerCompatConfig.commandPlayer));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("lophine", "fakePlayerResident", FakePlayerCompatConfig.fakePlayerResident));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("lophine", "openFakePlayerInventory", FakePlayerCompatConfig.openFakePlayerInventory));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "fakePlayerTicksLikeRealPlayer", FakePlayerCompatConfig.fakePlayerTicksLikeRealPlayer));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpetamsaddition", "fakePlayerDefaultSurvivalMode", FakePlayerCompatConfig.fakePlayerDefaultSurvivalMode));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpetamsaddition", "fakePlayerInteractLikeClient", FakePlayerCompatConfig.fakePlayerInteractLikeClient));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("lophine", "fakePlayerAutoReplaceTool", FakePlayerCompatConfig.fakePlayerAutoReplaceTool));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("lophine", "fakePlayerAutoReplenishment", FakePlayerCompatConfig.fakePlayerAutoReplenishment));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpetamsaddition", "fakePlayerAutoReplenishmentFormShulkerBox", FakePlayerCompatConfig.fakePlayerAutoReplenishmentFormShulkerBox));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("lophine", "fakePlayerAutoFish", FakePlayerCompatConfig.fakePlayerAutoFish));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("lophine", "fakePlayerReloadAction", FakePlayerCompatConfig.fakePlayerReloadAction));
+
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "hopperCounters", CounterCompatConfig.hopperCounters));
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpettisaddition", "hopperCountersUnlimitedSpeed", CounterCompatConfig.hopperCountersUnlimitedSpeed));
+    }
+}
@@ -0,0 +1,42 @@
+package fun.bm.lophine.carpet;
+
+import java.util.function.Supplier;
+
+public final class InteractionUpdateCompatHelper {
+    private static final ThreadLocal<Integer> SUPPRESSED_DEPTH = ThreadLocal.withInitial(() -> 0);
+
+    public static boolean shouldSkipUpdates() {
+        return SUPPRESSED_DEPTH.get() > 0;
+    }
+
+    public static void runWithSuppressedUpdates(Runnable action) {
+        push();
+        try {
+            action.run();
+        } finally {
+            pop();
+        }
+    }
+
+    public static <T> T supplyWithSuppressedUpdates(Supplier<T> action) {
+        push();
+        try {
+            return action.get();
+        } finally {
+            pop();
+        }
+    }
+
+    private static void push() {
+        SUPPRESSED_DEPTH.set(SUPPRESSED_DEPTH.get() + 1);
+    }
+
+    private static void pop() {
+        int depth = SUPPRESSED_DEPTH.get();
+        if (depth <= 1) {
+            SUPPRESSED_DEPTH.remove();
+        } else {
+            SUPPRESSED_DEPTH.set(depth - 1);
+        }
+    }
+}
@@ -0,0 +1,112 @@
+package fun.bm.lophine.carpet;
+
+import com.mojang.logging.LogUtils;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.util.Mth;
+import net.minecraft.world.entity.EntitySpawnReason;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.MobCategory;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.FenceGateBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+public final class LagFreeSpawningCompatHelper {
+    private static final Logger LOGGER = LogUtils.getLogger();
+    private static final Map<ServerLevel, Map<EntityType<?>, Mob>> PRECOOKED_MOBS = new WeakHashMap<>();
+
+    public static boolean hasNoCollision(ServerLevel world, AABB bb) {
+        int minX = Mth.floor(bb.minX);
+        int minY = Mth.floor(bb.minY);
+        int minZ = Mth.floor(bb.minZ);
+        int maxY = Mth.ceil(bb.maxY) - 1;
+        BlockPos.MutableBlockPos blockPos = new BlockPos.MutableBlockPos();
+
+        if (bb.getXsize() <= 1.0 && bb.getZsize() <= 1.0) {
+            for (int y = minY; y <= maxY; y++) {
+                blockPos.set(minX, y, minZ);
+                VoxelShape shape = world.getBlockState(blockPos).getCollisionShape(world, blockPos);
+                if (shape != Shapes.empty()) {
+                    return shape != Shapes.block() && world.noCollision(bb);
+                }
+            }
+            return true;
+        }
+
+        int maxX = Mth.ceil(bb.maxX) - 1;
+        int maxZ = Mth.ceil(bb.maxZ) - 1;
+
+        for (int y = minY; y <= maxY; y++) {
+            for (int x = minX; x <= maxX; x++) {
+                for (int z = minZ; z <= maxZ; z++) {
+                    blockPos.set(x, y, z);
+                    VoxelShape shape = world.getBlockState(blockPos).getCollisionShape(world, blockPos);
+                    if (shape != Shapes.empty()) {
+                        return shape != Shapes.block() && world.noCollision(bb);
+                    }
+                }
+            }
+        }
+
+        int minBelow = minY - 1;
+        for (int x = minX; x <= maxX; x++) {
+            for (int z = minZ; z <= maxZ; z++) {
+                blockPos.set(x, minBelow, z);
+                BlockState state = world.getBlockState(blockPos);
+                Block block = state.getBlock();
+                if (state.is(BlockTags.FENCES)
+                        || state.is(BlockTags.WALLS)
+                        || block instanceof FenceGateBlock && !state.getValue(FenceGateBlock.OPEN)) {
+                    if (x == minX || x == maxX || z == minZ || z == maxZ) {
+                        return world.noCollision(bb);
+                    }
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    public static double limitDistanceSq(MobCategory category, double distanceSq) {
+        return distanceSq > 16384.0 && category != MobCategory.CREATURE ? 0.0 : distanceSq;
+    }
+
+    public static @Nullable Mob getOrCreateMob(ServerLevel level, EntityType<?> entityType) {
+        Map<EntityType<?>, Mob> cache = PRECOOKED_MOBS.computeIfAbsent(level, key -> new HashMap<>());
+        Mob mob = cache.get(entityType);
+        if (mob != null && !mob.isRemoved()) {
+            return mob;
+        }
+
+        try {
+            if (entityType.create(level, EntitySpawnReason.NATURAL) instanceof Mob created) {
+                cache.put(entityType, created);
+                return created;
+            }
+            LOGGER.warn("Can't precook non-mob entity type: {}", entityType);
+        } catch (Exception exception) {
+            LOGGER.warn("Failed to precook mob {}", entityType, exception);
+        }
+
+        return null;
+    }
+
+    public static void markSpawned(ServerLevel level, EntityType<?> entityType) {
+        Map<EntityType<?>, Mob> cache = PRECOOKED_MOBS.get(level);
+        if (cache != null) {
+            cache.remove(entityType);
+        }
+    }
+}
@@ -0,0 +1,29 @@
+package fun.bm.lophine.carpet.config.modules;
+
+import fun.bm.lophine.carpet.CarpetCompatSync;
+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.ROOT,
+        name = "core",
+        directory = {"carpet"}
+)
+public class CoreConfig implements IConfigModule {
+    @ConfigInfo(name = "enabled", comments = """
+            Enable carpet features.
+            If you want to use some function from Carpet modifier,
+            you need to enable it.
+            (some function is not managed by this option)
+            
+            ONLY GENERAL DIRECTORY WAS CONTROLLED BY THIS OPTION.
+            WARNING: IF YOU ENABLED IT, ORIGINAL CONFIG IN LOPHINE CONFIG WILL BE OVERWRITTEN.""")
+    public static boolean enabled = false;
+
+    @Override
+    public void beforeFinalLoad() {
+        CarpetCompatSync.apply();
+    }
+}
@@ -0,0 +1,24 @@
+package fun.bm.lophine.carpet.config.modules;
+
+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.ROOT,
+        name = "hopper_counter",
+        directory = {"carpet"},
+        comments = """
+                Hopper counter compatibility mapped onto Lophine's wool hopper counter implementation."""
+)
+public class CounterCompatConfig implements IConfigModule {
+    @ConfigInfo(name = "hopperCounters", comments = """
+            Enable the existing wool hopper counter implementation.""")
+    public static boolean hopperCounters = false;
+
+    @ConfigInfo(name = "hopperCountersUnlimitedSpeed", comments = """
+            Remove the hopper transfer speed limit for counters.
+            Only effective when hopperCounters is enabled.""")
+    public static boolean hopperCountersUnlimitedSpeed = false;
+}
@@ -0,0 +1,64 @@
+package fun.bm.lophine.carpet.config.modules;
+
+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.ROOT,
+        name = "fakeplayer",
+        directory = {"carpet"},
+        comments = """
+                Carpet fakeplayer compatibility mapped onto Lophine fakeplayers.
+                commandPlayer is currently backed by Lophine's /bot command surface."""
+)
+public class FakePlayerCompatConfig implements IConfigModule {
+    @ConfigInfo(name = "commandBot", comments = """
+            Enable Lophine's /bot command.""")
+    public static boolean commandBot = false;
+
+    @ConfigInfo(name = "commandPlayer", comments = """
+            Map Carpet's commandPlayer rule to the same fakeplayer command surface used by /bot.""")
+    public static boolean commandPlayer = false;
+
+    @ConfigInfo(name = "fakePlayerResident", comments = """
+            Keep fakeplayers resident across unload and restart.""")
+    public static boolean fakePlayerResident = false;
+
+    @ConfigInfo(name = "openFakePlayerInventory", comments = """
+            Allow opening fakeplayer inventories.""")
+    public static boolean openFakePlayerInventory = false;
+
+    @ConfigInfo(name = "fakePlayerTicksLikeRealPlayer", comments = """
+            Tick fakeplayers in the network phase to better match real player timing.""")
+    public static boolean fakePlayerTicksLikeRealPlayer = false;
+
+    @ConfigInfo(name = "fakePlayerDefaultSurvivalMode", comments = """
+            Force newly created fakeplayers to start in survival instead of the server default gamemode.""")
+    public static boolean fakePlayerDefaultSurvivalMode = false;
+
+    @ConfigInfo(name = "fakePlayerInteractLikeClient", comments = """
+            Make fakeplayer entity interaction follow client-side fallback behavior more closely.""")
+    public static boolean fakePlayerInteractLikeClient = false;
+
+    @ConfigInfo(name = "fakePlayerAutoReplaceTool", comments = """
+            Toggle automatic tool replacement for fakeplayers.""")
+    public static boolean fakePlayerAutoReplaceTool = false;
+
+    @ConfigInfo(name = "fakePlayerAutoReplenishment", comments = """
+            Toggle automatic stack replenishment for fakeplayers.""")
+    public static boolean fakePlayerAutoReplenishment = false;
+
+    @ConfigInfo(name = "fakePlayerAutoReplenishmentFormShulkerBox", comments = """
+            Let fakeplayer replenishment pull matching items out of shulker boxes in the inventory.""")
+    public static boolean fakePlayerAutoReplenishmentFormShulkerBox = false;
+
+    @ConfigInfo(name = "fakePlayerAutoFish", comments = """
+            Let fakeplayers holding a fishing rod automatically cast and reel it in.""")
+    public static boolean fakePlayerAutoFish = false;
+
+    @ConfigInfo(name = "fakePlayerReloadAction", comments = """
+            Persist queued fakeplayer actions across save and reload.""")
+    public static boolean fakePlayerReloadAction = false;
+}
@@ -0,0 +1,239 @@
+package fun.bm.lophine.carpet.config.modules;
+
+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;
+
+import java.util.List;
+
+@ConfigClassInfo(
+        category = EnumConfigCategory.ROOT,
+        name = "general",
+        directory = {"carpet"},
+        comments = """
+                Carpet/AMS/TIS/Org compatibility rules backed by existing Lophine features.
+                Only rules that already have a working server-side implementation are exposed here."""
+)
+public class GeneralCompatConfig implements IConfigModule {
+    @ConfigInfo(name = "language", comments = """
+            Carpet language value forwarded to lophine.function.language.lang.""")
+    public static String language = "en_us";
+
+    @ConfigInfo(name = "amsUpdateSuppressionCrashFix", comments = """
+            Map AMS update suppression crash protection to Lophine's existing crash fix.""")
+    public static boolean amsUpdateSuppressionCrashFix = false;
+
+    @ConfigInfo(name = "yeetUpdateSuppressionCrash", comments = """
+            Map TIS update suppression crash yeeting to the same Lophine crash fix.""")
+    public static boolean yeetUpdateSuppressionCrash = false;
+
+    @ConfigInfo(name = "dustTrapdoorReintroduced", comments = """
+            Map dust-on-open-trapdoor behavior to Lophine's redstone-ignore-upwards-update option.""")
+    public static boolean dustTrapdoorReintroduced = false;
+
+    @ConfigInfo(name = "shulkerBoxCCEReintroduced", comments = """
+            Map shulker-box CCE update suppression to Lophine's cce-update-suppression option.""")
+    public static boolean shulkerBoxCCEReintroduced = false;
+
+    @ConfigInfo(name = "instantBlockUpdaterReintroduced", comments = """
+            Enable the existing instant block updater patch already carried by Lophine.""")
+    public static boolean instantBlockUpdaterReintroduced = false;
+
+    @ConfigInfo(name = "commandTick", comments = """
+            Enable the tick command support already patched into Lophine.""")
+    public static boolean commandTick = false;
+
+    @ConfigInfo(name = "creativeNoClip", comments = """
+            Enable the existing creative fly no clip implementation.""")
+    public static boolean creativeNoClip = false;
+
+    @ConfigInfo(name = "optimizedDragonRespawn", comments = """
+            Enable the existing optimized dragon respawn implementation from Luminol.""")
+    public static boolean optimizedDragonRespawn = false;
+
+    @ConfigInfo(name = "antiSpamDisabled", comments = """
+            Disable the server-side chat and creative-drop spam throttles used by vanilla/Spigot.""")
+    public static boolean antiSpamDisabled = false;
+
+    @ConfigInfo(name = "blockPlacementIgnoreEntity", comments = """
+            Allow creative players to place blocks without entity collision checks.""")
+    public static boolean blockPlacementIgnoreEntity = false;
+
+    @ConfigInfo(name = "creativeOpenContainerForcibly", comments = """
+            Allow creative players to forcibly open blocked chests, ender chests and shulker boxes.""")
+    public static boolean creativeOpenContainerForcibly = false;
+
+    @ConfigInfo(name = "creativeOneHitKill", comments = """
+            Allow creative players to instantly kill attackable non-creative, non-spectator entities.
+            Sneaking expands the effect into a small area attack.""")
+    public static boolean creativeOneHitKill = false;
+
+    @ConfigInfo(name = "observerNoDetection", comments = """
+            Disable observer detection pulses entirely.""")
+    public static boolean observerNoDetection = false;
+
+    @ConfigInfo(name = "bambooModelNoOffset", comments = """
+            Remove the random horizontal model offset from bamboo and bamboo saplings.""")
+    public static boolean bambooModelNoOffset = false;
+
+    @ConfigInfo(name = "creativeNoItemCooldown", comments = """
+            Skip item cooldown application for creative players.""")
+    public static boolean creativeNoItemCooldown = false;
+
+    @ConfigInfo(name = "ctrlQCraftingFix", comments = """
+            Compatibility flag for the upstream result-slot Ctrl+Q crafting fix already present in the current menu code.""")
+    public static boolean ctrlQCraftingFix = false;
+
+    @ConfigInfo(name = "carpetAlwaysSetDefault", comments = """
+            Compatibility flag for Lophine's config loader, which already writes default values into the compat config during preload.""")
+    public static boolean carpetAlwaysSetDefault = false;
+
+    @ConfigInfo(name = "placementRotationFix", comments = """
+            Use the player's main body rotation for placement direction checks instead of interpolated head yaw.""")
+    public static boolean placementRotationFix = false;
+
+    @ConfigInfo(name = "tntDoNotUpdate", comments = """
+            Prevent TNT from checking redstone power when first placed.""")
+    public static boolean tntDoNotUpdate = false;
+
+    @ConfigInfo(name = "totallyNoBlockUpdate", comments = """
+            Suppress neighbor and shape updates globally for block changes.""")
+    public static boolean totallyNoBlockUpdate = false;
+
+    @ConfigInfo(name = "tiscmNetworkProtocol", comments = """
+            Enable the native Carpet TIS Addition network channel on `tiscm:network/v1`.""")
+    public static boolean tiscmNetworkProtocol = false;
+
+    @ConfigInfo(name = "hopperNoItemCost", comments = """
+            Restore the transferred stack into a hopper when a wool block is placed on top of it.""")
+    public static boolean hopperNoItemCost = false;
+
+    @ConfigInfo(name = "explosionNoBlockDamage", comments = """
+            Let explosions damage entities without breaking blocks.""")
+    public static boolean explosionNoBlockDamage = false;
+
+    @ConfigInfo(name = "optimizedTNTHighPriority", comments = """
+            Compatibility flag for the already optimized server explosion path carried by the current runtime.""")
+    public static boolean optimizedTNTHighPriority = false;
+
+    @ConfigInfo(name = "tntPrimerMomentumRemoved", comments = """
+            Remove the random horizontal launch momentum from newly primed TNT.""")
+    public static boolean tntPrimerMomentumRemoved = false;
+
+    @ConfigInfo(name = "tntIgnoreRedstoneSignal", comments = """
+            Ignore redstone power when deciding whether TNT should auto-prime.""")
+    public static boolean tntIgnoreRedstoneSignal = false;
+
+    @ConfigInfo(name = "tntDupingFix", comments = """
+            Toggle the piston desync path used by vanilla TNT duplication setups.""")
+    public static boolean tntDupingFix = false;
+
+    @ConfigInfo(name = "interactionUpdates", comments = """
+            Control whether player interaction block changes emit normal block updates.
+            Set to false to suppress neighbor and shape updates during block use and breaking.""")
+    public static boolean interactionUpdates = true;
+
+    @ConfigInfo(name = "xpNoCooldown", comments = """
+            Allow players to absorb multiple experience orbs in the same tick without pickup delay.""")
+    public static boolean xpNoCooldown = false;
+
+    @ConfigInfo(name = "powerfulExpMending", comments = """
+            Let picked-up experience repair all damaged mending items in the player's inventory, not only equipped gear.""")
+    public static boolean powerfulExpMending = false;
+
+    @ConfigInfo(name = "clientSettingsLostOnRespawnFix", comments = """
+            Reapply the player's last known client settings after respawn.""")
+    public static boolean clientSettingsLostOnRespawnFix = false;
+
+    @ConfigInfo(name = "sensibleEnderman", comments = """
+            Restrict enderman block pickup to pumpkins and melons only.""")
+    public static boolean sensibleEnderman = false;
+
+    @ConfigInfo(name = "entityInstantDeathRemoval", comments = """
+            Remove the normal 20gt delay before dead living entities are discarded.""")
+    public static boolean entityInstantDeathRemoval = false;
+
+    @ConfigInfo(name = "farmlandTrampledDisabled", comments = """
+            Prevent farmland from turning into dirt when entities land on it.""")
+    public static boolean farmlandTrampledDisabled = false;
+
+    @ConfigInfo(name = "shulkerGolem", comments = """
+            Allow a carved pumpkin on top of a shulker box to summon a shulker.""")
+    public static boolean shulkerGolem = false;
+
+    @ConfigInfo(name = "preventEndSpikeRespawn", comments = """
+            Skip obsidian spike regeneration during dragon respawn.""")
+    public static boolean preventEndSpikeRespawn = false;
+
+    @ConfigInfo(name = "yeetOutOfOrderChatKick", comments = """
+            Ignore out-of-order secure chat chain checks instead of invalidating the chat session.""")
+    public static boolean yeetOutOfOrderChatKick = false;
+
+    @ConfigInfo(name = "betterCraftableBoneBlock", comments = """
+            Add the AMS alternate bone block recipe that yields 3 bone blocks from 9 bones.""")
+    public static boolean betterCraftableBoneBlock = false;
+
+    @ConfigInfo(name = "betterCraftableDispenser", comments = """
+            Add the AMS alternate dispenser recipes using a dropper.""")
+    public static boolean betterCraftableDispenser = false;
+
+    @ConfigInfo(name = "viewDistance", comments = """
+            Override the dedicated server's startup view distance with the Carpet-compatible value.""")
+    public static int viewDistance = 12;
+
+    @ConfigInfo(name = "tickCommandPermission", comments = """
+            Override the `/tick` command permission level.
+            Accepts values in the range 0..4, where 2 matches old Carpet behavior and 3 keeps vanilla.""")
+    public static int tickCommandPermission = 3;
+
+    @ConfigInfo(name = "tickFreezeCommandToggleable", comments = """
+            Make `/tick freeze` toggle back to running when executed while the server is already frozen.""")
+    public static boolean tickFreezeCommandToggleable = false;
+
+    @ConfigInfo(name = "syncServerMsptMetricsData", comments = """
+            Broadcast live MSPT samples through the native TISCM protocol channel.""")
+    public static boolean syncServerMsptMetricsData = false;
+
+    @ConfigInfo(name = "simpleInGameCalculator", comments = """
+            Evaluate chat messages prefixed with `=` as a simple calculator expression and reply privately.""")
+    public static boolean simpleInGameCalculator = false;
+
+    @ConfigInfo(name = "microTiming", comments = """
+            Compatibility flag for the built-in region profiler and timing instrumentation carried by Folia/Moonrise.""")
+    public static boolean microTiming = false;
+
+    @ConfigInfo(name = "fastRedstoneDust", comments = """
+            Route redstone dust updates through the Alternate Current fast-update backend.""")
+    public static boolean fastRedstoneDust = false;
+
+    @ConfigInfo(name = "lagFreeSpawning", comments = """
+            Use the lightweight collision and precooked-mob spawning path for natural spawning checks.""")
+    public static boolean lagFreeSpawning = false;
+
+    @ConfigInfo(name = "optimizedFastEntityMovement", comments = """
+            Compatibility flag for the always-on Moonrise/Paper fast entity movement collision pipeline.""")
+    public static boolean optimizedFastEntityMovement = false;
+
+    @ConfigInfo(name = "optimizedHardHitBoxEntityCollision", comments = """
+            Compatibility flag for the always-on Moonrise/Paper hard-hitbox entity collision optimizations.""")
+    public static boolean optimizedHardHitBoxEntityCollision = false;
+
+    @ConfigInfo(name = "tntFuseDuration", comments = """
+            Override the default primed TNT fuse duration in ticks.
+            Accepts values in the range 0..32767.""")
+    public static int tntFuseDuration = 80;
+
+    @ConfigInfo(name = "defaultLoggers", comments = """
+            Carpet-style default logger subscriptions for players.
+            Examples: ["tps", "mob_caps", "counter white"]""")
+    public static List<String> defaultLoggers = List.of();
+
+    public static int normalizedTntFuseDuration() {
+        return Math.clamp(tntFuseDuration, 0, Short.MAX_VALUE);
+    }
+
+    public static int normalizedTickCommandPermission() {
+        return Math.clamp(tickCommandPermission, 0, 4);
+    }
+}
@@ -1,6 +1,6 @@
 package fun.bm.lophine.command.counter;

-import net.minecraft.commands.CommandSourceStack;
+import io.papermc.paper.command.brigadier.CommandSourceStack;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.leavesmc.leaves.command.LiteralNode;
@@ -25,7 +25,7 @@ public class DisplayCommand extends CounterSubCommand {
    }

    public static void displayCounter(CommandContext context, @NotNull HopperCounter counter, boolean realTime) {
-        for (Component component : counter.format(MinecraftServer.getServer(), context.getSource().getLevel(), realTime)) {
+        for (Component component : counter.format(MinecraftServer.getServer(), realTime)) {
            context.getSender().sendMessage(component);
        }
    }
@@ -9,6 +9,7 @@ import fun.bm.lophine.command.counter.CounterSubCommand;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.JoinConfiguration;
 import net.kyori.adventure.text.format.TextColor;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.item.DyeColor;
 import org.jetbrains.annotations.NotNull;
 import org.leavesmc.leaves.command.ArgumentNode;
@@ -27,7 +28,7 @@ public class ResetCommand extends CounterSubCommand {

    @Override
    protected boolean execute(@NotNull CommandContext context) throws CommandSyntaxException {
-        HopperCounter.resetAll(context.getSource().getLevel(), false);
+        HopperCounter.resetAll(MinecraftServer.getServer(), false);
        context.getSender().sendMessage(Component.text("Restarted all counters."));
        return true;
    }
@@ -41,14 +42,14 @@ public class ResetCommand extends CounterSubCommand {
        protected boolean execute(@NotNull CommandContext context) {
            String color0 = context.getArgument(DyeColorArg.class);
            if (color0.equals("all")) {
-                HopperCounter.resetAll(context.getSource().getLevel(), false);
+                HopperCounter.resetAll(MinecraftServer.getServer(), false);
                context.getSender().sendMessage(Component.text("Restarted all counters."));
                return true;
            }
            DyeColor color = DyeColor.byName(color0, null);
            if (color == null) return true;
            HopperCounter counter = HopperCounter.getCounter(color);
-            counter.reset(context.getSource().getLevel());
+            counter.reset(MinecraftServer.getServer());
            context.getSender().sendMessage(Component.join(JoinConfiguration.noSeparators(),
                    Component.text("Restarted "),
                    Component.text(color.getName(), TextColor.color(color.getTextColor())),
@@ -22,11 +22,25 @@ public class CommandConfig implements IConfigModule {
    @TransformedConfig(name = "enable-waypoint", directory = {"experiment", "waypoint_bar"})
    @ConfigInfo(name = "waypoint_command_enabled", comments =
            """
-                    Allow to use waypoint command""")
+                    Allow to use waypoint command and locator bar""")
    public static boolean waypoint = false;

    @ConfigInfo(name = "scoreboard_command_enabled", comments =
            """
                    Allow to use scoreboard command""")
    public static boolean scoreboard = false;
+
+    @ConfigInfo(name = "enabled", directory = {"save_all_command"}, comments =
+            """
+                    Allow to use save-all command""")
+    public static boolean saveAll = false;
+
+    @ConfigInfo(name = "log_all_process", directory = {"save_all_command"}, comments =
+            """
+                    Log all process of save-all command to console""")
+    public static boolean logAllProcess = false;
+
+    @ConfigInfo(name = "save_all_command_timeout", directory = {"save_all_command"}, comments = """
+            Maximum seconds to save before the chunk report it is timeout.""")
+    public static long saveAllTimeout = 30;
 }
@@ -17,4 +17,11 @@ public class GlobalEntitiesCounter implements IConfigModule {
    @HotReloadUnsupported
    @ConfigInfo(name = "async", comments = "Enable Asynchronous(maybe cause bugs)")
    public static boolean async = false;
+
+    @HotReloadUnsupported
+    @ConfigInfo(name = "always_count", comments = """
+            Always count entities.
+            If you want to count entities loaded by chunk loader,
+            you must to enabled it.""")
+    public static boolean alwaysCount = false;
 }
@@ -0,0 +1,25 @@
+package fun.bm.lophine.config.modules.function;
+
+import com.electronwill.nightconfig.core.file.CommentedFileConfig;
+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;
+import org.jetbrains.annotations.Nullable;
+import org.leavesmc.leaves.protocol.CarpetServerProtocol;
+
+import java.util.Set;
+
+@ConfigClassInfo(name = "creative_fly_no_clip", category = EnumConfigCategory.FUNCTION)
+public class CreativeFlyNoClipConfig implements IConfigModule {
+    @ConfigInfo(name = "enabled", comments = """
+            Whether to enable creative fly no clip.
+            When enabled, players in creative mode will not collide with blocks while flying.
+            This allows them to pass through blocks without obstruction.""")
+    public static boolean enabled = false;
+
+    @Override
+    public void onLoaded(CommentedFileConfig configInstance, @Nullable Set<Exception> e) {
+        CarpetServerProtocol.CarpetRules.register(CarpetServerProtocol.CarpetRule.of("carpet", "creativeNoClip", enabled));
+    }
+}
@@ -81,7 +81,6 @@ public class FakeplayerConfig implements IConfigModule {
    @ConfigInfo(name = "enable-locator-bar", comments = """
            Enable locator bar for fakeplayers""")
    public static boolean enableLocatorBar = false;
-
    public static ServerBot.TickType tickType = ServerBot.TickType.ENTITY_LIST;

    private BotCommand command = null;
@@ -0,0 +1,34 @@
+package fun.bm.lophine.config.modules.function;
+
+import com.electronwill.nightconfig.core.file.CommentedFileConfig;
+import fun.bm.lophine.utils.RandomProfilePool;
+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.HotReloadUnsupported;
+import me.earthme.luminol.enums.EnumConfigCategory;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Set;
+
+@ConfigClassInfo(category = EnumConfigCategory.FUNCTION, name = "replay-api")
+public class ReplayAPIConfig implements IConfigModule {
+    @HotReloadUnsupported
+    @ConfigInfo(name = "enable-cache")
+    public static boolean enableCache = true;
+
+    @HotReloadUnsupported
+    @ConfigInfo(name = "cache-photographer-time", comments = """
+            Time to cache photographer profile(in seconds)""")
+    public static int cachePhotographerTime = 3600;
+
+    @HotReloadUnsupported
+    @ConfigInfo(name = "cache-photographer-size", comments = """
+            Maximum size of cache photographer profile""")
+    public static int cachePhotographerSize = 100;
+
+    @Override
+    public void onLoaded(CommentedFileConfig configInstance, @Nullable Set<Exception> e) {
+        RandomProfilePool.init();
+    }
+}
@@ -5,8 +5,8 @@ import fun.bm.lophine.command.counter.CounterCommand;
 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.DoNotLoad;
 import me.earthme.luminol.enums.EnumConfigCategory;
-import org.bukkit.Bukkit;
 import org.jetbrains.annotations.Nullable;

 import java.util.Set;
@@ -19,13 +19,23 @@ public class WoolHopperCounterConfig implements IConfigModule {
    @ConfigInfo(name = "unlimited-speed")
    public static boolean unlimitedSpeed = false;

+    @DoNotLoad
+    private static CounterCommand counterCommand = null;
+
    @Override
    public void onLoaded(CommentedFileConfig configInstance, @Nullable Set<Exception> exs) {
-        if (enabled) new CounterCommand().register();
+        if (enabled) {
+            if (counterCommand == null) {
+                counterCommand = new CounterCommand();
+            }
+            counterCommand.register();
+        }
    }

    @Override
    public void onUnloaded(CommentedFileConfig configInstance) {
-        Bukkit.getCommandMap().getKnownCommands().remove("luminol:tpsbar");
+        if (counterCommand != null) {
+            counterCommand.unregister();
+        }
    }
 }
@@ -0,0 +1,29 @@
+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;
+
+/*
+ * This file is only for showing auto update config.
+ * The function is implemented in luminol-server and not provide any function.
+ * Please use luminol-server's auto update config.
+ */
+@ConfigClassInfo(
+        category = EnumConfigCategory.MISC,
+        name = "auto_update",
+        comments = """
+                Checks GitHub Releases for newer version's jars on a schedule.
+                Downloads are staged under auto_update/lophine and written to auto_update/core.path,
+                which Hyacinthusclip can consume on the next restart.
+                
+                ATTENTION: full config option should be edited in luminol config system >> misc >> auto_update"""
+)
+public class AutoUpdateConfig implements IConfigModule {
+    @ConfigInfo(name = "enabled", comments = """
+            Whether the server should check for updates automatically.
+            You can enable it by edit this config, because they are both control the function.
+            One of them enabled, the full function will be enabled.""")
+    public static boolean enabled = false;
+}
@@ -1,17 +0,0 @@
-package fun.bm.lophine.config.modules.optimizations;
-
-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.HotReloadUnsupported;
-import me.earthme.luminol.enums.EnumConfigCategory;
-
-@ConfigClassInfo(category = EnumConfigCategory.OPTIMIZATIONS, name = "waypoint")
-public class WayPointOptimizedTableConfig implements IConfigModule {
-    @HotReloadUnsupported
-    @ConfigInfo(name = "optimizedTable", comments = """
-            Should use optimized table instead of normal concurrent table for waypoints.
-            May improve performance when there are many waypoints and players.
-            When enabled, more memory is needed to store data.""")
-    public static boolean optimizedTable = false;
-}
@@ -8,6 +8,7 @@ import me.earthme.luminol.enums.EnumConfigCategory;

@ConfigClassInfo(category = EnumConfigCategory.REMOVED, name = "removed_config")
 public class RemovedConfig implements IConfigModule {
+    @TransformedConfig(name = "optimizedTable", directory = {"optimizations", "waypoint"}, transform = false)
    @TransformedConfig(name = "enabled", directory = {"fixes", "end-void-ring"}, transform = false)
    @TransformedConfig(name = "enabled", directory = {"gameplay", "end_void_rings"}, transform = false)
    @TransformedConfig(name = "datapack_command_enabled", directory = {"experiment", "command"}, transform = false)
@@ -0,0 +1,302 @@
+package fun.bm.lophine.protocol;
+
+import fun.bm.lophine.carpet.config.modules.GeneralCompatConfig;
+import io.papermc.paper.adventure.PaperAdventure;
+import io.papermc.paper.threadedregions.RegionizedWorldData;
+import io.papermc.paper.threadedregions.TickRegionScheduler;
+import net.kyori.adventure.text.Component;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.protocol.game.ClientboundTabListPacket;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.ServerTickRateManager;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.MobCategory;
+import net.minecraft.world.item.DyeColor;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.NaturalSpawner;
+import org.jetbrains.annotations.NotNull;
+import org.leavesmc.leaves.protocol.core.LeavesProtocol;
+import org.leavesmc.leaves.protocol.core.ProtocolHandler;
+import org.leavesmc.leaves.util.HopperCounter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+@LeavesProtocol.Register(namespace = "carpet")
+public class CarpetLoggerProtocol implements LeavesProtocol {
+    private static final Logger LOGGER = LoggerFactory.getLogger("CarpetLoggerProtocol");
+    private static final Map<String, Map<String, String>> PLAYER_SUBSCRIPTIONS = new ConcurrentHashMap<>();
+    private static volatile Map<String, String> configuredSubscriptions = null;
+
+    public static void refreshConfiguredDefaults(boolean initial) {
+        Map<String, String> defaults = parseConfiguredDefaults(GeneralCompatConfig.defaultLoggers);
+        configuredSubscriptions = defaults;
+        if (defaults == null || defaults.isEmpty()) {
+            PLAYER_SUBSCRIPTIONS.clear();
+            if (initial) return;
+            for (ServerPlayer player : MinecraftServer.getServer().getPlayerList().getPlayers()) {
+                clearHud(player);
+            }
+            return;
+        }
+        PLAYER_SUBSCRIPTIONS.replaceAll((playerName, ignored) -> defaults);
+    }
+
+    public static String serializeConfiguredDefaults(List<String> configuredLoggers) {
+        List<String> serialized = new ArrayList<>();
+        if (configuredLoggers != null) {
+            for (String entry : configuredLoggers) {
+                if (entry == null) {
+                    continue;
+                }
+                String trimmed = entry.trim();
+                if (!trimmed.isEmpty()) {
+                    serialized.add(trimmed);
+                }
+            }
+        }
+        return serialized.isEmpty() ? "none" : String.join(",", serialized);
+    }
+
+    @ProtocolHandler.PlayerJoin
+    public static void onPlayerJoin(ServerPlayer player) {
+        if (configuredSubscriptions != null && !configuredSubscriptions.isEmpty()) {
+            PLAYER_SUBSCRIPTIONS.putIfAbsent(player.getScoreboardName(), configuredSubscriptions);
+        }
+    }
+
+    @ProtocolHandler.PlayerLeave
+    public static void onPlayerLeave(ServerPlayer player) {
+        clearHud(player);
+    }
+
+    @ProtocolHandler.Ticker(tickerId = "hud")
+    public static void onHudTick() {
+        if (PLAYER_SUBSCRIPTIONS.isEmpty()) {
+            return;
+        }
+        MinecraftServer server = MinecraftServer.getServer();
+        for (ServerPlayer player : server.getPlayerList().getPlayers()) {
+            Map<String, String> subscriptions = PLAYER_SUBSCRIPTIONS.get(player.getScoreboardName());
+            if (subscriptions == null || subscriptions.isEmpty()) {
+                continue;
+            }
+            player.getBukkitEntity().taskScheduler.schedule((LivingEntity livingEntity) -> {
+                if (livingEntity instanceof ServerPlayer scheduledPlayer) {
+                    sendHud(server, scheduledPlayer, subscriptions);
+                }
+            }, null, 1L);
+        }
+    }
+
+    @Override
+    public boolean isActive() {
+        return true;
+    }
+
+    @Override
+    public int tickerInterval(String tickerID) {
+        return "hud".equals(tickerID) ? 20 : 1;
+    }
+
+    private static void sendHud(MinecraftServer server, ServerPlayer player, Map<String, String> subscriptions) {
+        List<net.minecraft.network.chat.Component> lines = new ArrayList<>();
+        subscriptions.forEach((loggerName, option) -> {
+            switch (loggerName) {
+                case "tps" -> lines.add(buildTpsLine(server));
+                case "mobcaps" -> {
+                    net.minecraft.network.chat.Component line = buildMobcapsLine(player, option);
+                    if (line != null) {
+                        lines.add(line);
+                    }
+                }
+                case "counter" -> lines.addAll(buildCounterLines(server, option));
+                default -> {
+                }
+            }
+        });
+
+        MutableComponent footer = net.minecraft.network.chat.Component.empty();
+        for (int i = 0; i < lines.size(); i++) {
+            if (i > 0) {
+                footer.append(net.minecraft.network.chat.Component.literal("\n"));
+            }
+            footer.append(lines.get(i));
+        }
+        player.connection.send(new ClientboundTabListPacket(net.minecraft.network.chat.Component.empty(), footer));
+    }
+
+    private static void clearHud(ServerPlayer player) {
+        player.connection.send(new ClientboundTabListPacket(net.minecraft.network.chat.Component.empty(), net.minecraft.network.chat.Component.empty()));
+    }
+
+    private static net.minecraft.network.chat.Component buildTpsLine(MinecraftServer server) {
+        ServerTickRateManager tickManager = server.tickRateManager();
+        ca.spottedleaf.moonrise.common.time.TickData.TickReportData tickData = TickRegionScheduler.getCurrentRegion().getData().getRegionSchedulingHandle().getTickReport5s(System.nanoTime());
+        final double tps = tickData.tpsData().segmentAll().average();
+        final double mspt = tickData.timePerTickData().segmentAll().average() / 1.0E6;
+
+        ChatFormatting color = heatmapColor(mspt, tickManager.millisecondsPerTick());
+        return net.minecraft.network.chat.Component.empty()
+                .append(net.minecraft.network.chat.Component.literal("TPS: ").withStyle(ChatFormatting.GRAY))
+                .append(net.minecraft.network.chat.Component.literal(String.format(Locale.US, "%.1f", tps)).withStyle(color))
+                .append(net.minecraft.network.chat.Component.literal("  MSPT: ").withStyle(ChatFormatting.GRAY))
+                .append(net.minecraft.network.chat.Component.literal(String.format(Locale.US, "%.1f", mspt)).withStyle(color));
+    }
+
+    private static net.minecraft.network.chat.Component buildMobcapsLine(ServerPlayer player, String option) {
+        final ServerLevel level = resolveMobcapsLevel(player, option);
+        if (level == null) {
+            return null;
+        }
+
+        final RegionizedWorldData data = level.getCurrentWorldData();
+        if (data == null) {
+            return null;
+        }
+
+        final NaturalSpawner.SpawnState spawnState = data.lastSpawnState;
+        if (spawnState == null) {
+            return net.minecraft.network.chat.Component.literal("Mobcaps: unavailable").withStyle(ChatFormatting.DARK_GRAY);
+        }
+
+        int chunks = spawnState.getSpawnableChunkCount();
+        var counts = spawnState.getMobCategoryCounts();
+        MutableComponent line = net.minecraft.network.chat.Component.literal("Mobcaps").withStyle(ChatFormatting.GRAY);
+        for (MobCategory category : MobCategory.values()) {
+            if (category == MobCategory.MISC) {
+                continue;
+            }
+            int current = counts.getOrDefault(category, 0);
+            int limit = NaturalSpawner.globalLimitForCategory(level, category, chunks);
+            line.append(net.minecraft.network.chat.Component.literal("  " + shortName(category) + " ").withStyle(ChatFormatting.DARK_GRAY));
+            line.append(net.minecraft.network.chat.Component.literal(current + "/" + limit).withStyle(categoryColor(current, limit)));
+        }
+        return line;
+    }
+
+    private static List<net.minecraft.network.chat.Component> buildCounterLines(MinecraftServer server, String option) {
+        List<net.minecraft.network.chat.Component> lines = new ArrayList<>();
+        String colors = option == null || option.isBlank() ? "white" : option;
+        for (String rawColor : colors.split(",")) {
+            String colorName = rawColor.trim();
+            if (colorName.isEmpty()) {
+                continue;
+            }
+            DyeColor color = DyeColor.byName(colorName, null);
+            if (color == null) {
+                continue;
+            }
+            HopperCounter counter = HopperCounter.getCounter(color);
+            if (counter == null) {
+                continue;
+            }
+            for (Component component : counter.format(server, false)) {
+                lines.add(PaperAdventure.asVanilla(component));
+            }
+        }
+        return lines;
+    }
+
+    private static ServerLevel resolveMobcapsLevel(ServerPlayer player, String option) {
+        if (option == null || option.isBlank() || option.equalsIgnoreCase("dynamic")) {
+            return player.level();
+        }
+        return switch (option.toLowerCase(Locale.ROOT)) {
+            case "overworld" -> player.level().dimension() == Level.OVERWORLD ? player.level() : null;
+            case "nether" -> player.level().dimension() == Level.NETHER ? player.level() : null;
+            case "end" -> player.level().dimension() == Level.END ? player.level() : null;
+            default -> player.level();
+        };
+    }
+
+    private static ChatFormatting heatmapColor(double actual, double reference) {
+        if (actual > reference) {
+            return ChatFormatting.LIGHT_PURPLE;
+        }
+        if (actual > 0.8D * reference) {
+            return ChatFormatting.RED;
+        }
+        if (actual > 0.5D * reference) {
+            return ChatFormatting.YELLOW;
+        }
+        if (actual >= 0.0D) {
+            return ChatFormatting.DARK_GREEN;
+        }
+        return ChatFormatting.GRAY;
+    }
+
+    private static ChatFormatting categoryColor(int current, int limit) {
+        if (limit <= 0) {
+            return ChatFormatting.DARK_GRAY;
+        }
+        double ratio = current / (double) limit;
+        if (ratio >= 1.0D) {
+            return ChatFormatting.RED;
+        }
+        if (ratio >= 0.8D) {
+            return ChatFormatting.YELLOW;
+        }
+        return ChatFormatting.GREEN;
+    }
+
+    private static String shortName(MobCategory category) {
+        return switch (category) {
+            case MONSTER -> "M";
+            case CREATURE -> "C";
+            case AMBIENT -> "A";
+            case AXOLOTLS -> "Ax";
+            case UNDERGROUND_WATER_CREATURE -> "UWC";
+            case WATER_CREATURE -> "WC";
+            case WATER_AMBIENT -> "WA";
+            case MISC -> "X";
+        };
+    }
+
+    private static Map<String, String> parseConfiguredDefaults(List<String> configuredLoggers) {
+        LinkedHashMap<String, String> subscriptions = new LinkedHashMap<>();
+        if (configuredLoggers == null) {
+            return null;
+        }
+        for (String entry : configuredLoggers) {
+            if (entry == null) {
+                continue;
+            }
+            for (String chunk : entry.split(",")) {
+                String token = chunk.trim();
+                if (token.isEmpty() || token.equalsIgnoreCase("none")) {
+                    continue;
+                }
+                String[] parts = token.split("\\s+", 2);
+                String loggerName = parts[0].toLowerCase(Locale.ROOT);
+                if (!isSupported(loggerName)) {
+                    LOGGER.debug("Ignoring unsupported Carpet default logger '{}'", loggerName);
+                    continue;
+                }
+                String option = parts.length == 1 ? defaultOption(loggerName) : parts[1].trim();
+                if (option.isEmpty()) {
+                    option = defaultOption(loggerName);
+                }
+                subscriptions.put(loggerName, option);
+            }
+        }
+        return subscriptions.isEmpty() ? null : Map.copyOf(subscriptions);
+    }
+
+    private static boolean isSupported(String loggerName) {
+        return Arrays.asList("tps", "mobcaps", "counter").contains(loggerName);
+    }
+
+    private static @NotNull String defaultOption(String loggerName) {
+        return switch (loggerName) {
+            case "mobcaps" -> "dynamic";
+            case "counter" -> "white";
+            default -> "";
+        };
+    }
+}
@@ -0,0 +1,201 @@
+package fun.bm.lophine.protocol.tiscm;
+
+import com.mojang.logging.LogUtils;
+import fun.bm.lophine.carpet.config.modules.GeneralCompatConfig;
+import io.papermc.paper.ServerBuildInfo;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.StringTag;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.ByteBufCodecs;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.resources.Identifier;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+import org.jetbrains.annotations.Contract;
+import org.leavesmc.leaves.protocol.core.LeavesCustomPayload;
+import org.leavesmc.leaves.protocol.core.LeavesProtocol;
+import org.leavesmc.leaves.protocol.core.ProtocolHandler;
+import org.leavesmc.leaves.protocol.core.ProtocolUtils;
+import org.slf4j.Logger;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+@LeavesProtocol.Register(namespace = TISCMProtocol.PROTOCOL_ID)
+public class TISCMProtocol implements LeavesProtocol {
+    private static final Logger LOGGER = LogUtils.getLogger();
+
+    public static final String PROTOCOL_ID = "tiscm";
+    private static final String PLATFORM_NAME = "Lophine";
+    private static final String PLATFORM_VERSION = ServerBuildInfo.buildInfo().asString(ServerBuildInfo.StringRepresentation.VERSION_SIMPLE);
+    private static final Map<String, EnumSet<S2CPacket>> CLIENT_SUPPORTED_PACKETS = new ConcurrentHashMap<>();
+
+    @Contract("_ -> new")
+    public static Identifier id(String path) {
+        return Identifier.fromNamespaceAndPath(PROTOCOL_ID, path);
+    }
+
+    public static void broadcastMsptSample(long tickCounter, long nanosecond) {
+        if (!GeneralCompatConfig.tiscmNetworkProtocol || !GeneralCompatConfig.syncServerMsptMetricsData) {
+            return;
+        }
+
+        CompoundTag nbt = new CompoundTag();
+        nbt.putInt("version", 2);
+        nbt.putLong("millisecond", nanosecond / 1_000_000L);
+        nbt.putLong("nanosecond", nanosecond);
+        nbt.putString("type", "tick_server_method");
+
+        TISCMPayload payload = new TISCMPayload(S2CPacket.MSPT_METRICS_SAMPLE.id, nbt);
+        for (ServerPlayer player : MinecraftServer.getServer().getPlayerList().getPlayers()) {
+            if (supports(player, S2CPacket.MSPT_METRICS_SAMPLE)) {
+                ProtocolUtils.sendPayloadPacket(player, payload);
+            }
+        }
+    }
+
+    @ProtocolHandler.PayloadReceiver(payload = TISCMPayload.class)
+    public static void handlePayload(ServerPlayer player, TISCMPayload payload) {
+        if (!GeneralCompatConfig.tiscmNetworkProtocol) {
+            return;
+        }
+
+        Optional<C2SPacket> packetType = C2SPacket.fromId(payload.packetId());
+        if (packetType.isEmpty()) {
+            return;
+        }
+
+        switch (packetType.get()) {
+            case HI -> handleHi(player, payload.nbt());
+            case SUPPORTED_S2C_PACKETS -> handleSupportedS2CPackets(player, payload.nbt());
+            default -> {
+            }
+        }
+    }
+
+    @ProtocolHandler.PlayerLeave
+    public static void onPlayerLeave(ServerPlayer player) {
+        CLIENT_SUPPORTED_PACKETS.remove(player.getStringUUID());
+    }
+
+    private static void handleHi(ServerPlayer player, CompoundTag payload) {
+        String platformName = payload.getString("platform_name").orElse("Unknown");
+        String platformVersion = payload.getString("platform_version").orElse("Unknown");
+        LOGGER.info("Player {} connected with TISCM protocol support ({} @ {})", player.getScoreboardName(), platformName, platformVersion);
+
+        send(player, S2CPacket.HELLO, nbt -> {
+            nbt.putString("platform_name", PLATFORM_NAME);
+            nbt.putString("platform_version", PLATFORM_VERSION);
+        });
+        send(player, S2CPacket.SUPPORTED_C2S_PACKETS, nbt -> nbt.put("supported_c2s_packets", stringList(List.of(
+                C2SPacket.HI.id,
+                C2SPacket.SUPPORTED_S2C_PACKETS.id
+        ))));
+    }
+
+    private static void handleSupportedS2CPackets(ServerPlayer player, CompoundTag payload) {
+        EnumSet<S2CPacket> packets = EnumSet.noneOf(S2CPacket.class);
+        ListTag listTag = payload.getListOrEmpty("supported_s2c_packets");
+        for (int i = 0; i < listTag.size(); i++) {
+            S2CPacket.fromId(listTag.getString(i).orElse("")).ifPresent(packets::add);
+        }
+        CLIENT_SUPPORTED_PACKETS.put(player.getStringUUID(), packets);
+    }
+
+    private static void send(ServerPlayer player, S2CPacket packet, PayloadBuilder builder) {
+        if (!supports(player, packet)) {
+            return;
+        }
+
+        CompoundTag nbt = new CompoundTag();
+        builder.accept(nbt);
+        ProtocolUtils.sendPayloadPacket(player, new TISCMPayload(packet.id, nbt));
+    }
+
+    private static boolean supports(ServerPlayer player, S2CPacket packet) {
+        if (packet.handshake) {
+            return true;
+        }
+
+        EnumSet<S2CPacket> packets = CLIENT_SUPPORTED_PACKETS.get(player.getStringUUID());
+        return packets != null && packets.contains(packet);
+    }
+
+    private static ListTag stringList(List<String> values) {
+        ListTag list = new ListTag();
+        for (String value : values) {
+            list.add(StringTag.valueOf(value));
+        }
+        return list;
+    }
+
+    @Override
+    public boolean isActive() {
+        return GeneralCompatConfig.tiscmNetworkProtocol;
+    }
+
+    private interface PayloadBuilder {
+        void accept(CompoundTag nbt);
+    }
+
+    public enum C2SPacket {
+        HI("hi", true),
+        SUPPORTED_S2C_PACKETS("supported_s2c_packets", true),
+        SPEED_TEST_UPLOAD_PAYLOAD("speed_test_upload_payload", false),
+        SPEED_TEST_PING("speed_test_ping", false);
+
+        private static final Map<String, C2SPacket> BY_ID = Arrays.stream(values()).collect(Collectors.toMap(packet -> packet.id, packet -> packet));
+
+        private final String id;
+        private final boolean handshake;
+
+        C2SPacket(String id, boolean handshake) {
+            this.id = id;
+            this.handshake = handshake;
+        }
+
+        public static Optional<C2SPacket> fromId(String id) {
+            return Optional.ofNullable(BY_ID.get(id));
+        }
+    }
+
+    public enum S2CPacket {
+        HELLO("hello", true),
+        SUPPORTED_C2S_PACKETS("supported_c2s_packets", true),
+        MSPT_METRICS_SAMPLE("mspt_metrics_sample", false),
+        SPEED_TEST_DOWNLOAD_PAYLOAD("speed_test_download_payload", false),
+        SPEED_TEST_UPLOAD_REQUEST("speed_test_upload_request", false),
+        SPEED_TEST_PING("speed_test_ping", false),
+        SPEED_TEST_ABORT("speed_test_abort", false);
+
+        private static final Map<String, S2CPacket> BY_ID = Arrays.stream(values()).collect(Collectors.toMap(packet -> packet.id, packet -> packet));
+
+        private final String id;
+        private final boolean handshake;
+
+        S2CPacket(String id, boolean handshake) {
+            this.id = id;
+            this.handshake = handshake;
+        }
+
+        public static Optional<S2CPacket> fromId(String id) {
+            return Optional.ofNullable(BY_ID.get(id));
+        }
+    }
+
+    public record TISCMPayload(String packetId, CompoundTag nbt) implements LeavesCustomPayload {
+        @ID
+        private static final Identifier NETWORK_ID = TISCMProtocol.id("network/v1");
+
+        @Codec
+        private static final StreamCodec<RegistryFriendlyByteBuf, TISCMPayload> CODEC = StreamCodec.composite(
+                ByteBufCodecs.STRING_UTF8,
+                TISCMPayload::packetId,
+                ByteBufCodecs.COMPOUND_TAG,
+                TISCMPayload::nbt,
+                TISCMPayload::new
+        );
+    }
+}
@@ -2,6 +2,9 @@ package fun.bm.lophine.utils;

 import ca.spottedleaf.moonrise.common.list.ReferenceList;
 import ca.spottedleaf.moonrise.common.misc.PositionCountingAreaMap;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.mojang.logging.LogUtils;
 import fun.bm.lophine.config.modules.experiment.GlobalEntitiesCounter;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.minecraft.core.BlockPos;
@@ -18,25 +21,27 @@ import net.minecraft.world.level.biome.MobSpawnSettings;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.jetbrains.annotations.Nullable;

-import java.util.HashSet;
-import java.util.Set;
-import java.util.WeakHashMap;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;

 import static net.minecraft.world.level.NaturalSpawner.getRoughBiome;

 public class EntitiesCounterUtil {
-    private static final WeakHashMap<ServerLevel, WeakHashMap<Integer, ReferenceList<Entity>>> globalLoadedEntities = new WeakHashMap<>();
-    private static final WeakHashMap<ServerLevel, Object2IntOpenHashMap<MobCategory>> mobsMap = new WeakHashMap<>();
-    private static final WeakHashMap<ServerLevel, WeakHashMap<Integer, PositionCountingAreaMap<ServerPlayer>>> mobsAreaMap = new WeakHashMap<>();
-    private static final WeakHashMap<ServerLevel, Integer> spawnableChunkCount = new WeakHashMap<>();
-    private static final WeakHashMap<ServerLevel, CompletableFuture<Void>> tasks = new WeakHashMap<>();
-    private static final Set<Integer> UniqueIds = new HashSet<>();
+    private static final Map<ServerLevel, Cache<Integer, ReferenceList<Entity>>> globalLoadedEntities = new ConcurrentHashMap<>();
+    private static final Map<ServerLevel, Object2IntOpenHashMap<MobCategory>> mobsMap = Collections.synchronizedMap(new WeakHashMap<>());
+    private static final Map<ServerLevel, Cache<Integer, PositionCountingAreaMap<ServerPlayer>>> mobsAreaMap = new ConcurrentHashMap<>();
+    private static final Map<ServerLevel, Integer> spawnableChunkCount = new ConcurrentHashMap<>();
+    private static final Map<ServerLevel, CompletableFuture<Void>> tasks = new ConcurrentHashMap<>();
+    private static final Set<Integer> UniqueIds = ConcurrentHashMap.newKeySet();

    private static int lastUsedId = 0;

+    private static final int CLEANUP_INTERVAL = 200; // each 200 ids used
+
    public static int generateUniqueId() {
        synchronized (UniqueIds) {
+            if (lastUsedId % CLEANUP_INTERVAL == 0) runCleanUp();
            int id = lastUsedId;
            while (UniqueIds.contains(id)) {
                id++;
@@ -49,26 +54,39 @@ public class EntitiesCounterUtil {
    }

    public static void onWorldDataUnload(ServerLevel level, int uniqueId) {
-        synchronized (UniqueIds) {
-            UniqueIds.remove(uniqueId);
+        UniqueIds.remove(uniqueId);
+        Cache<Integer, ReferenceList<Entity>> entitiesCache = globalLoadedEntities.get(level);
+        if (entitiesCache != null) {
+            entitiesCache.invalidate(uniqueId);
        }
-        synchronized (globalLoadedEntities) {
-            globalLoadedEntities.get(level).remove(uniqueId);
+
+        Cache<Integer, PositionCountingAreaMap<ServerPlayer>> areaCache = mobsAreaMap.get(level);
+        if (areaCache != null) {
+            areaCache.invalidate(uniqueId);
        }
-        synchronized (mobsAreaMap) {
-            mobsAreaMap.get(level).remove(uniqueId);
+    }
+
+    private static void runCleanUp() {
+        Set<Integer> logged = new HashSet<>();
+        for (Cache<Integer, ReferenceList<Entity>> collection : globalLoadedEntities.values()) {
+            logged.addAll(collection.asMap().keySet());
+        }
+
+        for (int num : UniqueIds) {
+            if (logged.contains(num)) continue;
+            UniqueIds.remove(num);
        }
    }

    public static void addDataToLoaded(ServerLevel level, ReferenceList<Entity> data, int uniqueId) {
-        WeakHashMap<Integer, ReferenceList<Entity>> data0 = globalLoadedEntities.computeIfAbsent(level, k -> new WeakHashMap<>());
-        if (data0.containsKey(uniqueId)) return;
+        Cache<Integer, ReferenceList<Entity>> data0 = globalLoadedEntities.computeIfAbsent(level, k -> CacheBuilder.newBuilder().concurrencyLevel(16).weakValues().build());
+        if (data0.asMap().containsKey(uniqueId)) return;
        data0.put(uniqueId, data);
    }

    public static void reportAreaMap(ServerLevel level, PositionCountingAreaMap<ServerPlayer> areaMap, int uniqueId) {
-        WeakHashMap<Integer, PositionCountingAreaMap<ServerPlayer>> areaMap0 = mobsAreaMap.computeIfAbsent(level, k -> new WeakHashMap<>());
-        if (areaMap0.containsKey(uniqueId)) return;
+        Cache<Integer, PositionCountingAreaMap<ServerPlayer>> areaMap0 = mobsAreaMap.computeIfAbsent(level, k -> CacheBuilder.newBuilder().concurrencyLevel(16).weakValues().build());
+        if (areaMap0.asMap().containsKey(uniqueId)) return;
        areaMap0.put(uniqueId, areaMap);
    }

@@ -87,39 +105,53 @@ public class EntitiesCounterUtil {

    public static void tick(ServerLevel level) {
        Runnable task = () -> {
-            WeakHashMap<Integer, ReferenceList<Entity>> data0 = globalLoadedEntities.get(level);
-            Object2IntOpenHashMap<MobCategory> map = new Object2IntOpenHashMap<>();
-            for (ReferenceList<Entity> data : data0.values()) {
-                for (Entity entity : GlobalEntitiesCounter.enabled ? data.copy() : data) {
-                    if (entity == null || entity.isRemoved() || !entity.isAlive()) continue;
-                    // Lophine start - Copy from net/minecraft/world/level/NaturalSpawner
-                    MobCategory category = entity.getType().getCategory();
-                    if (category != MobCategory.MISC) {
-                        // Paper start - Only count natural spawns
-                        if (!entity.level().paperConfig().entities.spawning.countAllMobsForSpawning &&
-                                !(entity.spawnReason == CreatureSpawnEvent.SpawnReason.NATURAL ||
-                                        entity.spawnReason == CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
-                            continue;
+            try {
+                Cache<Integer, ReferenceList<Entity>> data0 = globalLoadedEntities.get(level);
+                if (data0 == null) return;
+
+                Object2IntOpenHashMap<MobCategory> map = new Object2IntOpenHashMap<>();
+                Collection<ReferenceList<Entity>> snapshot = data0.asMap().values();
+
+                for (ReferenceList<Entity> data : snapshot) {
+                    if (data == null) continue;
+                    for (Entity entity : GlobalEntitiesCounter.async ? data.copy() : data) {
+                        if (entity == null || entity.isRemoved() || !entity.isAlive()) continue;
+                        // Lophine start - Copy from net/minecraft/world/level/NaturalSpawner
+                        MobCategory category = entity.getType().getCategory();
+                        if (category != MobCategory.MISC) {
+                            // Paper start - Only count natural spawns
+                            if (!entity.level().paperConfig().entities.spawning.countAllMobsForSpawning &&
+                                    !(entity.spawnReason == CreatureSpawnEvent.SpawnReason.NATURAL ||
+                                            entity.spawnReason == CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
+                                continue;
+                            }
+                            // Paper end - Only count natural spawns
+                            map.addTo(category, 1);
                        }
-                        // Paper end - Only count natural spawns
-                        map.addTo(category, 1);
                    }
-                    // Lophine start - Copy from net/minecraft/world/level/NaturalSpawner
+                    // Lophine end - Copy from net/minecraft/world/level/NaturalSpawner
                }
-            }
-            mobsMap.put(level, map);
-            for (ServerLevel world : mobsAreaMap.keySet()) {
-                int count = 0;
-                WeakHashMap<Integer, PositionCountingAreaMap<ServerPlayer>> collection = mobsAreaMap.get(level);
-                if (collection == null) continue;
-                for (PositionCountingAreaMap<ServerPlayer> areaMap : collection.values()) {
-                    count += areaMap.getTotalPositions();
+                mobsMap.put(level, map);
+
+                Cache<Integer, PositionCountingAreaMap<ServerPlayer>> collection = mobsAreaMap.get(level);
+                if (collection != null) {
+                    int count = 0;
+                    for (PositionCountingAreaMap<ServerPlayer> areaMap : collection.asMap().values()) {
+                        if (areaMap != null) {
+                            count += areaMap.getTotalPositions();
+                        }
+                    }
+                    spawnableChunkCount.put(level, count);
                }
-                spawnableChunkCount.put(world, count);
+            } catch (Exception e) {
+                LogUtils.getClassLogger().error("Failed to run task", e);
            }
        };
        if (GlobalEntitiesCounter.async) {
-            tasks.put(level, CompletableFuture.runAsync(task));
+            tasks.put(level, CompletableFuture.runAsync(task).exceptionally(ex -> {
+                LogUtils.getClassLogger().error("Failed to run task", ex);
+                return null;
+            }));
        } else {
            task.run();
        }
@@ -0,0 +1,59 @@
+package fun.bm.lophine.utils;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.mojang.authlib.GameProfile;
+import fun.bm.lophine.config.modules.function.ReplayAPIConfig;
+
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+public class RandomProfilePool {
+    private static int lastUsedId = 0;
+    private static final Object lock = new Object();
+    private static Cache<Integer, GameProfile> cache;
+    private static final Object lockCache = new Object();
+
+    public static void init() {
+        if (ReplayAPIConfig.enableCache) {
+            cache = CacheBuilder.newBuilder()
+                    .maximumSize(ReplayAPIConfig.cachePhotographerSize)
+                    .expireAfterWrite(ReplayAPIConfig.cachePhotographerTime, TimeUnit.SECONDS)
+                    .build();
+        }
+    }
+
+    public static GameProfile getRandomProfile(String id) {
+        if (ReplayAPIConfig.enableCache) {
+            synchronized (lockCache) {
+                for (Map.Entry<Integer, GameProfile> entry : cache.asMap().entrySet()) {
+                    int key = entry.getKey();
+                    cache.invalidate(key);
+                    GameProfile gp = entry.getValue();
+                    return new GameProfile(gp.id(), id, gp.properties());
+                }
+            }
+        }
+        return new GameProfile(UUID.randomUUID(), id);
+    }
+
+    public static void putProfile(GameProfile profile) {
+        if (ReplayAPIConfig.enableCache) {
+            synchronized (lockCache) {
+                cache.put(getNextId(), profile);
+            }
+        }
+    }
+
+    private static int getNextId() {
+        synchronized (lock) {
+            int newId = lastUsedId + 1;
+            while (cache.getIfPresent(newId) != null) {
+                newId++;
+            }
+            lastUsedId = newId;
+            return newId;
+        }
+    }
+}
@@ -0,0 +1,88 @@
+package fun.bm.lophine.utils;
+
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.datafixers.util.Pair;
+import fun.bm.lophine.config.modules.experiment.CommandConfig;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.commands.SaveAllCommand;
+import net.minecraft.server.level.ServerLevel;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class SaveAllUtil {
+    public static final Object lock = new Object();
+    public static volatile long lastSaveAllTime = 0;
+    private static volatile Pair<CommandSourceStack, Boolean> currentSaveAll = null;
+    private static volatile int regionCount = 0;
+    private static final AtomicInteger savedRegionCount = new AtomicInteger(0);
+    private static final AtomicBoolean withError = new AtomicBoolean(false);
+
+    public static void preSaveAll(CommandSourceStack source, boolean flush) {
+        synchronized (lock) {
+            if (isSaving()) {
+                source.sendFailure(Component.literal("Server is already in saving! Please wait..."));
+            } else {
+                source.sendSuccess(() -> Component.translatable("commands.save.saving"), false);
+                currentSaveAll = Pair.of(source, flush);
+                // we need to count how many regions we need to save
+                AtomicInteger count = new AtomicInteger();
+                for (ServerLevel world : source.getServer().getAllLevels()) {
+                    world.regioniser.computeForAllRegions(unused -> count.getAndIncrement());
+                }
+                regionCount = count.get();
+                savedRegionCount.set(0);
+                withError.set(false);
+                lastSaveAllTime = System.currentTimeMillis();
+            }
+        }
+    }
+
+    public static void postRegionSave(io.papermc.paper.threadedregions.TickRegions.TickRegionData region) {
+        Pair<CommandSourceStack, Boolean> currentSaveAll = SaveAllUtil.currentSaveAll;
+        synchronized (lock) {
+            if (lastSaveAllTime < region.lastSavedTime) return; // already saved
+        }
+        try {
+            region.world.moonrise$getChunkTaskScheduler().chunkHolderManager.saveAllChunksRegionised(currentSaveAll.getSecond(), false, CommandConfig.logAllProcess, false, false, true, false);
+            currentSaveAll.getFirst().getServer().getPlayerList().saveAll();
+            MinecraftServer.LOGGER.info("Saved chunks in region around chunk {} in world '{}'", region.region.getCenterChunk(), region.region.regioniser.world.getWorld().getName());
+        } catch (final Throwable thr) {
+            CommandSyntaxException error = SaveAllCommand.getErrorFailed().create();
+            currentSaveAll.getFirst().sendFailure(Component.literal(error.getMessage()));
+            MinecraftServer.LOGGER.error(error.getMessage(), thr);
+            withError.set(true);
+        }
+        region.lastSavedTime = System.currentTimeMillis();
+        int saved;
+        synchronized (savedRegionCount) {
+            saved = savedRegionCount.incrementAndGet();
+        }
+        if (saved >= regionCount) {
+            if (withError.get()) {
+                currentSaveAll.getFirst().sendFailure(Component.literal("At least one region failed to save!"));
+            } else if (saved == regionCount) {
+                currentSaveAll.getFirst().sendSuccess(() -> Component.translatable("commands.save.success"), true);
+                SaveAllUtil.currentSaveAll = null;
+            }
+        }
+    }
+
+    public static void checkTimeout() {
+        Pair<CommandSourceStack, Boolean> currentSaveAll = SaveAllUtil.currentSaveAll;
+        if (!isSaving()) return;
+        if (System.currentTimeMillis() - lastSaveAllTime > CommandConfig.saveAllTimeout) {
+            currentSaveAll.getFirst().sendFailure(Component.literal("At least one region save data timeout!"));
+            currentSaveAll.getFirst().sendFailure(Component.literal("Regions need to save expect is " + regionCount + ", but only " + savedRegionCount.get() + " saved!"));
+            SaveAllUtil.currentSaveAll = null;
+        }
+    }
+
+    public static boolean isSaving() {
+        synchronized (lock) {
+            return currentSaveAll != null;
+        }
+    }
+}
@@ -62,7 +62,7 @@ public class ServerI18nUtil {
        }
        langPath = BASE_PATH + "lang/" + LanguageConfig.lang + ".json";
        langJsonPath = "minecraft/lang/" + LanguageConfig.lang + ".json";
-        lophineLangPath = "/assets/Lophine/lang/" + LanguageConfig.lang + ".json";
+        lophineLangPath = "/assets/lophine/lang/" + LanguageConfig.lang + ".json";
        logger.info("Starting load language: {}", LanguageConfig.lang);
        preloadTask.thenAcceptAsync(v -> loadI18n(LanguageConfig.lang, 2));
    }
@@ -82,7 +82,7 @@ public class ServerI18nUtil {
        } catch (UnsupportedLanguageException e) {
            logger.warn("Unsupported language: {}", LanguageConfig.lang);
            // Fallback to English
-            final ConfigsInstance configsInstance = ConfigManager.configfiles.get("lophine");
+            final ConfigsInstance configsInstance = ConfigManager.getConfigs("lophine");
            configsInstance.setConfig(new String[]{"function", "language", "lang"}, "en_us");
            configsInstance.reloadAsync(true);
        } catch (Exception e) {
@@ -1,38 +0,0 @@
-package fun.bm.lophine.utils.concurrent;
-
-import java.util.List;
-import java.util.Map;
-
-public abstract class AbstractConcurrentTable<X, Y, Z> {
-    public abstract void putOrUpdate(X x, Y y, Z z);
-
-    public abstract void put(X x, Y y, Z z);
-
-    public abstract void remove(X x, Y y, Z z);
-
-    public abstract List<Z> getZ(X x, Y y);
-
-    public abstract List<Y> getY(X x, Z z);
-
-    public abstract List<X> getX(Y y, Z z);
-
-    public abstract List<Map.Entry<X, Y>> getXY(Z z);
-
-    public abstract List<Map.Entry<Y, Z>> getYZ(X x);
-
-    public abstract List<Map.Entry<X, Z>> getXZ(Y y);
-
-    public abstract List<X> getAllX();
-
-    public abstract List<Y> getAllY();
-
-    public abstract List<Z> getAllZ();
-
-    public abstract void clearXY(Z z);
-
-    public abstract void clearYZ(X x);
-
-    public abstract void clearXZ(Y y);
-
-    public abstract void clearAll();
-}
@@ -1,150 +0,0 @@
-package fun.bm.lophine.utils.concurrent;
-
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.function.Predicate;
-
-public class ConcurrentTable<X, Y, Z> extends AbstractConcurrentTable<X, Y, Z> {
-    protected final ConcurrentLinkedDeque<TableEntry<X, Y, Z>> data = new ConcurrentLinkedDeque<>();
-
-    @Override
-    public void putOrUpdate(X x, Y y, Z z) {
-        for (TableEntry<X, Y, Z> entry : data) {
-            if (entry.getX().equals(x) && entry.getY().equals(y)) {
-                entry.setZ(z);
-                return;
-            }
-        }
-        this.put(x, y, z);
-    }
-
-    @Override
-    public void put(X x, Y y, Z z) {
-        data.add(new TableEntry<>(x, y, z));
-    }
-
-    @Override
-    public void remove(X x, Y y, Z z) {
-        data.removeIf(entry -> entry.getX().equals(x) && entry.getY().equals(y) && entry.getZ().equals(z));
-    }
-
-    @Override
-    public List<Z> getZ(X x, Y y) {
-        return filterAndCollect(
-                entry -> entry.getX().equals(x) && entry.getY().equals(y),
-                TableEntry::getZ
-        );
-    }
-
-    @Override
-    public List<Y> getY(X x, Z z) {
-        return filterAndCollect(
-                entry -> entry.getX().equals(x) && entry.getZ().equals(z),
-                TableEntry::getY
-        );
-    }
-
-    @Override
-    public List<X> getX(Y y, Z z) {
-        return filterAndCollect(
-                entry -> entry.getY().equals(y) && entry.getZ().equals(z),
-                TableEntry::getX
-        );
-    }
-
-    @Override
-    public List<Map.Entry<X, Y>> getXY(Z z) {
-        return filterAndMap(
-                entry -> entry.getZ().equals(z),
-                TableEntry::getX,
-                TableEntry::getY
-        );
-    }
-
-    @Override
-    public List<Map.Entry<Y, Z>> getYZ(X x) {
-        return filterAndMap(
-                entry -> entry.getX().equals(x),
-                TableEntry::getY,
-                TableEntry::getZ
-        );
-    }
-
-    @Override
-    public List<Map.Entry<X, Z>> getXZ(Y y) {
-        return filterAndMap(
-                entry -> entry.getY().equals(y),
-                TableEntry::getX,
-                TableEntry::getZ
-        );
-    }
-
-    @Override
-    public List<X> getAllX() {
-        return collectAll(TableEntry::getX);
-    }
-
-    @Override
-    public List<Y> getAllY() {
-        return collectAll(TableEntry::getY);
-    }
-
-    @Override
-    public List<Z> getAllZ() {
-        return collectAll(TableEntry::getZ);
-    }
-
-    @Override
-    public void clearXY(Z z) {
-        data.removeIf(entry -> entry.getZ().equals(z));
-    }
-
-    @Override
-    public void clearYZ(X x) {
-        data.removeIf(entry -> entry.getX().equals(x));
-    }
-
-    @Override
-    public void clearXZ(Y y) {
-        data.removeIf(entry -> entry.getY().equals(y));
-    }
-
-    @Override
-    public void clearAll() {
-        data.clear();
-    }
-
-    private <T> List<T> filterAndCollect(Predicate<TableEntry<X, Y, Z>> filter,
-                                         java.util.function.Function<TableEntry<X, Y, Z>, T> mapper) {
-        List<T> result = new ArrayList<>();
-        for (TableEntry<X, Y, Z> entry : data) {
-            if (filter.test(entry)) {
-                result.add(mapper.apply(entry));
-            }
-        }
-        return result;
-    }
-
-    private <K, V> List<Map.Entry<K, V>> filterAndMap(Predicate<TableEntry<X, Y, Z>> filter,
-                                                      java.util.function.Function<TableEntry<X, Y, Z>, K> keyMapper,
-                                                      java.util.function.Function<TableEntry<X, Y, Z>, V> valueMapper) {
-        List<Map.Entry<K, V>> list = new ArrayList<>();
-        for (TableEntry<X, Y, Z> entry : data) {
-            if (filter.test(entry)) {
-                list.add(new AbstractMap.SimpleEntry<>(keyMapper.apply(entry), valueMapper.apply(entry)));
-            }
-        }
-        return list;
-    }
-
-    private <T> List<T> collectAll(java.util.function.Function<TableEntry<X, Y, Z>, T> mapper) {
-        List<T> result = new ArrayList<>();
-        for (TableEntry<X, Y, Z> entry : data) {
-            result.add(mapper.apply(entry));
-        }
-        return result;
-    }
-}
@@ -1,197 +0,0 @@
-package fun.bm.lophine.utils.concurrent;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.BiFunction;
-import java.util.function.Predicate;
-
-public class OptimizedConcurrentTable<X, Y, Z> extends ConcurrentTable<X, Y, Z> {
-    private final ConcurrentHashMap<X, ConcurrentHashMap<Y, Set<Z>>> xyIndex = new ConcurrentHashMap<>();
-    private final ConcurrentHashMap<Y, ConcurrentHashMap<Z, Set<X>>> yzIndex = new ConcurrentHashMap<>();
-    private final ConcurrentHashMap<Z, ConcurrentHashMap<X, Set<Y>>> zxIndex = new ConcurrentHashMap<>();
-
-    @Override
-    public void putOrUpdate(X x, Y y, Z z) {
-        boolean updated = false;
-
-        for (TableEntry<X, Y, Z> entry : data) {
-            if (entry.getX().equals(x) && entry.getY().equals(y)) {
-                removeFromIndex(xyIndex, entry.getX(), entry.getY(), entry.getZ());
-                removeFromIndex(yzIndex, entry.getY(), entry.getZ(), entry.getX());
-                removeFromIndex(zxIndex, entry.getZ(), entry.getX(), entry.getY());
-
-                entry.setZ(z);
-
-                putData(x, y, z);
-
-                updated = true;
-                break;
-            }
-        }
-
-        if (!updated) {
-            this.put(x, y, z);
-        }
-    }
-
-    private void putData(X x, Y y, Z z) {
-        xyIndex.computeIfAbsent(x, k -> new ConcurrentHashMap<>())
-                .computeIfAbsent(y, k -> ConcurrentHashMap.newKeySet()).add(z);
-        yzIndex.computeIfAbsent(y, k -> new ConcurrentHashMap<>())
-                .computeIfAbsent(z, k -> ConcurrentHashMap.newKeySet()).add(x);
-        zxIndex.computeIfAbsent(z, k -> new ConcurrentHashMap<>())
-                .computeIfAbsent(x, k -> ConcurrentHashMap.newKeySet()).add(y);
-    }
-
-
-    @Override
-    public void put(X x, Y y, Z z) {
-        super.put(x, y, z);
-        putData(x, y, z);
-    }
-
-    @Override
-    public void remove(X x, Y y, Z z) {
-        super.remove(x, y, z);
-        removeFromIndex(xyIndex, x, y, z);
-        removeFromIndex(yzIndex, y, z, x);
-        removeFromIndex(zxIndex, z, x, y);
-    }
-
-    private <K, V, T> void removeFromIndex(ConcurrentHashMap<K, ConcurrentHashMap<V, Set<T>>> index,
-                                           K key1, V key2, T value) {
-        index.computeIfPresent(key1, (k, map) -> {
-            map.computeIfPresent(key2, (k2, set) -> {
-                set.remove(value);
-                return set.isEmpty() ? null : set;
-            });
-            return map.isEmpty() ? null : map;
-        });
-    }
-
-    public void removeAll(Predicate<TableEntry<X, Y, Z>> predicate) {
-        data.removeIf(entry -> {
-            boolean shouldRemove = predicate.test(entry);
-            if (shouldRemove) {
-                removeFromIndex(xyIndex, entry.getX(), entry.getY(), entry.getZ());
-                removeFromIndex(yzIndex, entry.getY(), entry.getZ(), entry.getX());
-                removeFromIndex(zxIndex, entry.getZ(), entry.getX(), entry.getY());
-            }
-            return shouldRemove;
-        });
-    }
-
-    public boolean putIfAbsent(X x, Y y, Z z) {
-        if (data.stream().anyMatch(entry ->
-                Objects.equals(entry.getX(), x) &&
-                        Objects.equals(entry.getY(), y) &&
-                        Objects.equals(entry.getZ(), z))) {
-            return false;
-        }
-        put(x, y, z);
-        return true;
-    }
-
-    @Override
-    public List<Z> getZ(X x, Y y) {
-        Set<Z> result = xyIndex.getOrDefault(x, new ConcurrentHashMap<>()).get(y);
-        return result != null ? new ArrayList<>(result) : new ArrayList<>();
-    }
-
-    @Override
-    public List<Y> getY(X x, Z z) {
-        Set<Y> result = zxIndex.getOrDefault(z, new ConcurrentHashMap<>()).get(x);
-        return result != null ? new ArrayList<>(result) : new ArrayList<>();
-    }
-
-    public List<X> getX(Y y, Z z) {
-        Set<X> result = yzIndex.getOrDefault(y, new ConcurrentHashMap<>()).get(z);
-        return result != null ? new ArrayList<>(result) : new ArrayList<>();
-    }
-
-    @Override
-    public List<Map.Entry<X, Y>> getXY(Z z) {
-        return buildDataFromIndex(zxIndex.get(z));
-    }
-
-    @Override
-    public List<Map.Entry<Y, Z>> getYZ(X x) {
-        return buildDataFromIndex(xyIndex.get(x));
-    }
-
-    @Override
-    public List<Map.Entry<X, Z>> getXZ(Y y) {
-        return reverseDataFromIndex(yzIndex.get(y));
-    }
-
-    @Override
-    public List<X> getAllX() {
-        Set<X> resultSet = new HashSet<>(xyIndex.keySet());
-        return new ArrayList<>(resultSet);
-    }
-
-    @Override
-    public List<Y> getAllY() {
-        Set<Y> resultSet = new HashSet<>(yzIndex.keySet());
-        return new ArrayList<>(resultSet);
-    }
-
-    @Override
-    public List<Z> getAllZ() {
-        Set<Z> resultSet = new HashSet<>(zxIndex.keySet());
-        return new ArrayList<>(resultSet);
-    }
-
-
-    @Override
-    public void clearXY(Z z) {
-        super.clearXY(z);
-        zxIndex.remove(z);
-    }
-
-    @Override
-    public void clearYZ(X x) {
-        super.clearYZ(x);
-        xyIndex.remove(x);
-    }
-
-    @Override
-    public void clearXZ(Y y) {
-        super.clearXZ(y);
-        yzIndex.remove(y);
-    }
-
-    @Override
-    public void clearAll() {
-        super.clearAll();
-        xyIndex.clear();
-        yzIndex.clear();
-        zxIndex.clear();
-    }
-
-
-    private <K, V, R> List<R> buildEntriesFromIndex(ConcurrentHashMap<K, Set<V>> indexMap,
-                                                    BiFunction<K, V, R> entryCreator) {
-        List<R> result = new ArrayList<>();
-        if (indexMap != null) {
-            for (Map.Entry<K, Set<V>> entry : indexMap.entrySet()) {
-                K key = entry.getKey();
-                Set<V> valueSet = entry.getValue();
-                if (valueSet != null && !valueSet.isEmpty()) {
-                    for (V value : valueSet) {
-                        result.add(entryCreator.apply(key, value));
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    private <K, V> List<Map.Entry<K, V>> buildDataFromIndex(ConcurrentHashMap<K, Set<V>> indexMap) {
-        return buildEntriesFromIndex(indexMap, AbstractMap.SimpleEntry::new);
-    }
-
-    private <K, V> List<Map.Entry<V, K>> reverseDataFromIndex(ConcurrentHashMap<K, Set<V>> indexMap) {
-        return buildEntriesFromIndex(indexMap, (key, value) -> new AbstractMap.SimpleEntry<>(value, key));
-    }
-}
@@ -1,29 +0,0 @@
-package fun.bm.lophine.utils.concurrent;
-
-public class TableEntry<X, Y, Z> {
-    private final X x;
-    private final Y y;
-    private Z z;
-
-    public TableEntry(X x, Y y, Z z) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-
-    public X getX() {
-        return x;
-    }
-
-    public Y getY() {
-        return y;
-    }
-
-    public Z getZ() {
-        return z;
-    }
-
-    public void setZ(Z z) {
-        this.z = z;
-    }
-}
@@ -17,7 +17,6 @@

 package org.leavesmc.leaves.bot;

-import fun.bm.lophine.config.modules.function.FakeplayerConfig;
 import net.minecraft.server.MinecraftServer;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -33,7 +32,7 @@ import org.leavesmc.leaves.plugin.MinecraftInternalPlugin;
 import java.util.Objects;
 import java.util.function.Consumer;

-public record BotCreateState(String realName, String name, String skinName, String[] skin, Location location,
+public record BotCreateState(String rawName, String fullName, String skinName, String[] skin, Location location,
                             BotCreateEvent.CreateReason createReason, CommandSender creator) {

    private static final MinecraftServer server = MinecraftServer.getServer();
@@ -43,15 +42,15 @@ public record BotCreateState(String realName, String name, String skinName, Stri
    }

    @NotNull
-    public static Builder builder(@NotNull String realName, @Nullable Location location) {
-        return new Builder(realName, location);
+    public static Builder builder(@NotNull String rawName, @Nullable Location location) {
+        return new Builder(rawName, location);
    }

    public static class Builder implements BotCreator {

-        private final String realName;
+        private final String rawName; // For internal calculation, use it as little as possible

-        private String name;
+        private String fullName;
        private Location location;

        private String skinName;
@@ -60,14 +59,14 @@ public record BotCreateState(String realName, String name, String skinName, Stri
        private BotCreateEvent.CreateReason createReason;
        private CommandSender creator;

-        private Builder(@NotNull String realName, @Nullable Location location) {
-            Objects.requireNonNull(realName);
+        private Builder(@NotNull String rawName, @Nullable Location location) {
+            Objects.requireNonNull(rawName);

-            this.realName = realName;
+            this.rawName = rawName;
            this.location = location;

-            this.name = FakeplayerConfig.prefix + realName + FakeplayerConfig.suffix;
-            this.skinName = this.realName;
+            this.fullName = BotUtil.getFullName(rawName);
+            this.skinName = this.rawName;
            this.skin = null;
            this.createReason = BotCreateEvent.CreateReason.UNKNOWN;
            this.creator = null;
@@ -75,7 +74,7 @@ public record BotCreateState(String realName, String name, String skinName, Stri

        public Builder name(@NotNull String name) {
            Objects.requireNonNull(name);
-            this.name = name;
+            this.fullName = name;
            return this;
        }

@@ -113,31 +112,24 @@ public record BotCreateState(String realName, String name, String skinName, Stri
        }

        public BotCreateState build() {
-            return new BotCreateState(realName, name, skinName, skin, location, createReason, creator);
+            return new BotCreateState(rawName, fullName, skinName, skin, location, createReason, creator);
        }

        public void spawnWithSkin(Consumer<Bot> consumer) {
-            Bukkit.getRegionScheduler().execute(
-                    MinecraftInternalPlugin.INSTANCE,
-                    location.getWorld(),
-                    location.getBlockX() >> 4,
-                    location.getBlockZ() >> 4,
-                    () -> {
-                        this.mojangAPISkin();
-                        Bukkit.getRegionScheduler().execute(
-                                MinecraftInternalPlugin.INSTANCE,
-                                location.getWorld(),
-                                location.getBlockX() >> 4,
-                                location.getBlockZ() >> 4,
-                                () -> {
-                                    CraftBot bot = this.spawn();
-                                    if (bot != null && consumer != null) {
-                                        consumer.accept(bot);
-                                    }
-                                }
-                        );
-                    }
-            );
+            Bukkit.getAsyncScheduler().runNow(MinecraftInternalPlugin.INSTANCE, (task0) -> {
+                this.mojangAPISkin();
+                Bukkit.getRegionScheduler().execute(
+                        MinecraftInternalPlugin.INSTANCE,
+                        location.getWorld(),
+                        location.getBlockX() >> 4,
+                        location.getBlockZ() >> 4,
+                        () -> {
+                            CraftBot bot = this.spawn();
+                            if (bot != null && consumer != null) {
+                                consumer.accept(bot);
+                            }
+                        });
+            });
        }

        @Nullable
@@ -36,10 +36,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Optional;

-public class BotDataStorage implements IPlayerDataStorage {
-
-    private static final LevelResource BOT_DATA_DIR = new LevelResource("fakeplayerdata");
-    private static final LevelResource BOT_LIST_FILE = new LevelResource("fakeplayer.dat");
+public class BotDataStorage {

    private static final Logger LOGGER = LogUtils.getLogger();
    private final File botDir;
@@ -47,9 +44,9 @@ public class BotDataStorage implements IPlayerDataStorage {

    private CompoundTag savedBotList;

-    public BotDataStorage(LevelStorageSource.@NotNull LevelStorageAccess session) {
-        this.botDir = session.getLevelPath(BOT_DATA_DIR).toFile();
-        this.botListFile = session.getLevelPath(BOT_LIST_FILE).toFile();
+    public BotDataStorage(LevelStorageSource.@NotNull LevelStorageAccess session, String dataDir, String listFileName) {
+        this.botDir = session.getLevelPath(new LevelResource(dataDir)).toFile();
+        this.botListFile = session.getLevelPath(new LevelResource(listFileName)).toFile();
        this.botDir.mkdirs();

        this.savedBotList = new CompoundTag();
@@ -62,7 +59,6 @@ public class BotDataStorage implements IPlayerDataStorage {
        }
    }

-    @Override
    public void save(Player player) {
        boolean flag = true;
        try {
@@ -85,22 +81,27 @@ public class BotDataStorage implements IPlayerDataStorage {

        if (flag && player instanceof ServerBot bot) {
            CompoundTag nbt = new CompoundTag();
-            nbt.putString("name", bot.createState.name());
+            nbt.putString("name", bot.createState.fullName());
            nbt.store("uuid", UUIDUtil.CODEC, bot.getUUID());
            nbt.putBoolean("resume", bot.resume);
-            this.savedBotList.put(bot.createState.realName(), nbt);
+            this.savedBotList.put(bot.createState.fullName(), nbt);
            this.saveBotList();
        }
    }

-    public Optional<ValueInput> load(Player player, ProblemReporter reporter) {
-        return this.load(player.getScoreboardName(), player.getStringUUID()).map(nbt -> {
-            ValueInput valueInput = TagValueInput.create(reporter, player.registryAccess(), nbt);
-            player.load(valueInput);
+
+    public Optional<ValueInput> load(@NotNull ServerBot bot, ProblemReporter reporter) {
+        return this.load(bot.nameAndId().name(), bot.nameAndId().id().toString()).map(nbt -> {
+            ValueInput valueInput = TagValueInput.create(reporter, bot.registryAccess(), nbt);
+            bot.load(valueInput);
            return valueInput;
        });
    }

+    public void removeSavedData(@NotNull ServerBot bot) {
+        this.load(bot.nameAndId().name(), bot.nameAndId().id().toString());
+    }
+
    private Optional<CompoundTag> load(String name, String uuid) {
        File file = new File(this.botDir, uuid + ".dat");

@@ -21,13 +21,14 @@ import ca.spottedleaf.moonrise.common.util.TickThread;
 import com.google.common.collect.Maps;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
-import com.mojang.authlib.properties.PropertyMap;
 import com.mojang.logging.LogUtils;
 import fun.bm.lophine.config.modules.function.FakeplayerConfig;
+import fun.bm.lophine.config.modules.function.OldFeatureConfig;
 import io.papermc.paper.adventure.PaperAdventure;
 import io.papermc.paper.profile.MutablePropertyMap;
 import io.papermc.paper.threadedregions.RegionizedServer;
 import io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler;
+import io.papermc.paper.util.MCUtil;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.Style;
 import net.minecraft.nbt.CompoundTag;
@@ -46,10 +47,10 @@ 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;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.leavesmc.leaves.event.bot.*;
@@ -68,23 +69,48 @@ public class BotList {
    private final MinecraftServer server;

    public final List<ServerBot> bots = new CopyOnWriteArrayList<>();
-    private final BotDataStorage dataStorage;
+    private final BotDataStorage manualSaveDataStorage;
+    private final BotDataStorage resumeDataStorage;

    private final Map<UUID, ServerBot> botsByUUID = Maps.newHashMap();
    private final Map<String, ServerBot> botsByName = Maps.newHashMap();
    private final Map<String, Set<String>> botsNameByWorldUuid = Maps.newHashMap();
+    private final Map<String, Set<String>> legacyBotsNameByWorldUuid = Maps.newHashMap();

    public boolean forceShutdown = false;

-    public BotList(MinecraftServer server) {
+    public BotList(@NotNull MinecraftServer server) {
        this.server = server;
-        this.dataStorage = new BotDataStorage(server.storageSource);
+        this.manualSaveDataStorage = new BotDataStorage(server.storageSource, "fakeplayerdata", "fakeplayer.dat");
+        this.resumeDataStorage = new BotDataStorage(server.storageSource, "resume_fakeplayerdata", "resume_fakeplayer.dat");
        INSTANCE = this;
    }

-    public ServerBot createNewBot(BotCreateState state) {
-        BotCreateEvent event = new BotCreateEvent(state.name(), state.skinName(), state.location(), state.createReason(), state.creator());
-        event.setCancelled(!BotUtil.isCreateLegal(state.name()));
+    public void saveAllResumeBots(final int interval) {
+        MCUtil.ensureMain("Save Bots", () -> {
+            final long now = System.currentTimeMillis() / 50;
+            for (ServerBot bot : bots) {
+                if (interval == -1 || now - bot.lastSave >= interval) {
+                    this.resumeDataStorage.save(bot);
+                    bot.lastSave = now;
+                }
+            }
+            return null;
+        });
+    }
+
+    public void saveAllResumeBots() {
+        if (!FakeplayerConfig.enable || !FakeplayerConfig.canResident) {
+            return;
+        }
+        for (ServerBot bot : this.bots) {
+            this.resumeDataStorage.save(bot);
+        }
+    }
+
+    public ServerBot createNewBot(@NotNull BotCreateState state) {
+        BotCreateEvent event = new BotCreateEvent(state.fullName(), state.skinName(), state.location(), state.createReason(), state.creator());
+        event.setCancelled(!BotUtil.isCreateLegal(state.fullName()));
        this.server.server.getPluginManager().callEvent(event);

        if (event.isCancelled()) {
@@ -94,7 +120,7 @@ public class BotList {
        Location location = event.getCreateLocation();
        ServerLevel world = ((CraftWorld) location.getWorld()).getHandle();

-        GameProfile profile = setProfile(BotUtil.getBotUUID(state), state.name(), state.skin());
+        GameProfile profile = createBotProfile(BotUtil.getBotUUID(state), state.fullName(), state.skin());
        ServerBot bot = new ServerBot(this.server, world, profile);
        bot.createState = state;
        if (event.getCreator() instanceof org.bukkit.entity.Player player) {
@@ -104,56 +130,58 @@ public class BotList {
        return this.placeNewBot(bot, world, location, null);
    }

-    public ServerBot loadNewBot(String realName) {
-        try {
-            return this.loadNewBot(realName, this.dataStorage);
-        } catch (Exception e) {
-            LOGGER.error("Failed to load bot {}", realName, e);
-            return null;
-        }
+    public ServerBot loadNewManualSavedBot(String fullName) {
+        return this.loadNewBot(fullName, this.manualSaveDataStorage);
    }

-    public ServerBot loadNewBot(String realName, IPlayerDataStorage playerIO) {
-        UUID uuid = BotUtil.getBotUUID(realName);
+    public ServerBot loadNewResumeBot(String fullName) {
+        return this.loadNewBot(fullName, this.resumeDataStorage);
+    }

-        BotLoadEvent event = new BotLoadEvent(realName, uuid);
-        this.server.server.getPluginManager().callEvent(event);
-        if (event.isCancelled()) {
+    public ServerBot loadNewBot(String fullName, BotDataStorage storage) {
+        if (botsByName.containsKey(fullName)) {
            return null;
        }
+        try {
+            UUID uuid = BotUtil.getBotUUID(fullName);

-        ServerBot bot = new ServerBot(this.server, this.server.getLevel(Level.OVERWORLD), new GameProfile(uuid, realName));
-        bot.connection = new ServerBotPacketListenerImpl(this.server, bot, new ServerBotPacketListenerImpl.BotConnection());
-        bot.connection.markClientLoaded();
-        Optional<ValueInput> optional;
-        if (playerIO instanceof BotDataStorage botIO) {
+            BotLoadEvent event = new BotLoadEvent(fullName, uuid);
+            this.server.server.getPluginManager().callEvent(event);
+            if (event.isCancelled()) {
+                return null;
+            }
+
+            ServerBot bot = new ServerBot(this.server, this.server.getLevel(Level.OVERWORLD), new GameProfile(uuid, fullName));
+            bot.connection = new ServerBotPacketListenerImpl(this.server, bot);
+            Optional<ValueInput> optional;
            try (ProblemReporter.ScopedCollector scopedCollector = new ProblemReporter.ScopedCollector(bot.problemPath(), LOGGER)) {
-                optional = botIO.load(bot, scopedCollector);
+                optional = storage.load(bot, scopedCollector);
            } catch (Exception e) {
                throw new RuntimeException(e);
            }
-        } else {
-            optional = Optional.empty();
-        }

-        if (optional.isEmpty()) {
-            return null;
-        }
-        ValueInput nbt = optional.get();
-
-        ResourceKey<Level> resourcekey = null;
-        if (nbt.getLong("WorldUUIDMost").isPresent() && nbt.getLong("WorldUUIDLeast").isPresent()) {
-            World bWorld = Bukkit.getServer().getWorld(new UUID(nbt.getLong("WorldUUIDMost").orElseThrow(), nbt.getLong("WorldUUIDLeast").orElseThrow()));
-            if (bWorld != null) {
-                resourcekey = ((CraftWorld) bWorld).getHandle().dimension();
+            if (optional.isEmpty()) {
+                return null;
            }
-        }
-        if (resourcekey == null) {
+            ValueInput nbt = optional.get();
+
+            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()));
+                if (bWorld != null) {
+                    resourcekey = ((CraftWorld) bWorld).getHandle().dimension();
+                }
+            }
+            if (resourcekey == null) {
+                return null;
+            }
+
+            ServerLevel world = this.server.getLevel(resourcekey);
+            return this.placeNewBot(bot, world, bot.getLocation(), nbt);
+        } catch (Exception e) {
+            LOGGER.error("Failed to load bot {}", fullName, e);
            return null;
        }
-
-        ServerLevel world = this.server.getLevel(resourcekey);
-        return this.placeNewBot(bot, world, bot.getLocation(), nbt);
    }

    public ServerBot placeNewBot(@NotNull ServerBot bot, ServerLevel world, Location location, ValueInput save) {
@@ -161,7 +189,7 @@ public class BotList {

        bot.isRealPlayer = true;
        bot.loginTime = System.currentTimeMillis();
-        bot.connection = new ServerBotPacketListenerImpl(this.server, bot, new ServerBotPacketListenerImpl.BotConnection());
+        bot.connection = new ServerBotPacketListenerImpl(this.server, bot);
        bot.connection.markClientLoaded();
        bot.setServerLevel(world);

@@ -183,65 +211,60 @@ public class BotList {

        bot.suppressTrackerForLogin = true;

-        optional.ifPresent(nbt -> {
-            bot.loadAndSpawnEnderPearls(nbt);
-            bot.loadAndSpawnParentVehicle(nbt);
-        });
+        Runnable task = () -> {
+            optional.ifPresent(nbt -> {
+                bot.loadAndSpawnEnderPearls(nbt);
+                bot.loadAndSpawnParentVehicle(nbt);
+            });
+            world.getCurrentWorldData().connections.add(bot.connection.connection);
+            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.suppressTrackerForLogin = false;
+
+            bot.level().getChunkSource().chunkMap.addEntity(bot);
+            bot.renderData();
+            bot.initInventoryMenu();
+            botsNameByWorldUuid
+                    .computeIfAbsent(bot.level().uuid.toString(), (k) -> new HashSet<>())
+                    .add(bot.getBukkitEntity().getName());
+            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());
+        };
        if (TickThread.isTickThreadFor(world, location.blockX() >> 4, location.blockZ() >> 4)) {
-            summonBot(bot, world);
+            task.run();
        } else {
            RegionizedServer.getInstance().taskQueue.queueTickTaskQueue(
                    world, location.getBlockX() >> 4, location.blockZ() >> 4,
-                    () -> summonBot(bot, world));
+                    task);
        }

        return bot;
    }

-    private ServerBot summonBot(ServerBot bot, ServerLevel world) {
-        world.getCurrentWorldData().connections.add(bot.connection.connection);
-        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.suppressTrackerForLogin = 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;
-    }
-
    /*
     * return true if async
     */
-    public boolean removeBot(@NotNull ServerBot bot, @NotNull BotRemoveEvent.RemoveReason reason, @Nullable CommandSender remover, boolean saved, boolean async) {
+    public boolean removeBot(@NotNull ServerBot bot, @NotNull BotRemoveEvent.RemoveReason reason, @Nullable CommandSender remover, boolean save, boolean resume, boolean async) {
        if (async && !TickThread.isTickThreadFor(bot.level(), bot.getX(), bot.getZ())) {
-            bot.getBukkitEntity().taskScheduler.schedule((Entity unused) -> this.removeBot(bot, reason, remover, saved), null, 1L);
-            return true;
+            bot.getBukkitEntity().taskScheduler.schedule((Entity unused) -> this.removeBot(bot, reason, remover, save, resume), null, 1L);
+            return true; // async always return true
        }
-        this.removeBot(bot, reason, remover, saved);
-        return false;
+        return this.removeBot(bot, remover, reason, save, resume);
    }

-    public boolean removeBot(@NotNull ServerBot bot, @NotNull BotRemoveEvent.RemoveReason reason, @Nullable CommandSender remover, boolean saved) {
-        return this.removeBot(bot, reason, remover, saved, this.dataStorage);
+    public boolean removeBot(@NotNull ServerBot bot, @NotNull BotRemoveEvent.RemoveReason reason, @Nullable CommandSender remover, boolean save, boolean resume) {
+        return this.removeBot(bot, reason, remover, save, resume, true);
    }

-    public boolean removeBot(@NotNull ServerBot bot, @NotNull BotRemoveEvent.RemoveReason reason, @Nullable CommandSender remover, boolean saved, IPlayerDataStorage playerIO) {
-        BotRemoveEvent event = new BotRemoveEvent(bot.getBukkitEntity(), reason, remover, PaperAdventure.asAdventure(Component.translatable("multiplayer.player.left", bot.getDisplayName())).style(Style.style(NamedTextColor.YELLOW)), saved);
+    public boolean removeBot(@NotNull ServerBot bot, @Nullable CommandSender remover, @NotNull BotRemoveEvent.RemoveReason reason, boolean save, boolean resume) {
+        BotRemoveEvent event = new BotRemoveEvent(bot.getBukkitEntity(), reason, remover, PaperAdventure.asAdventure(Component.translatable("multiplayer.player.left", bot.getDisplayName())).style(Style.style(NamedTextColor.YELLOW)), save);
        this.server.server.getPluginManager().callEvent(event);

        if (event.isCancelled() && event.getReason() != BotRemoveEvent.RemoveReason.INTERNAL) {
@@ -255,11 +278,16 @@ public class BotList {

        bot.disconnect();

+        this.resumeDataStorage.removeSavedData(bot);
        if (event.shouldSave()) {
-            playerIO.save(bot);
+            if (resume) {
+                this.resumeDataStorage.save(bot);
+            } else {
+                this.manualSaveDataStorage.save(bot);
+            }
        } else {
            bot.dropAll(true);
-            botsNameByWorldUuid.getOrDefault(bot.level().uuid.toString(), new HashSet<>()).remove(bot.getBukkitEntity().getRealName());
+            botsNameByWorldUuid.getOrDefault(bot.level().uuid.toString(), new HashSet<>()).remove(bot.getBukkitEntity().getName());
        }

        if (bot.isPassenger() && event.shouldSave()) {
@@ -267,7 +295,7 @@ public class BotList {
            if (entity.hasExactlyOnePlayerPassenger()) {
                bot.stopRiding();
                entity.getPassengersAndSelf().forEach((entity1) -> {
-                    if (entity1 instanceof AbstractVillager villager) {
+                    if (!OldFeatureConfig.villagerVoidTrade && entity1 instanceof AbstractVillager villager) {
                        final Player human = villager.getTradingPlayer();
                        if (human != null) {
                            villager.setTradingPlayer(null);
@@ -312,15 +340,14 @@ public class BotList {
        if (removeMessage != null && !removeMessage.equals(net.kyori.adventure.text.Component.empty())) {
            this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(removeMessage), false);
        }
-
        return true;
    }

    public void removeAllIn(String worldUuid) {
-        for (String realName : this.botsNameByWorldUuid.getOrDefault(worldUuid, new HashSet<>())) {
-            ServerBot bot = this.getBotByName(realName);
+        for (String fullName : this.botsNameByWorldUuid.getOrDefault(worldUuid, new HashSet<>())) {
+            ServerBot bot = this.getBotByName(fullName);
            if (bot != null) {
-                this.removeBot(bot, BotRemoveEvent.RemoveReason.INTERNAL, null, FakeplayerConfig.canResident);
+                this.removeBot(bot, BotRemoveEvent.RemoveReason.INTERNAL, null, FakeplayerConfig.canResident, FakeplayerConfig.canResident);
            }
        }
    }
@@ -332,7 +359,7 @@ public class BotList {
        for (ServerBot bot : this.bots) {
            bot.resume = FakeplayerConfig.canResident;
            if (TickThread.isTickThreadFor(bot.level(), bot.getX(), bot.getZ())) {
-                this.removeBot(bot, BotRemoveEvent.RemoveReason.INTERNAL, null, FakeplayerConfig.canResident);
+                this.removeBot(bot, BotRemoveEvent.RemoveReason.INTERNAL, null, FakeplayerConfig.canResident, FakeplayerConfig.canResident);
            } else {
                finished = false;
                check.getAndIncrement();
@@ -349,7 +376,7 @@ public class BotList {
            }
            counter.getAndIncrement();
            try {
-                this.removeBot(bot, BotRemoveEvent.RemoveReason.INTERNAL, null, FakeplayerConfig.canResident);
+                this.removeBot(bot, BotRemoveEvent.RemoveReason.INTERNAL, null, FakeplayerConfig.canResident, FakeplayerConfig.canResident);
                received.getAndIncrement();
            } catch (Exception e) {
                this.removeBot(bot, check, received, counter);
@@ -361,24 +388,39 @@ public class BotList {
        }, null, 1L);
    }

-    public void loadBotInfo() {
+    public void loadResumeBotInfo() {
        if (!FakeplayerConfig.enable || !FakeplayerConfig.canResident) {
            return;
        }
-        CompoundTag savedBotList = this.getSavedBotList().copy();
-        for (String realName : savedBotList.keySet()) {
-            CompoundTag nbt = savedBotList.getCompound(realName).orElseThrow();
-            if (!nbt.getBoolean("resume").orElse(false)) {
-                continue;
-            }
-            UUID levelUuid = BotUtil.getBotLevel(realName, this.dataStorage);
+        CompoundTag savedBotList = this.getResumeBotList().copy();
+        for (String fullName : savedBotList.keySet()) {
+            UUID levelUuid = BotUtil.getBotLevel(fullName, this.resumeDataStorage);
            if (levelUuid == null) {
-                LOGGER.warn("Bot {} has no world UUID, skipping loading.", realName);
+                LOGGER.warn("Bot {} has no world UUID, skipping loading.", fullName);
                continue;
            }
            this.botsNameByWorldUuid
                    .computeIfAbsent(levelUuid.toString(), (k) -> new HashSet<>())
-                    .add(realName);
+                    .add(fullName);
+        }
+        loadLegacyResumeBotInfo();
+    }
+
+    private void loadLegacyResumeBotInfo() {
+        CompoundTag savedBotList = this.getManualSavedBotList().copy();
+        for (String fullName : savedBotList.keySet()) {
+            CompoundTag nbt = savedBotList.getCompound(fullName).orElseThrow();
+            if (!nbt.getBoolean("resume").orElse(false)) {
+                continue;
+            }
+            UUID levelUuid = BotUtil.getBotLevel(fullName, this.manualSaveDataStorage);
+            if (levelUuid == null) {
+                LOGGER.warn("Bot {} has no world UUID, skipping loading.", fullName);
+                continue;
+            }
+            this.legacyBotsNameByWorldUuid
+                    .computeIfAbsent(levelUuid.toString(), (k) -> new HashSet<>())
+                    .add(fullName);
        }
    }

@@ -386,23 +428,19 @@ public class BotList {
        if (!FakeplayerConfig.enable || !FakeplayerConfig.canResident) {
            return;
        }
-        Set<String> bots = this.botsNameByWorldUuid.get(worldUuid);
-        if (bots == null) {
-            return;
-        }
-        Set<String> botsCopy = new HashSet<>(bots);
-        botsCopy.forEach(this::loadNewBot);
+        new HashSet<>(this.botsNameByWorldUuid.getOrDefault(worldUuid, new HashSet<>())).forEach(this::loadNewResumeBot);
+        new HashSet<>(this.legacyBotsNameByWorldUuid.getOrDefault(worldUuid, new HashSet<>())).forEach(this::loadNewManualSavedBot);
    }

-    public void updateBotLevel(ServerBot bot, ServerLevel level) {
+    public void updateBotLevel(@NotNull ServerBot bot, @NotNull ServerLevel level) {
        String prevUuid = bot.level().uuid.toString();
        String newUuid = level.uuid.toString();
        this.botsNameByWorldUuid
                .computeIfAbsent(newUuid, (k) -> new HashSet<>())
-                .add(bot.getBukkitEntity().getRealName());
+                .add(bot.getBukkitEntity().getName());
        this.botsNameByWorldUuid
                .computeIfAbsent(prevUuid, (k) -> new HashSet<>())
-                .remove(bot.getBukkitEntity().getRealName());
+                .remove(bot.getBukkitEntity().getName());
    }

    public void networkTick() {
@@ -419,15 +457,25 @@ public class BotList {
        return this.botsByName.get(name.toLowerCase(Locale.ROOT));
    }

-    public CompoundTag getSavedBotList() {
-        return this.dataStorage.getSavedBotList();
+    public CompoundTag getManualSavedBotList() {
+        return this.getSavedBotList(this.manualSaveDataStorage);
    }

-    public GameProfile setProfile(UUID uuid, String name, String[] skin) {
-        GameProfile profile = new GameProfile(uuid, name);
-        if (skin == null) return profile;
-        PropertyMap profileMap = new MutablePropertyMap(profile.properties());
-        profileMap.put("textures", new Property("textures", skin[0], skin[1]));
-        return new GameProfile(uuid, name, profileMap);
+    public CompoundTag getResumeBotList() {
+        return this.getSavedBotList(this.resumeDataStorage);
+    }
+
+    public CompoundTag getSavedBotList(@NotNull BotDataStorage storage) {
+        return storage.getSavedBotList();
+    }
+
+    @Contract("_, _, _ -> new")
+    public static @NotNull GameProfile createBotProfile(UUID uuid, String name, String[] skin) {
+        GameProfile profile = new GameProfile(uuid, name, new MutablePropertyMap());
+        profile.properties().put("is_bot", new Property("is_bot", "true"));
+        if (skin != null) {
+            profile.properties().put("textures", new Property("textures", skin[0], skin[1]));
+        }
+        return profile;
    }
 }
@@ -24,6 +24,7 @@ import net.minecraft.stats.ServerStatsCounter;
 import net.minecraft.stats.Stat;
 import net.minecraft.world.entity.player.Player;
 import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;

 import java.io.File;

@@ -44,7 +45,7 @@ public class BotStatsCounter extends ServerStatsCounter {
    }

    @Override
-    public void parse(@NotNull DataFixer dataFixer, @NotNull JsonElement json) {
+    public void parse(@NonNull DataFixer fixerUpper, @NonNull JsonElement json) {
    }

    @Override
@@ -18,11 +18,15 @@
 package org.leavesmc.leaves.bot;

 import com.google.common.base.Charsets;
+import fun.bm.lophine.carpet.config.modules.FakePlayerCompatConfig;
 import fun.bm.lophine.config.modules.function.FakeplayerConfig;
 import net.minecraft.core.NonNullList;
+import net.minecraft.core.component.DataComponents;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.tags.ItemTags;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.component.ItemContainerContents;
 import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;

@@ -34,23 +38,66 @@ public class BotUtil {
    public static void replenishment(@NotNull ItemStack itemStack, NonNullList<ItemStack> itemStackList) {
        int count = itemStack.getMaxStackSize() / 2;
        if (itemStack.getCount() <= 8 && count > 8) {
-            for (ItemStack itemStack1 : itemStackList) {
-                if (itemStack1 == ItemStack.EMPTY || itemStack1 == itemStack) {
+            if (pullMatchingStack(itemStack, itemStackList, count)) {
+                return;
+            }
+            if (FakePlayerCompatConfig.fakePlayerAutoReplenishmentFormShulkerBox) {
+                pullMatchingStackFromShulkerBox(itemStack, itemStackList, count);
+            }
+        }
+    }
+
+    private static boolean pullMatchingStack(@NotNull ItemStack targetStack, NonNullList<ItemStack> itemStackList, int transferLimit) {
+        for (ItemStack inventoryStack : itemStackList) {
+            if (inventoryStack == ItemStack.EMPTY || inventoryStack == targetStack) {
+                continue;
+            }
+
+            if (ItemStack.isSameItemSameComponents(inventoryStack, targetStack)) {
+                if (inventoryStack.getCount() > transferLimit) {
+                    targetStack.setCount(targetStack.getCount() + transferLimit);
+                    inventoryStack.setCount(inventoryStack.getCount() - transferLimit);
+                } else {
+                    targetStack.setCount(targetStack.getCount() + inventoryStack.getCount());
+                    inventoryStack.setCount(0);
+                }
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean pullMatchingStackFromShulkerBox(@NotNull ItemStack targetStack, NonNullList<ItemStack> itemStackList, int transferLimit) {
+        for (ItemStack containerStack : itemStackList) {
+            if (containerStack == ItemStack.EMPTY || !containerStack.is(ItemTags.SHULKER_BOXES)) {
+                continue;
+            }
+
+            ItemContainerContents contents = containerStack.getOrDefault(DataComponents.CONTAINER, ItemContainerContents.EMPTY);
+            NonNullList<ItemStack> shulkerItems = NonNullList.withSize(contents.items.size(), ItemStack.EMPTY);
+            contents.copyInto(shulkerItems);
+
+            for (int slot = 0; slot < shulkerItems.size(); slot++) {
+                ItemStack shulkerStack = shulkerItems.get(slot);
+                if (shulkerStack.isEmpty() || !ItemStack.isSameItemSameComponents(shulkerStack, targetStack)) {
                    continue;
                }

-                if (ItemStack.isSameItemSameComponents(itemStack1, itemStack)) {
-                    if (itemStack1.getCount() > count) {
-                        itemStack.setCount(itemStack.getCount() + count);
-                        itemStack1.setCount(itemStack1.getCount() - count);
-                    } else {
-                        itemStack.setCount(itemStack.getCount() + itemStack1.getCount());
-                        itemStack1.setCount(0);
-                    }
-                    break;
+                int moved = Math.min(Math.min(transferLimit, shulkerStack.getCount()), targetStack.getMaxStackSize() - targetStack.getCount());
+                if (moved <= 0) {
+                    return false;
                }
+
+                targetStack.grow(moved);
+                shulkerStack.shrink(moved);
+                shulkerItems.set(slot, shulkerStack.isEmpty() ? ItemStack.EMPTY : shulkerStack);
+                containerStack.set(DataComponents.CONTAINER, ItemContainerContents.fromItems(shulkerItems));
+                return true;
            }
        }
+
+        return false;
    }

    public static void replaceTool(@NotNull EquipmentSlot slot, @NotNull ServerBot bot) {
@@ -85,15 +132,15 @@ public class BotUtil {

    @NotNull
    public static UUID getBotUUID(@NotNull BotCreateState state) {
-        return getBotUUID(state.realName());
+        return getBotUUID(state.fullName());
    }

-    public static UUID getBotUUID(@NotNull String realName) {
-        return UUID.nameUUIDFromBytes(("Fakeplayer:" + realName).getBytes(Charsets.UTF_8));
+    public static UUID getBotUUID(@NotNull String fullName) {
+        return UUID.nameUUIDFromBytes(("Fakeplayer:" + fullName).getBytes(Charsets.UTF_8));
    }

-    public static UUID getBotLevel(@NotNull String realName, BotDataStorage botDataStorage) {
-        UUID uuid = BotUtil.getBotUUID(realName);
+    public static UUID getBotLevel(@NotNull String fullName, BotDataStorage botDataStorage) {
+        UUID uuid = getBotUUID(fullName);
        Optional<CompoundTag> tagOptional = botDataStorage.read(uuid.toString());
        if (tagOptional.isEmpty()) {
            return null;
@@ -1,27 +0,0 @@
-/*
- * 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.bot;
-
-import net.minecraft.world.entity.player.Player;
-
-public interface IPlayerDataStorage {
-
-    void save(Player player);
-
-//    Optional<ValueInput> load(Player player, ProblemReporter reporter);
-}
@@ -19,7 +19,8 @@ package org.leavesmc.leaves.bot;

 import com.google.common.collect.ImmutableMap;
 import com.mojang.authlib.GameProfile;
-import com.mojang.logging.LogUtils;
+import fun.bm.lophine.LophineLogger;
+import fun.bm.lophine.carpet.config.modules.FakePlayerCompatConfig;
 import fun.bm.lophine.config.modules.function.FakeplayerConfig;
 import io.papermc.paper.adventure.PaperAdventure;
 import io.papermc.paper.event.entity.EntityKnockbackEvent;
@@ -52,9 +53,11 @@ import net.minecraft.world.entity.PositionMoveRotation;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Input;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.projectile.FishingHook;
 import net.minecraft.world.entity.projectile.ProjectileUtil;
 import net.minecraft.world.entity.vehicle.boat.AbstractBoat;
 import net.minecraft.world.inventory.ChestMenu;
+import net.minecraft.world.item.FishingRodItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.level.gameevent.GameEvent;
@@ -77,16 +80,18 @@ import org.leavesmc.leaves.entity.bot.CraftBot;
 import org.leavesmc.leaves.event.bot.*;
 import org.leavesmc.leaves.plugin.MinecraftInternalPlugin;
 import org.leavesmc.leaves.util.MathUtils;
-import org.slf4j.Logger;

 import java.util.*;
 import java.util.function.Predicate;

+import static net.minecraft.server.MinecraftServer.getServer;
+
 public class ServerBot extends ServerPlayer {
+    private static final int AUTO_FISH_RECAST_DELAY = 4;
+    private static final int AUTO_FISH_ENTITY_DELAY = 20;

    private final List<AbstractBotAction<?>> actions;
-    private final Map<String, AbstractBotConfig<?, ?, ?>> configs;
-    private static final Logger LOGGER = LogUtils.getClassLogger();
+    private final Map<String, AbstractBotConfig<?, ?>> configs;

    public boolean resume = false;
    public BotCreateState createState;
@@ -100,6 +105,7 @@ public class ServerBot extends ServerPlayer {
    public int notSleepTicks;

    public int removeTaskId = -1;
+    private int autoFishCooldown = 0;

    public ServerBot(MinecraftServer server, ServerLevel world, GameProfile profile) {
        super(server, world, profile, ClientInformation.createDefault());
@@ -108,8 +114,8 @@ public class ServerBot extends ServerPlayer {
        this.gameMode = new ServerBotGameMode(this);

        this.actions = new ArrayList<>();
-        ImmutableMap.Builder<String, AbstractBotConfig<?, ?, ?>> configBuilder = ImmutableMap.builder();
-        for (AbstractBotConfig<?, ?, ?> config : Configs.getConfigs()) {
+        ImmutableMap.Builder<String, AbstractBotConfig<?, ?>> configBuilder = ImmutableMap.builder();
+        for (AbstractBotConfig<?, ?> config : Configs.getConfigs()) {
            configBuilder.put(config.getName(), config.create().setBot(this));
        }
        this.configs = configBuilder.build();
@@ -139,7 +145,7 @@ public class ServerBot extends ServerPlayer {
            this.joining = false;
        }

-        this.resetOperationCountPerTick(); // Leaves - player operation limiter
+//        this.resetOperationCountPerTick(); // Leaves - player operation limiter
        this.wardenSpawnTracker.tick();
        if (this.invulnerableTime > 0) {
            this.invulnerableTime--;
@@ -213,17 +219,7 @@ public class ServerBot extends ServerPlayer {
        this.updateIsUnderwater();

        if (this.getConfigValue(Configs.TICK_TYPE) == TickType.NETWORK) {
-            try {
-                Bukkit.getRegionScheduler().execute(
-                        MinecraftInternalPlugin.INSTANCE,
-                        this.level().getWorld(),
-                        this.getBlockX() >> 4,
-                        this.getBlockZ() >> 4,
-                        this::runAction
-                );
-            } catch (Exception e) {
-                this.runAction();
-            }
+            getServer().scheduleOnMain(this::runAction);
        }

        this.livingEntityTick();
@@ -247,6 +243,7 @@ public class ServerBot extends ServerPlayer {
        }

        this.getCooldowns().tick();
+        this.tickAutoFish();
        this.updatePlayerPose();
    }

@@ -305,6 +302,18 @@ public class ServerBot extends ServerPlayer {
            teleportTransition.postTeleportTransition().onTransition(this);
            this.isChangingDimension = false;

+            // Lophine - We don't have this
+/*            if (LeavesConfig.modify.netherPortalFix) {
+                final ResourceKey<Level> fromDim = fromLevel.dimension();
+                final ResourceKey<Level> toDim = level().dimension();
+                if (!((fromDim != Level.OVERWORLD || toDim != Level.NETHER) && (fromDim != Level.NETHER || toDim != Level.OVERWORLD))) {
+                    BlockPos fromPortal = org.leavesmc.leaves.util.ReturnPortalManager.findPortalAt(this, fromDim, lastPos);
+                    BlockPos toPos = this.blockPosition();
+                    if (fromPortal != null) {
+                        org.leavesmc.leaves.util.ReturnPortalManager.storeReturnPortal(this, toDim, toPos, fromPortal);
+                    }
+                }
+            }*/
            if (this.isBlocking()) {
                this.stopUsingItem();
            }
@@ -337,8 +346,10 @@ public class ServerBot extends ServerPlayer {
        ItemStack item = this.getItemInHand(hand);

        if (!item.isEmpty()) {
-            BotUtil.replenishment(item, getInventory().getNonEquipmentItems());
-            if (BotUtil.isDamage(item, 10)) {
+            if (FakePlayerCompatConfig.fakePlayerAutoReplenishment) {
+                BotUtil.replenishment(item, getInventory().getNonEquipmentItems());
+            }
+            if (FakePlayerCompatConfig.fakePlayerAutoReplaceTool && BotUtil.isDamage(item, 10)) {
                BotUtil.replaceTool(hand == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND, this);
            }
        }
@@ -350,7 +361,7 @@ public class ServerBot extends ServerPlayer {
        if (FakeplayerConfig.canOpenInventory) {
            if (player instanceof ServerPlayer player1 && player.getMainHandItem().isEmpty()) {
                BotInventoryOpenEvent event = new BotInventoryOpenEvent(this.getBukkitEntity(), player1.getBukkitEntity());
-                MinecraftServer.getServer().server.getPluginManager().callEvent(event);
+                getServer().server.getPluginManager().callEvent(event);
                if (!event.isCancelled()) {
                    player.openMenu(new SimpleMenuProvider((i, inventory, p) -> ChestMenu.sixRows(i, inventory, this.container), this.getDisplayName()));
                    return InteractionResult.SUCCESS;
@@ -372,8 +383,8 @@ public class ServerBot extends ServerPlayer {
        nbt.putBoolean("isShiftKeyDown", this.isShiftKeyDown());

        CompoundTag createNbt = new CompoundTag();
-        createNbt.putString("realName", this.createState.realName());
-        createNbt.putString("name", this.createState.name());
+        createNbt.putString("rawName", this.createState.rawName());
+        createNbt.putString("name", this.createState.fullName());

        createNbt.putString("skinName", this.createState.skinName());
        if (this.createState.skin() != null) {
@@ -386,7 +397,7 @@ public class ServerBot extends ServerPlayer {

        nbt.store("createStatus", CompoundTag.CODEC, createNbt);

-        if (!this.actions.isEmpty()) {
+        if (FakePlayerCompatConfig.fakePlayerReloadAction && !this.actions.isEmpty()) {
            ValueOutput.TypedOutputList<CompoundTag> actionNbt = nbt.list("actions", CompoundTag.CODEC);
            for (AbstractBotAction<?> action : this.actions) {
                actionNbt.add(action.save(new CompoundTag()));
@@ -395,7 +406,7 @@ public class ServerBot extends ServerPlayer {

        if (!this.configs.isEmpty()) {
            ValueOutput.TypedOutputList<CompoundTag> configNbt = nbt.list("configs", CompoundTag.CODEC);
-            for (AbstractBotConfig<?, ?, ?> config : this.configs.values()) {
+            for (AbstractBotConfig<?, ?> config : this.configs.values()) {
                configNbt.add(config.save(new CompoundTag()));
            }
        }
@@ -407,7 +418,11 @@ public class ServerBot extends ServerPlayer {
        this.setShiftKeyDown(nbt.getBooleanOr("isShiftKeyDown", false));

        CompoundTag createNbt = nbt.read("createStatus", CompoundTag.CODEC).orElseThrow();
-        BotCreateState.Builder createBuilder = BotCreateState.builder(createNbt.getString("realName").orElseThrow(), null).name(createNbt.getString("name").orElseThrow());
+        BotCreateState.Builder createBuilder = BotCreateState
+                .builder(createNbt.getString("rawName")
+                        .orElseGet(() -> createNbt.getString("realName")
+                                .orElseThrow()), null) // Convert from legacy version, consider to use ca.spottedleaf.dataconverter.minecraft.MCDataConverter instead for release version
+                .name(createNbt.getString("name").orElseThrow());

        String[] skin = null;
        if (createNbt.contains("skin")) {
@@ -422,10 +437,10 @@ public class ServerBot extends ServerPlayer {
        createBuilder.createReason(BotCreateEvent.CreateReason.INTERNAL).creator(null);

        this.createState = createBuilder.build();
-        this.gameProfile = BotList.INSTANCE.setProfile(this.getUUID(), this.createState.name(), this.createState.skin());
+        this.gameProfile = BotList.createBotProfile(this.getUUID(), this.createState.fullName(), this.createState.skin());


-        if (nbt.list("actions", CompoundTag.CODEC).isPresent()) {
+        if (FakePlayerCompatConfig.fakePlayerReloadAction && nbt.list("actions", CompoundTag.CODEC).isPresent()) {
            ValueInput.TypedInputList<CompoundTag> actionNbt = nbt.list("actions", CompoundTag.CODEC).orElseThrow();
            actionNbt.forEach(actionTag -> {
                AbstractBotAction<?> action = Actions.getForName(actionTag.getString("actionName").orElseThrow());
@@ -440,8 +455,9 @@ public class ServerBot extends ServerPlayer {
        if (nbt.list("configs", CompoundTag.CODEC).isPresent()) {
            ValueInput.TypedInputList<CompoundTag> configNbt = nbt.list("configs", CompoundTag.CODEC).orElseThrow();
            for (CompoundTag configTag : configNbt) {
-                AbstractBotConfig<?, ?, ?> config = Configs.getConfig(configTag.getString("configName").orElseThrow());
+                AbstractBotConfig<?, ?> config = Configs.getConfig(configTag.getString("configName").orElseThrow());
                if (config != null) {
+                    config.setBot(this);
                    config.load(configTag);
                }
            }
@@ -466,30 +482,30 @@ public class ServerBot extends ServerPlayer {
        ChunkMap.TrackedEntity entityTracker = this.moonrise$getTrackedEntity();

        if (entityTracker == null) {
-            LOGGER.warn("Fakeplayer cant get entity tracker for {}", this.getId());
+            LophineLogger.LOGGER.warn("Fakeplayer cant get entity tracker for {}", this.getId());
            return;
        }

        playerConnection.send(this.getAddEntityPacket(entityTracker.serverEntity));
        if (login) {
-            Bukkit.getGlobalRegionScheduler().runDelayed(MinecraftInternalPlugin.INSTANCE, (unused) -> playerConnection.send(new ClientboundRotateHeadPacket(this, (byte) ((getYRot() * 256f) / 360f))), 10);
+            Bukkit.getGlobalRegionScheduler().runDelayed(MinecraftInternalPlugin.INSTANCE, (task) -> playerConnection.send(new ClientboundRotateHeadPacket(this, (byte) ((getYRot() * 256f) / 360f))), 10);
        } else {
            playerConnection.send(new ClientboundRotateHeadPacket(this, (byte) ((getYRot() * 256f) / 360f)));
        }
    }

    public void renderInfo() {
-        MinecraftServer.getServer().getPlayerList().getPlayers().forEach(this::sendPlayerInfo);
+        getServer().getPlayerList().getPlayers().forEach(this::sendPlayerInfo);
    }

    public void renderData() {
-        MinecraftServer.getServer().getPlayerList().getPlayers().forEach(
+        getServer().getPlayerList().getPlayers().forEach(
                player -> this.sendFakeDataIfNeed(player, false)
        );
    }

    private void sendPacket(Packet<?> packet) {
-        MinecraftServer.getServer().getPlayerList().getPlayers().forEach(player -> player.connection.send(packet));
+        getServer().getPlayerList().getPlayers().forEach(player -> player.connection.send(packet));
    }

    @Override
@@ -498,7 +514,7 @@ public class ServerBot extends ServerPlayer {
        Component defaultMessage = this.getCombatTracker().getDeathMessage();

        BotDeathEvent event = new BotDeathEvent(this.getBukkitEntity(), PaperAdventure.asAdventure(defaultMessage), flag);
-        MinecraftServer.getServer().server.getPluginManager().callEvent(event);
+        getServer().server.getPluginManager().callEvent(event);

        if (event.isCancelled()) {
            if (this.getHealth() <= 0) {
@@ -511,18 +527,23 @@ public class ServerBot extends ServerPlayer {

        net.kyori.adventure.text.Component deathMessage = event.deathMessage();
        if (event.isSendDeathMessage() && deathMessage != null && !deathMessage.equals(net.kyori.adventure.text.Component.empty())) {
-            MinecraftServer.getServer().getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(deathMessage), false);
+            getServer().getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(deathMessage), false);
        }

-        MinecraftServer.getServer().getBotList().removeBot(this, BotRemoveEvent.RemoveReason.DEATH, null, false);
+        // TODO: separate die and remove logic, call super.die here
+        this.removeEntitiesOnShoulder();
+        if (this.level().getGameRules().get(GameRules.FORGIVE_DEAD_PLAYERS)) {
+            this.tellNeutralMobsThatIDied();
+        }
+        getServer().getBotList().removeBot(this, BotRemoveEvent.RemoveReason.DEATH, null, false, false);
    }

    @Override
-    public boolean startRiding(Entity entity, boolean force, boolean triggerEvents) {
-        if (super.startRiding(entity, force, triggerEvents)) {
-            if (entity.getControllingPassenger() == this) { // see net.minecraft.server.networkServerGamePacketListenerImpl#handleMoveVehicle
+    public boolean startRiding(@NotNull Entity vehicle, boolean force, boolean sendGameEvent) {
+        if (super.startRiding(vehicle, force, sendGameEvent)) {
+            if (vehicle.getControllingPassenger() == this) { // see net.minecraft.server.networkServerGamePacketListenerImpl#handleMoveVehicle
                this.setDeltaMovement(Vec3.ZERO);
-                this.setYRot(entity.yRotO);
+                this.setYRot(vehicle.yRotO);
            }
            return true;
        } else {
@@ -644,6 +665,45 @@ public class ServerBot extends ServerPlayer {
        }
    }

+    private void tickAutoFish() {
+        if (!fun.bm.lophine.carpet.config.modules.FakePlayerCompatConfig.fakePlayerAutoFish || this.hasActiveAction("fish")) {
+            this.autoFishCooldown = 0;
+            return;
+        }
+
+        if (this.autoFishCooldown > 0) {
+            this.autoFishCooldown--;
+            return;
+        }
+
+        ItemStack mainHand = this.getMainHandItem();
+        if (mainHand.isEmpty() || !(mainHand.getItem() instanceof FishingRodItem)) {
+            return;
+        }
+
+        FishingHook fishingHook = this.fishing;
+        if (fishingHook != null) {
+            if (fishingHook.currentState == FishingHook.FishHookState.HOOKED_IN_ENTITY) {
+                mainHand.use(this.level(), this, InteractionHand.MAIN_HAND);
+                this.autoFishCooldown = AUTO_FISH_ENTITY_DELAY;
+                return;
+            }
+
+            if (fishingHook.nibble > 0) {
+                mainHand.use(this.level(), this, InteractionHand.MAIN_HAND);
+                this.autoFishCooldown = AUTO_FISH_RECAST_DELAY;
+            }
+            return;
+        }
+
+        mainHand.use(this.level(), this, InteractionHand.MAIN_HAND);
+        this.autoFishCooldown = AUTO_FISH_RECAST_DELAY;
+    }
+
+    private boolean hasActiveAction(String actionName) {
+        return this.actions.stream().anyMatch(action -> !action.isCancelled() && action.getName().equals(actionName));
+    }
+
    public boolean addBotAction(AbstractBotAction<?> action, CommandSender sender) {
        if (!FakeplayerConfig.canUseAction) {
            return false;
@@ -669,15 +729,15 @@ public class ServerBot extends ServerPlayer {
    }

    @SuppressWarnings("unchecked")
-    public <O, I, E extends AbstractBotConfig<O, I, E>> AbstractBotConfig<O, I, E> getConfig(@NotNull AbstractBotConfig<O, I, E> config) {
-        return (AbstractBotConfig<O, I, E>) Objects.requireNonNull(this.configs.get(config.getName()));
+    public <T, E extends AbstractBotConfig<T, E>> AbstractBotConfig<T, E> getConfig(@NotNull AbstractBotConfig<T, E> config) {
+        return (AbstractBotConfig<T, E>) Objects.requireNonNull(this.configs.get(config.getName()));
    }

-    public Collection<AbstractBotConfig<?, ?, ?>> getAllConfigs() {
+    public Collection<AbstractBotConfig<?, ?>> getAllConfigs() {
        return configs.values();
    }

-    public <O, I, E extends AbstractBotConfig<O, I, E>> O getConfigValue(@NotNull AbstractBotConfig<O, I, E> config) {
+    public <T, E extends AbstractBotConfig<T, E>> T getConfigValue(@NotNull AbstractBotConfig<T, E> config) {
        return this.getConfig(config).getValue();
    }

@@ -17,8 +17,10 @@

 package org.leavesmc.leaves.bot;

+import fun.bm.lophine.carpet.config.modules.FakePlayerCompatConfig;
 import net.kyori.adventure.text.Component;
 import net.minecraft.core.BlockPos;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.ServerPlayerGameMode;
 import net.minecraft.world.InteractionHand;
@@ -40,7 +42,7 @@ public class ServerBotGameMode extends ServerPlayerGameMode {

    public ServerBotGameMode(ServerBot bot) {
        super(bot);
-        super.setGameModeForPlayer(GameType.SURVIVAL, null);
+        super.setGameModeForPlayer(getInitialGameMode(bot), null);
    }

    @Override
@@ -79,7 +81,7 @@ public class ServerBotGameMode extends ServerPlayerGameMode {
                this.level.sendBlockUpdated(pos, blockState, blockState, 3);
                return false;
            } else {
-                BlockState blockState1 = block.playerWillDestroy(this.level, pos, blockState, this.player); // Leaves - no block update
+                BlockState blockState1 = /*isNoBlockUpdate() ? blockState : */block.playerWillDestroy(this.level, pos, blockState, this.player); // Leaves - no block update
                boolean flag = this.level.removeBlock(pos, false);
                if (flag) {
                    block.destroy(this.level, pos, blockState1);
@@ -133,4 +135,8 @@ public class ServerBotGameMode extends ServerPlayerGameMode {
            return InteractionResult.PASS;
        }
    }
+
+    private static GameType getInitialGameMode(ServerBot bot) {
+        return FakePlayerCompatConfig.fakePlayerDefaultSurvivalMode ? GameType.SURVIVAL : MinecraftServer.getServer().getDefaultGameType();
+    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Helvetica Volubi	e17a3f2033	perf: some perform update && update Gradle wrapper to version 9.4.1	2026-04-22 01:40:07 +08:00
Helvetica Volubi	74ac0bccf5	fix: fix some function is not covered by core config	2026-04-14 00:41:54 +08:00
xiaoxijun	f65b7f176b	Carpet features (#134 ) * Carpet features * refactor(config): move up config * refactor file diff in file system * Update Luminol * move up - stage 1 * Revert "Update Luminol" This reverts commit `6f02993bfe`. * move up - stage 2 * new carpet features * upload docs * stage - pre update * [ci skip]Update Luminol only update for dev branch, so skip ci * remove blank * feat:add carpet core config & move some function to config load stage * remove some unused value & logic * fix up * Update Luminol * fix up * remove imports update * add warning to carpet system if it is enabled * Update Luminol * use new function to sync config * oops! * Update Luminol * fix up a bug * refactor * Update Luminol * move up directory * Update Luminol * oops! * refactor need * feat: add CoreConfig to enable general rules in CarpetCompatSync * modify some default value * fix: enhance HUD logger subscriptions and improve player data handling --------- Co-authored-by: Helvetica Volubi <suisuroru@blue-millennium.fun> Co-authored-by: Helvetica Volubi <88063803+Suisuroru@users.noreply.github.com>	2026-04-13 19:45:35 +08:00
Helvetica Volubi	97a17dbf78	fix: update Luminol plugin versions in build configuration	2026-04-13 18:35:25 +08:00
Bacteriawa	c5194eeb8f	Update Luminol	2026-04-11 03:40:59 +08:00
Helvetica Volubi	58c5573421	fix: fix some crash problem	2026-04-08 09:49:45 +08:00
Helvetica Volubi	1907a41329	perf: some perform update for global entities counter	2026-04-08 09:15:55 +08:00
Helvetica Volubi	21cce73216	fix GlobalEntitiesCounter again	2026-04-07 20:25:57 +08:00
Helvetica Volubi	163a9902cc	fix: fix mob despawn when player is away from all the player	2026-04-02 18:38:19 +08:00
Helvetica Volubi	ba1216d4d3	Update Luminol	2026-03-30 00:08:27 +08:00
dependabot[bot]	beb5cbeb52	[ci skip]Bump gradle/actions from 5 to 6 (#135 ) Bumps [gradle/actions](https://github.com/gradle/actions) from 5 to 6. - [Release notes](https://github.com/gradle/actions/releases) - [Commits](https://github.com/gradle/actions/compare/v5...v6) --- updated-dependencies: - dependency-name: gradle/actions dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-03-28 18:41:16 +08:00
Helvetica Volubi	5cc4371833	Update Luminol	2026-03-26 08:50:42 +08:00
Helvetica Volubi	35f1e58d4d	[ci skip]Update Luminol only update for dev branch, so skip ci	2026-03-22 15:14:15 +08:00
Helvetica Volubi	690d7c2785	Update Luminol	2026-03-21 21:56:12 +08:00
Helvetica Volubi	115c9f8ee8	fix: try to fix a bug in syncmatica protocol	2026-03-19 19:00:17 +08:00
Helvetica Volubi	faa3529943	feat: split timeout options to config file	2026-03-19 18:39:37 +08:00
Helvetica Volubi	3c3a2a6ff4	[ci skip] fixup	2026-03-16 18:09:49 +08:00
Helvetica Volubi	25776c7200	Update Luminol 我去，这个怎么没提交上	2026-03-16 16:39:26 +08:00
Helvetica Volubi	74e9d146e3	Update Luminol & adapt auto update system	2026-03-16 16:08:58 +08:00
Helvetica Volubi	a8b2972e0e	[ci skip] fix up a config transform flag	2026-03-14 01:38:42 +08:00
xiaoxijun	ed3063a477	[ci skip]Update gradle.properties	2026-03-10 23:40:16 +08:00
Helvetica Volubi	85d2fa3372	feat: add Leaves' Creative Fly No Clip feature fix #16	2026-03-09 00:13:34 +08:00
Helvetica Volubi	b22e9e588b	Update Luminol	2026-03-08 00:20:08 +08:00
Helvetica Volubi	90b751da5a	Update Luminol	2026-03-03 20:55:18 +08:00
dependabot[bot]	7efeb48a7e	[ci skip]Bump actions/upload-artifact from 6 to 7 (#133 ) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6 to 7. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-02-28 16:29:34 +08:00
Helvetica Volubi	e5cc20ba9b	Update Luminol	2026-02-23 21:23:49 +08:00
Helvetica Volubi	46e7abe59c	Update Luminol	2026-02-18 00:25:23 +08:00
Helvetica Volubi	40df6b9dfb	Switch to release cannel Update Luminol	2026-02-13 21:14:41 +08:00
Bacteriawa	5559fa8bcc	Update Luminol	2026-02-13 16:21:55 +08:00
Helvetica Volubi	6319ddf78f	[ci skip]update qodana (#131 ) * qodana update test use community version * fix: update bug-report.yml and qodana.yaml for improved configuration clarity * chore: configure Git user details for CI environment * [ci skip]fix: update linter image in qodana.yaml to use community version * fix: update linter and action versions to use latest releases * Revert "chore: configure Git user details for CI environment" This reverts commit `e53b12ac49`. * fix: update qodana.yaml to exclude all files instead of just JavaFiles * Revert "qodana update test" This reverts commit `4aac78cb72`. * [ci skip]fix: update .gitignore and qodana.yaml for project structure changes	2026-02-08 01:20:10 +08:00
Bacteriawa	e74300a756	Fix Server crash when using CCE #109	2026-02-08 00:02:31 +08:00
Bacteriawa	d9674b4e7c	Update Luminol	2026-02-07 23:20:40 +08:00
Helvetica Volubi	6d02f00ac0	Update Luminol to fix #127 fixes #127	2026-01-30 19:47:50 +08:00
Helvetica Volubi	2960e7d24f	perf: add cache for replay api	2026-01-28 22:45:50 +08:00
Helvetica Volubi	d950c6d3e8	Update Luminol	2026-01-26 23:48:23 +08:00
Helvetica Volubi	357c351b95	fix up version fetcher	2026-01-22 00:59:08 +08:00
Helvetica Volubi	a780b13fcc	Update Luminol	2026-01-21 21:37:37 +08:00
Helvetica Volubi	cf80fc6a86	Update Luminol	2026-01-18 03:31:10 +08:00
Helvetica Volubi	20acc9ccf5	feat: add save-all support	2026-01-16 02:41:01 +08:00
Helvetica Volubi	e49ab25111	simply fix for replay api fixed https://github.com/MC-XiaoHei/ISeeYou/issues/70	2026-01-14 01:57:42 +08:00
Helvetica Volubi	eed4457419	add removed check before all checks start in addEffects	2026-01-13 21:06:48 +08:00
Helvetica Volubi	429a0345d9	refactor(bot): delay some logic of extra load in fakeplayer spawn	2026-01-13 20:47:55 +08:00
Helvetica Volubi	670d4e39c9	Update Luminol	2026-01-13 19:30:32 +08:00
Helvetica Volubi	5d4ddb9a6b	fix #124 (refix of #121 )	2026-01-09 19:10:28 +08:00
Helvetica Volubi	0ad90dc36e	Update Luminol	2026-01-07 17:13:18 +08:00
Helvetica Volubi	284810dfb8	fixes #121	2026-01-04 17:51:09 +08:00
Helvetica Volubi	0f67f445b9	Update Luminol	2026-01-04 12:32:42 +08:00
Helvetica Volubi	018cc61204	Update Luminol	2026-01-03 13:59:49 +08:00
Helvetica Volubi	b9c3d8deea	fix ender dragon caused server crash	2026-01-03 01:40:35 +08:00
Helvetica Volubi	0d5b289d65	Update Luminol	2026-01-03 01:04:31 +08:00
Helvetica Volubi	5b20ad2e2c	Update Luminol	2025-12-29 23:39:50 +08:00
Helvetica Volubi	9fcce731d0	Update Luminol	2025-12-29 01:28:30 +08:00
Helvetica Volubi	0783c97224	Update Protocols from Leaves	2025-12-28 00:29:37 +08:00
Helvetica Volubi	300e891906	Update Luminol	2025-12-27 23:42:13 +08:00
Helvetica Volubi	a3e0a3ee1a	Update Wool Counter & FakePlayer code from Leaves	2025-12-27 20:39:17 +08:00
Helvetica Volubi	b3703e2069	fix a bug in way point	2025-12-27 20:36:30 +08:00
Helvetica Volubi	d3c8da4edb	Update Luminol	2025-12-27 17:16:52 +08:00