feat: 准备 1.4.0 稳定版本

.github/dependabot.yml

@@ -5,9 +5,24 @@ updates:
     schedule:
       interval: weekly
     open-pull-requests-limit: 5
+    groups:
+      gradle-dependencies:
+        patterns:
+          - "*"
+    ignore:
+      # 最低 Paper API 由版本兼容架构固定管理，不能自动升级为最新服务端版本。
+      - dependency-name: "io.papermc.paper:paper-api"
+      # 稳定发布不接受 paperweight 快照版本。
+      - dependency-name: "io.papermc.paperweight.userdev"
+        versions:
+          - "*-SNAPSHOT"
 
   - package-ecosystem: github-actions
     directory: /
     schedule:
       interval: weekly
     open-pull-requests-limit: 5
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/workflows/build.yml

@@ -28,7 +28,52 @@ jobs:
       - name: 验证 Gradle Wrapper
         uses: gradle/actions/wrapper-validation@v4
 
-      - name: 构建插件
+      - name: 配置 Gradle
         uses: gradle/actions/setup-gradle@v4
+
+      - name: 授予执行权限
+        run: chmod +x gradlew
+
+      - name: 构建插件
+        run: ./gradlew clean build --no-daemon
+
+      - name: 上传测试产物
+        uses: actions/upload-artifact@v4
         with:
-          arguments: clean build
+          name: EssentialsC-test-build
+          path: build/libs/EssentialsC-*.jar
+          if-no-files-found: error
+
+  paper-smoke-test:
+    name: Paper ${{ matrix.paper }} / Java ${{ matrix.java }}
+    needs: build
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - paper: '1.21.11'
+            java: '21'
+          - paper: '26.1.2'
+            java: '25'
+          - paper: '26.2'
+            java: '25'
+
+    steps:
+      - name: 检出代码
+        uses: actions/checkout@v4
+
+      - name: 设置 Java ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: temurin
+
+      - name: 下载插件产物
+        uses: actions/download-artifact@v4
+        with:
+          name: EssentialsC-test-build
+          path: build/libs
+
+      - name: 启动 Paper 并验证插件
+        run: bash scripts/smoke-test-paper.sh '${{ matrix.paper }}'

.github/workflows/release.yml

@@ -16,18 +16,28 @@ jobs:
       - name: 检出代码
         uses: actions/checkout@v4
 
-      - name: 设置 Java 21
+      - name: 设置 Java 25
         uses: actions/setup-java@v4
         with:
-          java-version: '21'
+          java-version: '25'
           distribution: 'temurin'
           cache: gradle
 
       - name: 授予执行权限
         run: chmod +x gradlew
 
+      - name: 配置 Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: 构建插件
-        run: ./gradlew build
+        shell: bash
+        run: |
+          VERSION="${GITHUB_REF_NAME#v}"
+          if [[ "$VERSION" == "$GITHUB_REF_NAME" || ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+([.-][0-9A-Za-z.-]+)?$ ]]; then
+            echo "无效的发布标签: $GITHUB_REF_NAME" >&2
+            exit 1
+          fi
+          ./gradlew clean build --no-daemon -PpluginVersion="$VERSION"
 
       - name: 创建发行版
         uses: softprops/action-gh-release@v2

CHANGELOG.md

@@ -0,0 +1,25 @@
+# 更新日志
+
+## 1.4.0 - 2026-08-02
+
+### 新增
+
+- 按 HuskHomes 的单服逻辑完整实现 TPA 请求、接受、拒绝、忽略、预热、冷却、位置快照、音效与相关权限。
+- 新增维护模式，包括 MOTD、BossBar、登录拦截、白名单、管理员通知和 LuckPerms 异步权限检查。
+- 新增 SkinBridge，可识别 InfstarMC、LittleSkin 与自定义 Blessing Skin Provider，并通过 MineSkin 与 Paper Profile API 同步皮肤。
+- 新增管理模式独立状态存储、玩家功能状态管理与 JEI 配方同步版本适配。
+
+### 优化
+
+- 按便捷方块、管理、修复与皮肤功能重新整理运行时模块。
+- 完善潜影盒会话保护、TPA 请求队列、配置迁移、数据原子写入与持久化错误处理。
+- 适配 Paper `1.21.11`、`26.1.2` 与 `26.2`，最终插件保持 Java 21 字节码兼容。
+- 迁移 Paper 弃用 API，并将弃用警告设为构建错误。
+- 统一 HuskHomes 风格的中英文消息、颜色和配置注释。
+
+### 注意事项
+
+- 最低服务端版本为 Paper `1.21.11`，不支持 Folia 或 Fabric 服务端。
+- LuckPerms 为推荐软依赖；未安装时维护模式会在玩家加入后复核绕过权限。
+- SkinBridge 默认关闭，启用前必须配置有效的 MineSkin API Key。
+- 主配置版本为 `2`。

README.md

@@ -74,9 +74,10 @@
 
 1. 从 [Releases](https://github.com/Coldsmiles/EssentialsC/releases) 下载所需版本。
 2. 将插件放入服务端的 `plugins/` 目录。
-3. 启动一次服务端以生成配置文件。
-4. 按需修改 `plugins/EssentialsC/` 下的配置文件与 `lang/` 语言文件。
-5. 如有需要，使用权限插件为玩家授权。
+3. 建议安装 LuckPerms；维护模式会优先通过其缓存异步检查登录权限，未安装时会在玩家加入后立即复核。
+4. 启动一次服务端以生成配置文件。
+5. 按需修改 `plugins/EssentialsC/` 下的配置文件与 `lang/` 语言文件。
+6. 使用权限插件为玩家分配所需权限。
 
 ## 配置说明
 
@@ -113,6 +114,8 @@ SkinBridge 默认关闭。使用前需启用 `modules.yml` 中的 `modules.skin-
 
 主配置当前使用 `config-version: 2`。SkinBridge 直接配置在 `config.yml` 中，便捷菜单配置仍保存在独立文件中。
 
+版本变化与升级说明见 [CHANGELOG.md](CHANGELOG.md)。
+
 ## 权限示例
 
 常用权限节点：

build.gradle

@@ -1,6 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.language.jvm.tasks.ProcessResources
 import org.gradle.api.tasks.testing.Test
+import java.util.zip.ZipFile
 
 plugins {
     id 'java'
@@ -9,7 +10,7 @@ plugins {
 }
 
 group = 'cn.infstar'
-version = '1.4.0'
+version = providers.gradleProperty('pluginVersion').orElse('1.4.0').get()
 
 repositories {
     mavenCentral()
@@ -21,6 +22,7 @@ repositories {
 
 dependencies {
     paperweight.paperDevBundle('1.21.11-R0.1-SNAPSHOT')
+    compileOnly 'net.luckperms:api:5.5'
     implementation project(':compat-api')
     implementation 'com.google.code.gson:gson:2.11.0'
     testImplementation platform('org.junit:junit-bom:5.13.4')
@@ -34,8 +36,11 @@ java {
 
 paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.getMOJANG_PRODUCTION()
 
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8'
+allprojects {
+    tasks.withType(JavaCompile).configureEach {
+        options.encoding = 'UTF-8'
+        options.compilerArgs.addAll(['-Xlint:deprecation', '-Werror'])
+    }
 }
 
 tasks.withType(ProcessResources).configureEach {
@@ -79,6 +84,39 @@ tasks.named('assemble').configure {
     dependsOn(tasks.named('shadowJar'))
 }
 
+tasks.register('verifyJava21Bytecode') {
+    group = 'verification'
+    description = '验证最终插件中的全部 class 均可由 Java 21 加载。'
+    dependsOn(tasks.named('shadowJar'))
+
+    doLast {
+        def artifact = tasks.named('shadowJar', ShadowJar).get().archiveFile.get().asFile
+        def unsupportedClasses = []
+        new ZipFile(artifact).withCloseable { zip ->
+            zip.entries().each { entry ->
+                if (!entry.directory && entry.name.endsWith('.class')) {
+                    zip.getInputStream(entry).withCloseable { input ->
+                        byte[] header = input.readNBytes(8)
+                        if (header.length == 8) {
+                            int majorVersion = ((header[6] & 0xff) << 8) | (header[7] & 0xff)
+                            if (majorVersion > 65) {
+                                unsupportedClasses.add("${entry.name} (class ${majorVersion})")
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if (!unsupportedClasses.isEmpty()) {
+            throw new GradleException("检测到无法由 Java 21 加载的类:\n" + unsupportedClasses.join('\n'))
+        }
+    }
+}
+
+tasks.named('check').configure {
+    dependsOn(tasks.named('verifyJava21Bytecode'))
+}
+
 def registerTestServerDeployTask = { String taskName, String serverPath, String serverName ->
     tasks.register(taskName, Copy) {
         group = 'deployment'

compat-api/src/main/java/cn/infstar/essentialsC/compat/jei/JeiRecipeSyncAdapter.java

@@ -9,4 +9,6 @@ public interface JeiRecipeSyncAdapter {
     void sendFabricRecipeSync(Player player, Logger logger, boolean debug) throws Exception;
 
     void sendNeoForgeRecipeSync(Player player, Logger logger, boolean debug) throws Exception;
+
+    void clearCache();
 }

compat-api/src/main/java/cn/infstar/essentialsC/compat/jei/RecipeGrouping.java

@@ -0,0 +1,22 @@
+package cn.infstar.essentialsC.compat.jei;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+public final class RecipeGrouping {
+
+    private RecipeGrouping() {
+    }
+
+    public static <K, V> Map<K, List<V>> groupBy(Iterable<V> values,
+                                                  Function<? super V, ? extends K> keyFunction) {
+        Map<K, List<V>> grouped = new LinkedHashMap<>();
+        for (V value : values) {
+            grouped.computeIfAbsent(keyFunction.apply(value), ignored -> new ArrayList<>()).add(value);
+        }
+        return grouped;
+    }
+}

scripts/smoke-test-paper.sh

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+paper_version="${1:?必须提供 Paper 版本}"
+workspace="$(mktemp -d)"
+server_pid=""
+
+cleanup() {
+  if [[ -n "$server_pid" ]] && kill -0 "$server_pid" 2>/dev/null; then
+    kill -TERM "$server_pid" 2>/dev/null || true
+    wait "$server_pid" 2>/dev/null || true
+  fi
+  rm -rf "$workspace"
+}
+trap cleanup EXIT
+
+metadata_url="https://fill.papermc.io/v3/projects/paper/versions/${paper_version}/builds/latest"
+download_url="$(curl --fail --silent --show-error --location "$metadata_url" \
+  | python3 -c 'import json,sys; print(json.load(sys.stdin)["downloads"]["server:default"]["url"])')"
+
+curl --fail --silent --show-error --location "$download_url" --output "$workspace/paper.jar"
+mkdir -p "$workspace/plugins"
+cp build/libs/EssentialsC-*.jar "$workspace/plugins/EssentialsC.jar"
+printf 'eula=true\n' > "$workspace/eula.txt"
+printf 'online-mode=false\nserver-port=0\nenable-query=false\n' > "$workspace/server.properties"
+
+(
+  cd "$workspace"
+  java -Xms512M -Xmx1G -jar paper.jar --nogui > server.log 2>&1
+) &
+server_pid=$!
+
+for _ in $(seq 1 120); do
+  if grep -Fq 'EssentialsC v1.4.0 已启用' "$workspace/server.log"; then
+    if grep -Eq 'UnsupportedClassVersionError|Error occurred while enabling EssentialsC|Could not load.*EssentialsC' "$workspace/server.log"; then
+      cat "$workspace/server.log"
+      exit 1
+    fi
+    echo "Paper ${paper_version} 启动验证通过。"
+    exit 0
+  fi
+  if ! kill -0 "$server_pid" 2>/dev/null; then
+    cat "$workspace/server.log"
+    exit 1
+  fi
+  sleep 1
+done
+
+cat "$workspace/server.log"
+echo "Paper ${paper_version} 启动验证超时。" >&2
+exit 1

src/main/java/cn/infstar/essentialsC/EssentialsC.java

@@ -2,6 +2,7 @@ package cn.infstar.essentialsC;
 
 import cn.infstar.essentialsC.admin.AdminModeManager;
 import cn.infstar.essentialsC.commands.BaseCommand;
+import cn.infstar.essentialsC.commands.BlocksMenuCommand;
 import cn.infstar.essentialsC.commands.CommandRegistry;
 import cn.infstar.essentialsC.commands.HelpCommand;
 import cn.infstar.essentialsC.commands.PaperCommand;
@@ -13,6 +14,7 @@ import cn.infstar.essentialsC.listeners.ShulkerBoxListener;
 import cn.infstar.essentialsC.listeners.VanishListener;
 import cn.infstar.essentialsC.maintenance.MaintenanceListener;
 import cn.infstar.essentialsC.maintenance.MaintenanceManager;
+import cn.infstar.essentialsC.player.PlayerStateManager;
 import cn.infstar.essentialsC.skinbridge.SkinBridgeManager;
 import cn.infstar.essentialsC.teleport.TeleportRequestManager;
 import cn.infstar.essentialsC.tpsbar.TpsBarManager;
@@ -40,9 +42,11 @@ public final class EssentialsC extends JavaPlugin {
     private AdminModeManager adminModeManager;
     private MaintenanceManager maintenanceManager;
     private TeleportRequestManager teleportRequestManager;
+    private PlayerStateManager playerStateManager;
     private MaintenanceListener maintenanceListener;
     private TpsBarService tpsBarManager;
     private ShulkerBoxListener shulkerBoxListener;
+    private BlocksMenuCommand blocksMenuCommandListener;
     private JeiRecipeSyncListener jeiRecipeSyncListener;
     private MobDropListener mobDropListener;
     private MobDropMenuListener mobDropMenuListener;
@@ -53,9 +57,9 @@ public final class EssentialsC extends JavaPlugin {
 
     @Override
     public void onEnable() {
+        featureConfigManager = new FeatureConfigManager(this);
         langManager = new LangManager(this);
         moduleManager = new ModuleManager(this);
-        featureConfigManager = new FeatureConfigManager(this);
 
         reloadRuntimeModules();
         registerCommands();
@@ -77,9 +81,15 @@ public final class EssentialsC extends JavaPlugin {
         if (teleportRequestManager != null) {
             teleportRequestManager.shutdown();
         }
+        if (playerStateManager != null) {
+            playerStateManager.shutdown();
+        }
         if (skinBridgeManager != null) {
             skinBridgeManager.shutdown();
         }
+        if (shulkerBoxListener != null) {
+            shulkerBoxListener.shutdown();
+        }
         if (vanishListener != null) {
             vanishListener.shutdown();
         }
@@ -113,6 +123,10 @@ public final class EssentialsC extends JavaPlugin {
         return teleportRequestManager;
     }
 
+    public PlayerStateManager getPlayerStateManager() {
+        return playerStateManager;
+    }
+
     public TpsBarService getTpsBarManager() {
         return tpsBarManager;
     }
@@ -134,6 +148,10 @@ public final class EssentialsC extends JavaPlugin {
     }
 
     private void refreshCorePlayerFeatures() {
+        if (playerStateManager == null) {
+            playerStateManager = new PlayerStateManager(this);
+            getServer().getPluginManager().registerEvents(playerStateManager, this);
+        }
         if (vanishListener == null) {
             vanishListener = new VanishListener(this);
             getServer().getPluginManager().registerEvents(vanishListener, this);
@@ -186,7 +204,7 @@ public final class EssentialsC extends JavaPlugin {
             maintenanceManager.reload();
         }
         if (maintenanceListener == null) {
-            maintenanceListener = new MaintenanceListener(this);
+            maintenanceListener = new MaintenanceListener(this, maintenanceManager);
             getServer().getPluginManager().registerEvents(maintenanceListener, this);
         }
         setModuleStatus("维护模式", true, maintenanceManager.isEnabled() ? "当前开启" : "当前关闭");
@@ -224,7 +242,12 @@ public final class EssentialsC extends JavaPlugin {
 
     private void refreshBlocks() {
         if (!moduleManager.isEnabled(ModuleManager.BLOCKS)) {
+            if (blocksMenuCommandListener != null) {
+                HandlerList.unregisterAll(blocksMenuCommandListener);
+                blocksMenuCommandListener = null;
+            }
             if (shulkerBoxListener != null) {
+                shulkerBoxListener.shutdown();
                 HandlerList.unregisterAll(shulkerBoxListener);
                 shulkerBoxListener = null;
             }
@@ -236,6 +259,13 @@ public final class EssentialsC extends JavaPlugin {
             shulkerBoxListener = new ShulkerBoxListener(this);
             getServer().getPluginManager().registerEvents(shulkerBoxListener, this);
         }
+        if (blocksMenuCommandListener == null) {
+            BaseCommand command = CommandRegistry.getCommand("blocks");
+            if (command instanceof BlocksMenuCommand blocksMenuCommand) {
+                blocksMenuCommandListener = blocksMenuCommand;
+                getServer().getPluginManager().registerEvents(blocksMenuCommandListener, this);
+            }
+        }
         setModuleStatus("便捷方块", true, "命令和潜影盒监听器已启用");
     }
 
@@ -279,6 +309,7 @@ public final class EssentialsC extends JavaPlugin {
         }
         if (mobDropMenuListener == null) {
             mobDropMenuListener = new MobDropMenuListener(this);
+            getServer().getPluginManager().registerEvents(mobDropMenuListener, this);
         }
         setModuleStatus("生物掉落", true, "末影人掉落控制已启用");
     }
@@ -319,11 +350,13 @@ public final class EssentialsC extends JavaPlugin {
         unregisterListener(adminModeManager);
         unregisterListener(maintenanceListener);
         unregisterListener(shulkerBoxListener);
+        unregisterListener(blocksMenuCommandListener);
         unregisterListener(jeiRecipeSyncListener);
         unregisterListener(mobDropListener);
         unregisterListener(mobDropMenuListener);
         unregisterListener(vanishListener);
         unregisterListener(teleportRequestManager);
+        unregisterListener(playerStateManager);
         unregisterListener(skinBridgeManager);
         if (tpsBarManager instanceof Listener listener) {
             unregisterListener(listener);
@@ -346,7 +379,7 @@ public final class EssentialsC extends JavaPlugin {
             .count();
         long disabledCount = moduleStatus.size() - enabledCount;
 
-        getLogger().info("EssentialsC v" + getDescription().getVersion()
+        getLogger().info("EssentialsC v" + getPluginMeta().getVersion()
             + " 已启用 | 模块: " + enabledCount + " 启用, " + disabledCount + " 关闭");
 
         if (!getConfig().getBoolean("debug", false)) {
@@ -419,5 +452,10 @@ public final class EssentialsC extends JavaPlugin {
             }
             return List.of();
         }
+
+        @Override
+        public String permission() {
+            return "essentialsc".equals(name) ? null : executor.getPermission();
+        }
     }
 }

src/main/java/cn/infstar/essentialsC/FeatureConfigManager.java

@@ -2,6 +2,7 @@ package cn.infstar.essentialsC;
 
 import cn.infstar.essentialsC.util.AtomicYamlWriter;
 import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 
@@ -10,31 +11,48 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 
 /**
- * 管理独立功能配置，并负责迁移旧版配置结构。
+ * 管理主配置与独立功能配置，并负责按顺序执行配置迁移。
  */
 public final class FeatureConfigManager {
 
     private static final int MAIN_CONFIG_VERSION = 2;
 
     private final EssentialsC plugin;
+    private final File mainConfigFile;
     private final File blocksMenuFile;
     private FileConfiguration blocksMenuConfig;
 
     public FeatureConfigManager(EssentialsC plugin) {
         this.plugin = plugin;
+        this.mainConfigFile = new File(plugin.getDataFolder(), "config.yml");
         this.blocksMenuFile = new File(plugin.getDataFolder(), "blocks-menu.yml");
         reload();
     }
 
     public void reload() {
+        ensureResource(mainConfigFile, "config.yml");
         ensureResource(blocksMenuFile, "blocks-menu.yml");
 
         blocksMenuConfig = loadWithDefaults(blocksMenuFile, "blocks-menu.yml");
-        migrateLegacyMainConfig();
-        migrateLegacyDebugSettings();
-        updateMainConfigVersion();
+        YamlConfiguration loadedMainConfig = loadWithDefaults(mainConfigFile, "config.yml");
+        YamlConfiguration mainConfig = migrateMainConfigVersion(loadedMainConfig);
+
+        boolean mainChanged = mainConfig != loadedMainConfig;
+        mainChanged |= migrateLegacyMainConfig(mainConfig);
+        mainChanged |= migrateLegacyDebugSettings(mainConfig);
+        if (mainConfig.getInt("config-version", 0) != MAIN_CONFIG_VERSION) {
+            mainConfig.set("config-version", MAIN_CONFIG_VERSION);
+            mainChanged = true;
+        }
+
+        if (mainChanged) {
+            save(mainConfig, mainConfigFile);
+        }
+        plugin.reloadConfig();
     }
 
     public FileConfiguration getBlocksMenuConfig() {
@@ -45,31 +63,66 @@ public final class FeatureConfigManager {
         save(blocksMenuConfig, blocksMenuFile);
     }
 
-    private void migrateLegacyMainConfig() {
-        FileConfiguration mainConfig = plugin.getConfig();
-        boolean migrated = false;
-
-        if (mainConfig.contains("blocks-menu", true)) {
-            copySection(mainConfig.getConfigurationSection("blocks-menu"), blocksMenuConfig);
-            mainConfig.set("blocks-menu", null);
-            migrated = true;
+    public boolean updateMainConfigValue(String path, Object value) {
+        YamlConfiguration mainConfig = loadWithDefaults(mainConfigFile, "config.yml");
+        mainConfig.set(path, value);
+        if (!save(mainConfig, mainConfigFile)) {
+            return false;
         }
-
-        if (!migrated) {
-            return;
-        }
-
-        mainConfig.set("config-version", MAIN_CONFIG_VERSION);
-        saveMainConfig();
-        plugin.getLogger().info("已将便捷菜单配置迁移到 blocks-menu.yml。");
+        plugin.getConfig().set(path, value);
+        return true;
     }
 
-    private void migrateLegacyDebugSettings() {
-        FileConfiguration mainConfig = plugin.getConfig();
+    private YamlConfiguration migrateMainConfigVersion(YamlConfiguration existingConfig) {
+        int existingVersion = existingConfig.getInt("config-version", 0);
+        if (existingVersion >= MAIN_CONFIG_VERSION) {
+            return existingConfig;
+        }
+
+        File backupFile = new File(plugin.getDataFolder(),
+            "config.v" + existingVersion + ".bak-" + System.currentTimeMillis() + ".yml");
+        try {
+            Files.copy(mainConfigFile.toPath(), backupFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            YamlConfiguration migratedConfig = loadResource("config.yml");
+            if (migratedConfig == null) {
+                existingConfig.set("config-version", MAIN_CONFIG_VERSION);
+                return existingConfig;
+            }
+
+            for (String path : existingConfig.getKeys(true)) {
+                boolean legacyFeaturePath = path.startsWith("skin-bridge.") || path.startsWith("blocks-menu.");
+                if (!existingConfig.isConfigurationSection(path)
+                    && (migratedConfig.contains(path) || legacyFeaturePath)) {
+                    migratedConfig.set(path, existingConfig.get(path));
+                }
+            }
+            migratedConfig.set("config-version", MAIN_CONFIG_VERSION);
+            plugin.getLogger().info("已将 config.yml 从版本 " + existingVersion
+                + " 迁移到 " + MAIN_CONFIG_VERSION + "，备份文件: " + backupFile.getName());
+            return migratedConfig;
+        } catch (IOException exception) {
+            plugin.getLogger().severe("迁移 config.yml 失败: " + exception.getMessage());
+            return existingConfig;
+        }
+    }
+
+    private boolean migrateLegacyMainConfig(FileConfiguration mainConfig) {
+        if (!mainConfig.contains("blocks-menu", true)) {
+            return false;
+        }
+
+        copySection(mainConfig.getConfigurationSection("blocks-menu"), blocksMenuConfig);
+        mainConfig.set("blocks-menu", null);
+        saveBlocksMenuConfig();
+        plugin.getLogger().info("已将便捷菜单配置迁移到 blocks-menu.yml。");
+        return true;
+    }
+
+    private boolean migrateLegacyDebugSettings(FileConfiguration mainConfig) {
         boolean hasJeiDebug = mainConfig.contains("jei-sync.debug", true);
         boolean hasSkinBridgeDebug = mainConfig.contains("skin-bridge.debug", true);
         if (!hasJeiDebug && !hasSkinBridgeDebug) {
-            return;
+            return false;
         }
 
         boolean debugEnabled = mainConfig.getBoolean("debug", false)
@@ -78,16 +131,8 @@ public final class FeatureConfigManager {
         mainConfig.set("debug", debugEnabled);
         mainConfig.set("jei-sync.debug", null);
         mainConfig.set("skin-bridge.debug", null);
-        saveMainConfig();
         plugin.getLogger().info("已将独立功能调试开关合并到 config.yml 的全局 debug。");
-    }
-
-    private void updateMainConfigVersion() {
-        if (plugin.getConfig().getInt("config-version", 0) >= MAIN_CONFIG_VERSION) {
-            return;
-        }
-        plugin.getConfig().set("config-version", MAIN_CONFIG_VERSION);
-        saveMainConfig();
+        return true;
     }
 
     private void copySection(ConfigurationSection source, FileConfiguration target) {
@@ -101,34 +146,59 @@ public final class FeatureConfigManager {
         }
     }
 
-    private FileConfiguration loadWithDefaults(File file, String resourcePath) {
-        YamlConfiguration config = YamlConfiguration.loadConfiguration(file);
-        InputStream defaultsStream = plugin.getResource(resourcePath);
-        if (defaultsStream != null) {
-            YamlConfiguration defaults = YamlConfiguration.loadConfiguration(
-                new InputStreamReader(defaultsStream, StandardCharsets.UTF_8)
-            );
+    private YamlConfiguration loadWithDefaults(File file, String resourcePath) {
+        YamlConfiguration config = loadFile(file);
+        YamlConfiguration defaults = loadResource(resourcePath);
+        if (defaults != null) {
             config.setDefaults(defaults);
             config.options().copyDefaults(true);
         }
         return config;
     }
 
+    private YamlConfiguration loadFile(File file) {
+        YamlConfiguration config = new YamlConfiguration();
+        config.options().parseComments(true);
+        try {
+            config.load(file);
+        } catch (IOException | InvalidConfigurationException exception) {
+            plugin.getLogger().severe("加载 " + file.getName() + " 失败: " + exception.getMessage());
+            throw new IllegalStateException("无法加载 " + file.getName() + "，请修复配置格式后重试。", exception);
+        }
+        return config;
+    }
+
+    private YamlConfiguration loadResource(String resourcePath) {
+        InputStream resource = plugin.getResource(resourcePath);
+        if (resource == null) {
+            return null;
+        }
+
+        YamlConfiguration config = new YamlConfiguration();
+        config.options().parseComments(true);
+        try (InputStream input = resource;
+             InputStreamReader reader = new InputStreamReader(input, StandardCharsets.UTF_8)) {
+            config.load(reader);
+            return config;
+        } catch (IOException | InvalidConfigurationException exception) {
+            plugin.getLogger().severe("加载内置资源 " + resourcePath + " 失败: " + exception.getMessage());
+            return null;
+        }
+    }
+
     private void ensureResource(File file, String resourcePath) {
         if (!file.exists()) {
             plugin.saveResource(resourcePath, false);
         }
     }
 
-    private void save(FileConfiguration config, File file) {
+    private boolean save(FileConfiguration config, File file) {
         try {
             AtomicYamlWriter.save(config, file);
+            return true;
         } catch (Exception exception) {
             plugin.getLogger().warning("保存 " + file.getName() + " 失败: " + exception.getMessage());
+            return false;
         }
     }
-
-    private void saveMainConfig() {
-        save(plugin.getConfig(), new File(plugin.getDataFolder(), "config.yml"));
-    }
 }

src/main/java/cn/infstar/essentialsC/LangManager.java

@@ -1,10 +1,8 @@
 package cn.infstar.essentialsC;
 
-import cn.infstar.essentialsC.util.AtomicYamlWriter;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -14,8 +12,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -24,9 +20,10 @@ import java.util.regex.Pattern;
 
 public class LangManager {
 
-    private static final int CURRENT_CONFIG_VERSION = 2;
     private static final Pattern HEX_COLOR_PATTERN = Pattern.compile("(?i)&#([0-9a-f]{6})");
     private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
+    private static final LegacyComponentSerializer LEGACY_AMPERSAND = LegacyComponentSerializer.legacyAmpersand();
+    private static final LegacyComponentSerializer LEGACY_SECTION = LegacyComponentSerializer.legacySection();
     private static final Map<String, String> THEME_COLORS = Map.of(
         "&a", "&#00fb9a",
         "&b", "&#5286ff",
@@ -37,13 +34,11 @@ public class LangManager {
     );
 
     private final JavaPlugin plugin;
-    private FileConfiguration config;
     private FileConfiguration langFile;
     private String currentLanguage;
 
     public LangManager(JavaPlugin plugin) {
         this.plugin = plugin;
-        loadConfig();
         loadLanguage();
     }
 
@@ -74,8 +69,7 @@ public class LangManager {
     public Component getComponent(String path, Map<String, String> placeholders) {
         String value = langFile.getString(path);
         if (value == null) {
-            return LegacyComponentSerializer.legacySection()
-                .deserialize(translateColorCodes("&c缺少语言文本: " + path));
+            return LEGACY_SECTION.deserialize(translateColorCodes("&c缺少语言文本: " + path));
         }
 
         return renderToComponent(applyPlaceholders(value, placeholders));
@@ -88,8 +82,7 @@ public class LangManager {
     public Component getPrefixedComponent(String path, Map<String, String> placeholders) {
         String value = langFile.getString(path);
         if (value == null) {
-            return LegacyComponentSerializer.legacySection()
-                .deserialize(getPrefix() + translateColorCodes("&c缺少语言文本: " + path));
+            return LEGACY_SECTION.deserialize(getPrefix() + translateColorCodes("&c缺少语言文本: " + path));
         }
         return renderToComponent(langFile.getString("prefix", "") + applyPlaceholders(value, placeholders));
     }
@@ -116,7 +109,6 @@ public class LangManager {
     }
 
     public void reload() {
-        loadConfig();
         loadLanguage();
     }
 
@@ -124,66 +116,8 @@ public class LangManager {
         return currentLanguage;
     }
 
-    private void loadConfig() {
-        File configFile = new File(plugin.getDataFolder(), "config.yml");
-        if (!configFile.exists()) {
-            plugin.saveResource("config.yml", false);
-        }
-
-        migrateConfigIfNeeded(configFile);
-        config = YamlConfiguration.loadConfiguration(configFile);
-        config.addDefault("config-version", CURRENT_CONFIG_VERSION);
-        config.addDefault("language", "zh_CN");
-        config.addDefault("debug", false);
-        config.options().copyDefaults(true);
-
-    }
-
-    private void migrateConfigIfNeeded(File configFile) {
-        FileConfiguration existingConfig = YamlConfiguration.loadConfiguration(configFile);
-        int existingVersion = existingConfig.getInt("config-version", 0);
-        if (existingVersion >= CURRENT_CONFIG_VERSION) {
-            return;
-        }
-
-        File backupFile = new File(plugin.getDataFolder(),
-            "config.v" + existingVersion + ".bak-" + System.currentTimeMillis() + ".yml");
-
-        try {
-            Files.copy(configFile.toPath(), backupFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-            InputStream defaultConfigStream = plugin.getResource("config.yml");
-            if (defaultConfigStream != null) {
-                YamlConfiguration migratedConfig = YamlConfiguration.loadConfiguration(
-                    new InputStreamReader(defaultConfigStream, StandardCharsets.UTF_8)
-                );
-                for (String path : existingConfig.getKeys(true)) {
-                    boolean migratedFeaturePath = path.startsWith("skin-bridge.") || path.startsWith("blocks-menu.");
-                    if (!existingConfig.isConfigurationSection(path)
-                        && (migratedConfig.contains(path) || migratedFeaturePath)) {
-                        migratedConfig.set(path, existingConfig.get(path));
-                    }
-                }
-                boolean debugEnabled = existingConfig.getBoolean("debug", false)
-                    || existingConfig.getBoolean("jei-sync.debug", false)
-                    || existingConfig.getBoolean("skin-bridge.debug", false);
-                migratedConfig.set("debug", debugEnabled);
-                migratedConfig.set("jei-sync.debug", null);
-                migratedConfig.set("config-version", CURRENT_CONFIG_VERSION);
-                AtomicYamlWriter.save(migratedConfig, configFile);
-            } else {
-                existingConfig.set("config-version", CURRENT_CONFIG_VERSION);
-                AtomicYamlWriter.save(existingConfig, configFile);
-            }
-
-            plugin.getLogger().info("已将 config.yml 从版本 " + existingVersion
-                + " 迁移到 " + CURRENT_CONFIG_VERSION + "，备份文件: " + backupFile.getName());
-        } catch (IOException e) {
-            plugin.getLogger().severe("迁移 config.yml 失败: " + e.getMessage());
-        }
-    }
-
     private void loadLanguage() {
-        currentLanguage = config.getString("language", "zh_CN");
+        currentLanguage = plugin.getConfig().getString("language", "zh_CN");
 
         File langFolder = new File(plugin.getDataFolder(), "lang");
         if (!langFolder.exists() && !langFolder.mkdirs()) {
@@ -251,7 +185,7 @@ public class LangManager {
         for (Map.Entry<String, String> color : THEME_COLORS.entrySet()) {
             themedText = themedText.replace(color.getKey(), color.getValue());
         }
-        return ChatColor.translateAlternateColorCodes('&', expandHexColors(themedText));
+        return LEGACY_SECTION.serialize(LEGACY_AMPERSAND.deserialize(expandHexColors(themedText)));
     }
 
     private String expandHexColors(String text) {
@@ -270,7 +204,7 @@ public class LangManager {
     }
 
     private String renderToLegacy(String text) {
-        return LegacyComponentSerializer.legacySection().serialize(renderToComponent(text));
+        return LEGACY_SECTION.serialize(renderToComponent(text));
     }
 
     private Component renderToComponent(String text) {
@@ -284,7 +218,7 @@ public class LangManager {
                 // 配置中 MiniMessage 语法错误时回退到旧颜色码解析，避免消息完全不可用。
             }
         }
-        return LegacyComponentSerializer.legacySection().deserialize(translateColorCodes(text));
+        return LEGACY_SECTION.deserialize(translateColorCodes(text));
     }
 
     private boolean looksLikeMiniMessage(String text) {

src/main/java/cn/infstar/essentialsC/ModuleManager.java

@@ -1,10 +1,12 @@
 package cn.infstar.essentialsC;
 
 import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -47,7 +49,15 @@ public final class ModuleManager {
             plugin.saveResource("modules.yml", false);
         }
 
-        modulesConfig = YamlConfiguration.loadConfiguration(modulesFile);
+        YamlConfiguration loaded = new YamlConfiguration();
+        loaded.options().parseComments(true);
+        try {
+            loaded.load(modulesFile);
+        } catch (IOException | InvalidConfigurationException exception) {
+            plugin.getLogger().severe("加载 modules.yml 失败: " + exception.getMessage());
+            throw new IllegalStateException("无法加载 modules.yml，请修复配置格式后重试。", exception);
+        }
+        modulesConfig = loaded;
         modulesConfig.addDefault("config-version", CURRENT_CONFIG_VERSION);
         for (Map.Entry<String, Boolean> module : DEFAULT_MODULES.entrySet()) {
             modulesConfig.addDefault(path(module.getKey()), module.getValue());

src/main/java/cn/infstar/essentialsC/admin/AdminModeManager.java

@@ -1,7 +1,6 @@
 package cn.infstar.essentialsC.admin;
 
 import cn.infstar.essentialsC.EssentialsC;
-import cn.infstar.essentialsC.util.AtomicYamlWriter;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.attribute.Attribute;
@@ -15,7 +14,6 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.scheduler.BukkitTask;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -28,8 +26,7 @@ public final class AdminModeManager implements Listener {
     private static final float VANILLA_FLY_SPEED = 0.1F;
 
     private final EssentialsC plugin;
-    private final File dataFile;
-    private final YamlConfiguration data;
+    private final AdminModeStore store;
     private final Set<UUID> activePlayers = new HashSet<>();
 
     private BukkitTask actionBarTask;
@@ -37,8 +34,7 @@ public final class AdminModeManager implements Listener {
     public AdminModeManager(EssentialsC plugin) {
         this.plugin = plugin;
         addConfigDefaults();
-        this.dataFile = new File(plugin.getDataFolder(), "admin-mode.yml");
-        this.data = YamlConfiguration.loadConfiguration(dataFile);
+        this.store = new AdminModeStore(plugin);
     }
 
     public void reload() {
@@ -82,21 +78,37 @@ public final class AdminModeManager implements Listener {
             actionBarTask.cancel();
             actionBarTask = null;
         }
-        saveData();
     }
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
-        String playerPath = getPlayerPath(player);
-        if (!data.getBoolean(playerPath + ".active", false)) {
+        YamlConfiguration data = store.load(player.getUniqueId());
+        if (data == null) {
+            sendLangMessage(player, "admin-mode.messages.save-failed");
+            return;
+        }
+        if (!data.getBoolean("active", false)) {
             return;
         }
 
-        saveProfile(player, playerPath + ".admin");
-        restoreNormalProfile(player);
-        data.set(playerPath + ".active", false);
-        saveData();
+        saveProfile(player, data, "admin");
+        if (!saveData(player, data)) {
+            activePlayers.add(player.getUniqueId());
+            startActionBarTask();
+            sendLangMessage(player, "admin-mode.messages.save-failed");
+            return;
+        }
+        restoreNormalProfile(player, data);
+        data.set("active", false);
+        if (!saveData(player, data)) {
+            data.set("active", true);
+            loadProfile(player, data, "admin");
+            activePlayers.add(player.getUniqueId());
+            startActionBarTask();
+            sendLangMessage(player, "admin-mode.messages.save-failed");
+            return;
+        }
         sendLangMessage(player, "admin-mode.messages.crash-restored");
     }
 
@@ -109,17 +121,21 @@ public final class AdminModeManager implements Listener {
     }
 
     private void enable(Player player) {
-        String playerPath = getPlayerPath(player);
-        player.closeInventory();
-        saveProfile(player, playerPath + ".normal");
-        data.set(playerPath + ".active", true);
-        if (!saveData()) {
+        YamlConfiguration data = store.load(player.getUniqueId());
+        if (data == null) {
             sendLangMessage(player, "admin-mode.messages.save-failed");
-            data.set(playerPath + ".active", false);
+            return;
+        }
+        player.closeInventory();
+        saveProfile(player, data, "normal");
+        data.set("active", true);
+        if (!saveData(player, data)) {
+            sendLangMessage(player, "admin-mode.messages.save-failed");
+            data.set("active", false);
             return;
         }
 
-        if (!loadProfile(player, playerPath + ".admin")) {
+        if (!loadProfile(player, data, "admin")) {
             clearInventory(player);
         }
 
@@ -129,32 +145,53 @@ public final class AdminModeManager implements Listener {
         player.setAllowFlight(true);
         player.setFlying(true);
         player.setFlySpeed(getAdminFlySpeed());
-        saveData();
 
         sendLangMessage(player, "admin-mode.messages.enabled");
         sendActionBar(player);
         startActionBarTask();
     }
 
-    private void disable(Player player, boolean notify) {
-        String playerPath = getPlayerPath(player);
+    private boolean disable(Player player, boolean notify) {
+        YamlConfiguration data = store.load(player.getUniqueId());
+        if (data == null) {
+            if (notify) {
+                sendLangMessage(player, "admin-mode.messages.save-failed");
+            }
+            return false;
+        }
         player.closeInventory();
-        saveProfile(player, playerPath + ".admin");
-        restoreNormalProfile(player);
+        saveProfile(player, data, "admin");
+        data.set("active", true);
+        if (!saveData(player, data)) {
+            if (notify) {
+                sendLangMessage(player, "admin-mode.messages.save-failed");
+            }
+            return false;
+        }
+        restoreNormalProfile(player, data);
+
+        data.set("active", false);
+        if (!saveData(player, data)) {
+            data.set("active", true);
+            loadProfile(player, data, "admin");
+            activePlayers.add(player.getUniqueId());
+            if (notify) {
+                sendLangMessage(player, "admin-mode.messages.save-failed");
+            }
+            return false;
+        }
 
         activePlayers.remove(player.getUniqueId());
-        data.set(playerPath + ".active", false);
-        saveData();
 
         if (notify) {
             sendLangMessage(player, "admin-mode.messages.disabled");
         }
         stopActionBarTaskIfIdle();
+        return true;
     }
 
-    private void restoreNormalProfile(Player player) {
-        String playerPath = getPlayerPath(player);
-        if (!loadProfile(player, playerPath + ".normal")) {
+    private void restoreNormalProfile(Player player, YamlConfiguration data) {
+        if (!loadProfile(player, data, "normal")) {
             clearInventory(player);
             player.setGameMode(GameMode.SURVIVAL);
             player.setAllowFlight(false);
@@ -163,7 +200,7 @@ public final class AdminModeManager implements Listener {
         }
     }
 
-    private void saveProfile(Player player, String path) {
+    private void saveProfile(Player player, YamlConfiguration data, String path) {
         PlayerInventory inventory = player.getInventory();
         data.set(path + ".storage", Arrays.asList(inventory.getStorageContents()));
         data.set(path + ".armor", Arrays.asList(inventory.getArmorContents()));
@@ -184,24 +221,24 @@ public final class AdminModeManager implements Listener {
         data.set(path + ".fire-ticks", player.getFireTicks());
     }
 
-    private boolean loadProfile(Player player, String path) {
+    private boolean loadProfile(Player player, YamlConfiguration data, String path) {
         if (!data.contains(path)) {
             return false;
         }
 
         PlayerInventory inventory = player.getInventory();
         clearInventory(player);
-        inventory.setStorageContents(readItemArray(path + ".storage", inventory.getStorageContents().length));
-        inventory.setArmorContents(readItemArray(path + ".armor", inventory.getArmorContents().length));
-        inventory.setExtraContents(readItemArray(path + ".extra", inventory.getExtraContents().length));
+        inventory.setStorageContents(readItemArray(data, path + ".storage", inventory.getStorageContents().length));
+        inventory.setArmorContents(readItemArray(data, path + ".armor", inventory.getArmorContents().length));
+        inventory.setExtraContents(readItemArray(data, path + ".extra", inventory.getExtraContents().length));
         inventory.setHeldItemSlot(clampHeldSlot(data.getInt(path + ".held-slot", inventory.getHeldItemSlot())));
-        player.setItemOnCursor(readItem(path + ".cursor"));
+        player.setItemOnCursor(readItem(data, path + ".cursor"));
 
-        player.setGameMode(readGameMode(path + ".game-mode", player.getGameMode()));
+        player.setGameMode(readGameMode(data, path + ".game-mode", player.getGameMode()));
         player.setAllowFlight(data.getBoolean(path + ".allow-flight", player.getAllowFlight()));
         player.setFlying(data.getBoolean(path + ".flying", false) && player.getAllowFlight());
         player.setFlySpeed(clampFlySpeed(data.getDouble(path + ".fly-speed", VANILLA_FLY_SPEED)));
-        player.setHealth(readHealth(player, path + ".health"));
+        player.setHealth(readHealth(player, data, path + ".health"));
         player.setFoodLevel(clampFoodLevel(data.getInt(path + ".food-level", player.getFoodLevel())));
         player.setSaturation(clampSaturation(data.getDouble(path + ".saturation", player.getSaturation())));
         player.setExhaustion(clampExhaustion(data.getDouble(path + ".exhaustion", player.getExhaustion())));
@@ -212,7 +249,7 @@ public final class AdminModeManager implements Listener {
         return true;
     }
 
-    private ItemStack[] readItemArray(String path, int size) {
+    private ItemStack[] readItemArray(YamlConfiguration data, String path, int size) {
         ItemStack[] items = new ItemStack[size];
         List<?> list = data.getList(path);
         if (list == null) {
@@ -228,7 +265,7 @@ public final class AdminModeManager implements Listener {
         return items;
     }
 
-    private GameMode readGameMode(String path, GameMode fallback) {
+    private GameMode readGameMode(YamlConfiguration data, String path, GameMode fallback) {
         try {
             return GameMode.valueOf(data.getString(path, fallback.name()));
         } catch (IllegalArgumentException ignored) {
@@ -236,7 +273,7 @@ public final class AdminModeManager implements Listener {
         }
     }
 
-    private double readHealth(Player player, String path) {
+    private double readHealth(Player player, YamlConfiguration data, String path) {
         double maxHealth = player.getAttribute(Attribute.MAX_HEALTH) != null
             ? player.getAttribute(Attribute.MAX_HEALTH).getValue()
             : player.getHealth();
@@ -247,7 +284,7 @@ public final class AdminModeManager implements Listener {
         return Math.min(Math.max(1.0D, health), maxHealth);
     }
 
-    private ItemStack readItem(String path) {
+    private ItemStack readItem(YamlConfiguration data, String path) {
         Object value = data.get(path);
         if (value instanceof ItemStack itemStack) {
             return itemStack;
@@ -334,22 +371,12 @@ public final class AdminModeManager implements Listener {
         return (float) Math.max(0.0D, Math.min(1.0D, exp));
     }
 
-    private String getPlayerPath(Player player) {
-        return "players." + player.getUniqueId();
-    }
-
     private void sendLangMessage(Player player, String path) {
         player.sendMessage(EssentialsC.getLangManager().getPrefixedString(path));
     }
 
-    private boolean saveData() {
-        try {
-            AtomicYamlWriter.save(data, dataFile);
-            return true;
-        } catch (Exception e) {
-            plugin.getLogger().warning("保存 admin-mode.yml 失败: " + e.getMessage());
-            return false;
-        }
+    private boolean saveData(Player player, YamlConfiguration data) {
+        return store.save(player.getUniqueId(), data);
     }
 
     private void addConfigDefaults() {

src/main/java/cn/infstar/essentialsC/admin/AdminModeStore.java

@@ -0,0 +1,119 @@
+package cn.infstar.essentialsC.admin;
+
+import cn.infstar.essentialsC.EssentialsC;
+import cn.infstar.essentialsC.util.AtomicYamlWriter;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.UUID;
+import java.util.logging.Logger;
+
+final class AdminModeStore {
+
+    private final File directory;
+    private final File legacyFile;
+    private final Logger logger;
+
+    AdminModeStore(EssentialsC plugin) {
+        this(new File(plugin.getDataFolder(), "admin-mode"),
+            new File(plugin.getDataFolder(), "admin-mode.yml"), plugin.getLogger());
+    }
+
+    AdminModeStore(File directory, File legacyFile, Logger logger) {
+        this.directory = directory;
+        this.legacyFile = legacyFile;
+        this.logger = logger;
+        migrateLegacyFile();
+    }
+
+    YamlConfiguration load(UUID playerId) {
+        File playerFile = getPlayerFile(playerId);
+        YamlConfiguration data = new YamlConfiguration();
+        if (!playerFile.exists()) {
+            return data;
+        }
+        try {
+            data.load(playerFile);
+        } catch (IOException | InvalidConfigurationException exception) {
+            logger.warning("加载管理模式玩家存档失败 (" + playerId + "): " + exception.getMessage());
+            return null;
+        }
+        return data;
+    }
+
+    boolean save(UUID playerId, YamlConfiguration data) {
+        try {
+            AtomicYamlWriter.save(data, getPlayerFile(playerId));
+            return true;
+        } catch (IOException exception) {
+            logger.warning("保存管理模式玩家存档失败 (" + playerId + "): " + exception.getMessage());
+            return false;
+        }
+    }
+
+    private void migrateLegacyFile() {
+        if (!legacyFile.exists()) {
+            return;
+        }
+
+        YamlConfiguration legacy = new YamlConfiguration();
+        try {
+            legacy.load(legacyFile);
+        } catch (IOException | InvalidConfigurationException exception) {
+            logger.warning("加载旧 admin-mode.yml 失败，已保留原文件: " + exception.getMessage());
+            return;
+        }
+
+        ConfigurationSection players = legacy.getConfigurationSection("players");
+        if (players != null) {
+            for (String playerIdText : players.getKeys(false)) {
+                UUID playerId;
+                try {
+                    playerId = UUID.fromString(playerIdText);
+                } catch (IllegalArgumentException exception) {
+                    logger.warning("忽略 admin-mode.yml 中无效的玩家 UUID: " + playerIdText);
+                    continue;
+                }
+
+                if (getPlayerFile(playerId).exists()) {
+                    continue;
+                }
+                YamlConfiguration migrated = new YamlConfiguration();
+                copySection(players.getConfigurationSection(playerIdText), migrated);
+                if (!save(playerId, migrated)) {
+                    logger.warning("admin-mode.yml 迁移未完成，已保留原文件供下次重试。");
+                    return;
+                }
+            }
+        }
+
+        File backup = new File(legacyFile.getParentFile(),
+            "admin-mode.legacy-" + System.currentTimeMillis() + ".yml");
+        try {
+            Files.move(legacyFile.toPath(), backup.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            logger.info("已将 admin-mode.yml 拆分为每玩家存档，旧文件已备份为 " + backup.getName());
+        } catch (IOException exception) {
+            logger.warning("备份旧 admin-mode.yml 失败: " + exception.getMessage());
+        }
+    }
+
+    private void copySection(ConfigurationSection source, YamlConfiguration target) {
+        if (source == null) {
+            return;
+        }
+        for (String path : source.getKeys(true)) {
+            if (!source.isConfigurationSection(path)) {
+                target.set(path, source.get(path));
+            }
+        }
+    }
+
+    private File getPlayerFile(UUID playerId) {
+        return new File(directory, playerId + ".yml");
+    }
+}

src/main/java/cn/infstar/essentialsC/commands/AnvilCommand.java

@@ -3,6 +3,7 @@ package cn.infstar.essentialsC.commands;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.MenuType;
 
 public class AnvilCommand extends BaseCommand {
 
@@ -12,7 +13,7 @@ public class AnvilCommand extends BaseCommand {
 
     @Override
     protected boolean execute(Player player, String[] args) {
-        player.openAnvil(null, true);
+        player.openInventory(MenuType.ANVIL.builder().checkReachable(false).build(player));
         playBlockShortcutSound(player, Material.ANVIL, Sound.BLOCK_ANVIL_USE);
         return true;
     }

src/main/java/cn/infstar/essentialsC/commands/BlocksMenuCommand.java

@@ -1,7 +1,6 @@
 package cn.infstar.essentialsC.commands;
 
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Sound;
@@ -16,6 +15,8 @@ import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataType;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,14 +26,12 @@ public class BlocksMenuCommand extends BaseCommand implements Listener {
 
     private static final int MENU_SIZE = 36;
     private static final int[] DIVIDER_SLOTS = {4, 13, 22, 31};
-    private static boolean listenerRegistered = false;
-
     private final NamespacedKey blockKey;
 
     private static final class BlocksMenuHolder implements InventoryHolder {
         private final Inventory inventory;
 
-        private BlocksMenuHolder(String title) {
+        private BlocksMenuHolder(Component title) {
             this.inventory = Bukkit.createInventory(this, MENU_SIZE, title);
         }
 
@@ -45,10 +44,6 @@ public class BlocksMenuCommand extends BaseCommand implements Listener {
     public BlocksMenuCommand() {
         super("essentialsc.command.blocks");
         addConfigDefaults();
-        if (!listenerRegistered) {
-            plugin.getServer().getPluginManager().registerEvents(this, plugin);
-            listenerRegistered = true;
-        }
         this.blockKey = new NamespacedKey(plugin, "block_key");
     }
 
@@ -59,7 +54,7 @@ public class BlocksMenuCommand extends BaseCommand implements Listener {
     }
 
     private void openMenu(Player player) {
-        Inventory menu = new BlocksMenuHolder(getLang().getString("blocks-menu.title")).getInventory();
+        Inventory menu = new BlocksMenuHolder(getLang().getComponent("blocks-menu.title")).getInventory();
 
         FileConfiguration menuConfig = plugin.getFeatureConfigManager().getBlocksMenuConfig();
         var sectionsConfig = menuConfig.getConfigurationSection("sections");
@@ -170,8 +165,10 @@ public class BlocksMenuCommand extends BaseCommand implements Listener {
         ItemStack item = new ItemStack(menuItem.material());
         ItemMeta meta = item.getItemMeta();
         if (meta != null) {
-            meta.setDisplayName(menuItem.name());
-            meta.setLore(menuItem.lore().isEmpty() ? null : menuItem.lore());
+            meta.displayName(legacyComponent(menuItem.name()));
+            meta.lore(menuItem.lore().isEmpty() ? null : menuItem.lore().stream()
+                .map(this::legacyComponent)
+                .toList());
             if (menuItem.commandKey() != null && !menuItem.commandKey().isBlank()) {
                 meta.getPersistentDataContainer().set(blockKey, PersistentDataType.STRING, menuItem.commandKey());
             }
@@ -184,7 +181,7 @@ public class BlocksMenuCommand extends BaseCommand implements Listener {
         ItemStack divider = new ItemStack(Material.GRAY_STAINED_GLASS_PANE);
         ItemMeta meta = divider.getItemMeta();
         if (meta != null) {
-            meta.setDisplayName(" ");
+            meta.displayName(Component.text(" "));
             divider.setItemMeta(meta);
         }
 
@@ -250,8 +247,8 @@ public class BlocksMenuCommand extends BaseCommand implements Listener {
         }
     }
 
-    private String translateColor(String text) {
-        return text == null ? "" : ChatColor.translateAlternateColorCodes('&', text);
+    private Component legacyComponent(String text) {
+        return LegacyComponentSerializer.legacySection().deserialize(text == null ? "" : text);
     }
 
     private void addConfigDefaults() {

src/main/java/cn/infstar/essentialsC/commands/CartographyTableCommand.java

@@ -3,6 +3,7 @@ package cn.infstar.essentialsC.commands;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.MenuType;
 
 public class CartographyTableCommand extends BaseCommand {
 
@@ -12,7 +13,7 @@ public class CartographyTableCommand extends BaseCommand {
 
     @Override
     protected boolean execute(Player player, String[] args) {
-        player.openCartographyTable(null, true);
+        player.openInventory(MenuType.CARTOGRAPHY_TABLE.builder().checkReachable(false).build(player));
         playBlockShortcutSound(player, Material.CARTOGRAPHY_TABLE, Sound.ENTITY_VILLAGER_WORK_CARTOGRAPHER);
         return true;
     }

src/main/java/cn/infstar/essentialsC/commands/CommandRegistry.java

@@ -176,8 +176,7 @@ public final class CommandRegistry {
         }
     }
 
-    public static void clearCache() {
-        COMMAND_CACHE.clear();
+    public static void clearInitializationFailures() {
         UNAVAILABLE_COMMANDS.clear();
     }
 

src/main/java/cn/infstar/essentialsC/commands/FeedCommand.java

@@ -24,7 +24,7 @@ public class FeedCommand extends BaseCommand {
             return true;
         }
 
-        Player target = Bukkit.getPlayer(args[0]);
+        Player target = Bukkit.getPlayerExact(args[0]);
         if (target == null) {
             player.sendMessage(getLang().getPrefixedString("messages.player-not-found", Map.of("player", args[0])));
             return true;

src/main/java/cn/infstar/essentialsC/commands/FlyCommand.java

@@ -10,15 +10,13 @@ public class FlyCommand extends BaseCommand {
     
     @Override
     protected boolean execute(Player player, String[] args) {
-        boolean currentFlyState = player.getAllowFlight();
+        boolean currentFlyState = plugin.getPlayerStateManager().isFlyEnabled(player);
         
         if (currentFlyState) {
-            player.setAllowFlight(false);
-            player.setFlying(false);
+            plugin.getPlayerStateManager().disableFly(player);
             player.sendMessage(getLang().getPrefixedString("messages.fly-disabled"));
         } else {
-            player.setAllowFlight(true);
-            player.setFlying(true);
+            plugin.getPlayerStateManager().enableFly(player);
             player.sendMessage(getLang().getPrefixedString("messages.fly-enabled"));
         }
         

src/main/java/cn/infstar/essentialsC/commands/GlowCommand.java

@@ -1,17 +1,12 @@
 package cn.infstar.essentialsC.commands;
 
-import org.bukkit.NamespacedKey;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
-import org.bukkit.persistence.PersistentDataType;
 
 public class GlowCommand extends BaseCommand {
 
-    private final NamespacedKey enabledKey;
-
     public GlowCommand() {
         super("essentialsc.command.glow");
-        this.enabledKey = new NamespacedKey(plugin, "glow_enabled");
     }
 
     @Override
@@ -24,15 +19,11 @@ public class GlowCommand extends BaseCommand {
         }
 
         if (targetState) {
-            player.setGlowing(true);
-            player.getPersistentDataContainer().set(enabledKey, PersistentDataType.BYTE, (byte) 1);
+            plugin.getPlayerStateManager().enableGlow(player);
             playShortcutSound(player, Sound.BLOCK_AMETHYST_BLOCK_CHIME);
             player.sendMessage(getLang().getPrefixedString("messages.glow-enabled"));
         } else {
-            if (currentState) {
-                player.setGlowing(false);
-                player.getPersistentDataContainer().remove(enabledKey);
-            }
+            plugin.getPlayerStateManager().disableGlow(player);
             playShortcutSound(player, Sound.BLOCK_AMETHYST_CLUSTER_FALL);
             player.sendMessage(getLang().getPrefixedString("messages.glow-disabled"));
         }
@@ -53,7 +44,6 @@ public class GlowCommand extends BaseCommand {
     }
 
     private boolean isPluginGlowEnabled(Player player) {
-        Byte value = player.getPersistentDataContainer().get(enabledKey, PersistentDataType.BYTE);
-        return value != null && value == (byte) 1;
+        return plugin.getPlayerStateManager().isGlowEnabled(player);
     }
 }

src/main/java/cn/infstar/essentialsC/commands/GrindstoneCommand.java

@@ -3,6 +3,7 @@ package cn.infstar.essentialsC.commands;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.MenuType;
 
 public class GrindstoneCommand extends BaseCommand {
 
@@ -12,7 +13,7 @@ public class GrindstoneCommand extends BaseCommand {
 
     @Override
     protected boolean execute(Player player, String[] args) {
-        player.openGrindstone(null, true);
+        player.openInventory(MenuType.GRINDSTONE.builder().checkReachable(false).build(player));
         playBlockShortcutSound(player, Material.GRINDSTONE, Sound.BLOCK_GRINDSTONE_USE);
         return true;
     }

src/main/java/cn/infstar/essentialsC/commands/HealCommand.java

@@ -1,6 +1,8 @@
 package cn.infstar.essentialsC.commands;
 
 import org.bukkit.Bukkit;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeInstance;
 import org.bukkit.entity.Player;
 
 import java.util.Map;
@@ -24,7 +26,7 @@ public class HealCommand extends BaseCommand {
             return true;
         }
 
-        Player target = Bukkit.getPlayer(args[0]);
+        Player target = Bukkit.getPlayerExact(args[0]);
         if (target == null) {
             player.sendMessage(getLang().getPrefixedString("messages.player-not-found", Map.of("player", args[0])));
             return true;
@@ -37,7 +39,8 @@ public class HealCommand extends BaseCommand {
     }
 
     private void healPlayer(Player player) {
-        player.setHealth(player.getMaxHealth());
+        AttributeInstance maxHealth = player.getAttribute(Attribute.MAX_HEALTH);
+        player.setHealth(maxHealth == null ? player.getHealth() : maxHealth.getValue());
         player.setFoodLevel(20);
         player.setSaturation(20f);
         player.clearActivePotionEffects();

src/main/java/cn/infstar/essentialsC/commands/HelpCommand.java

@@ -20,6 +20,17 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
         super("essentialsc.command.help");
     }
 
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (args.length > 0) {
+            if (sender instanceof Player player) {
+                return handleCommand(sender, player, args);
+            }
+            return executeConsole(sender, args);
+        }
+        return super.onCommand(sender, command, label, args);
+    }
+
     @Override
     protected boolean execute(Player player, String[] args) {
         return handleCommand(player, player, args);
@@ -32,11 +43,10 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
                 sendNoPermission(sender, "essentialsc.command.reload");
                 return true;
             }
-            plugin.reloadConfig();
-            EssentialsC.getLangManager().reload();
             plugin.getFeatureConfigManager().reload();
+            EssentialsC.getLangManager().reload();
             plugin.getModuleManager().reload();
-            CommandRegistry.clearCache();
+            CommandRegistry.clearInitializationFailures();
             plugin.reloadRuntimeModules();
             sender.sendMessage(getLang().getPrefixedString("messages.config-reloaded"));
             return true;
@@ -54,11 +64,10 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
                     sendNoPermission(sender, "essentialsc.command.reload");
                     return true;
                 }
-                plugin.reloadConfig();
-                EssentialsC.getLangManager().reload();
                 plugin.getFeatureConfigManager().reload();
+                EssentialsC.getLangManager().reload();
                 plugin.getModuleManager().reload();
-                CommandRegistry.clearCache();
+                CommandRegistry.clearInitializationFailures();
                 plugin.reloadRuntimeModules();
                 sender.sendMessage(getLang().getPrefixedString("messages.config-reloaded"));
                 return true;
@@ -84,7 +93,7 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
 
             if (subCommand.equals("version") || subCommand.equals("v")) {
                 player.sendMessage(getLang().getPrefixedString("messages.version",
-                    Map.of("version", plugin.getDescription().getVersion())));
+                    Map.of("version", plugin.getPluginMeta().getVersion())));
                 player.sendMessage(getLang().getPrefixedString("messages.paper-version",
                     Map.of("version", Bukkit.getVersion())));
                 return true;
@@ -97,7 +106,7 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
         }
 
         LangManager lang = getLang();
-        String version = plugin.getDescription().getVersion();
+        String version = plugin.getPluginMeta().getVersion();
 
         sendPrefixed(player, lang.getString("help.title"));
         sendPrefixed(player, lang.getString("help.version", Map.of("version", version)));

src/main/java/cn/infstar/essentialsC/commands/LoomCommand.java

@@ -3,6 +3,7 @@ package cn.infstar.essentialsC.commands;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.MenuType;
 
 public class LoomCommand extends BaseCommand {
 
@@ -12,7 +13,7 @@ public class LoomCommand extends BaseCommand {
 
     @Override
     protected boolean execute(Player player, String[] args) {
-        player.openLoom(null, true);
+        player.openInventory(MenuType.LOOM.builder().checkReachable(false).build(player));
         playBlockShortcutSound(player, Material.LOOM, Sound.UI_LOOM_SELECT_PATTERN);
         return true;
     }

src/main/java/cn/infstar/essentialsC/commands/MaintenanceCommand.java

@@ -41,12 +41,18 @@ public class MaintenanceCommand extends BaseCommand implements TabCompleter {
 
         switch (args[0].toLowerCase(Locale.ROOT)) {
             case "on", "enable", "enabled" -> {
-                maintenanceManager.setEnabled(true);
+                if (maintenanceManager.setEnabled(true) == MaintenanceManager.OperationResult.SAVE_FAILED) {
+                    sendSaveFailed(sender);
+                    return true;
+                }
                 sender.sendMessage(getLang().getPrefixedString("maintenance.messages.enabled"));
                 return true;
             }
             case "off", "disable", "disabled" -> {
-                maintenanceManager.setEnabled(false);
+                if (maintenanceManager.setEnabled(false) == MaintenanceManager.OperationResult.SAVE_FAILED) {
+                    sendSaveFailed(sender);
+                    return true;
+                }
                 sender.sendMessage(getLang().getPrefixedString("maintenance.messages.disabled"));
                 return true;
             }
@@ -62,7 +68,10 @@ public class MaintenanceCommand extends BaseCommand implements TabCompleter {
                 }
 
                 String target = args[1];
-                if (maintenanceManager.addWhitelistEntry(target)) {
+                MaintenanceManager.OperationResult result = maintenanceManager.addWhitelistEntry(target);
+                if (result == MaintenanceManager.OperationResult.SAVE_FAILED) {
+                    sendSaveFailed(sender);
+                } else if (result == MaintenanceManager.OperationResult.SUCCESS) {
                     sender.sendMessage(getLang().getPrefixedString("maintenance.messages.whitelist-added",
                         Map.of("player", target)));
                 } else {
@@ -78,7 +87,10 @@ public class MaintenanceCommand extends BaseCommand implements TabCompleter {
                 }
 
                 String target = args[1];
-                if (maintenanceManager.removeWhitelistEntry(target)) {
+                MaintenanceManager.OperationResult result = maintenanceManager.removeWhitelistEntry(target);
+                if (result == MaintenanceManager.OperationResult.SAVE_FAILED) {
+                    sendSaveFailed(sender);
+                } else if (result == MaintenanceManager.OperationResult.SUCCESS) {
                     sender.sendMessage(getLang().getPrefixedString("maintenance.messages.whitelist-removed",
                         Map.of("player", target)));
                 } else {
@@ -123,6 +135,10 @@ public class MaintenanceCommand extends BaseCommand implements TabCompleter {
             )));
     }
 
+    private void sendSaveFailed(CommandSender sender) {
+        sender.sendMessage(getLang().getPrefixedString("maintenance.messages.save-failed"));
+    }
+
     @Override
     public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
         if (!sender.hasPermission(getPermission())) {

src/main/java/cn/infstar/essentialsC/commands/MobDropCommand.java

@@ -8,6 +8,8 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 
 import java.util.List;
 import java.util.Map;
@@ -20,7 +22,7 @@ public class MobDropCommand extends BaseCommand {
     public static final class MobDropMenuHolder implements InventoryHolder {
         private final Inventory inventory;
 
-        public MobDropMenuHolder(String title) {
+        public MobDropMenuHolder(Component title) {
             this.inventory = Bukkit.createInventory(this, MENU_SIZE, title);
         }
 
@@ -47,17 +49,17 @@ public class MobDropCommand extends BaseCommand {
             ? "mobdrops-menu.status.enabled"
             : "mobdrops-menu.status.disabled");
 
-        Inventory menu = new MobDropMenuHolder(lang.getString("mobdrops-menu.title")).getInventory();
+        Inventory menu = new MobDropMenuHolder(lang.getComponent("mobdrops-menu.title")).getInventory();
 
         ItemStack endermanItem = new ItemStack(Material.ENDER_PEARL);
         ItemMeta endermanMeta = endermanItem.getItemMeta();
         if (endermanMeta != null) {
-            endermanMeta.setDisplayName(lang.getString("mobdrops-menu.enderman.name"));
-            endermanMeta.setLore(List.of(
+            endermanMeta.displayName(legacyComponent(lang.getString("mobdrops-menu.enderman.name")));
+            endermanMeta.lore(List.of(
                 lang.getString("mobdrops-menu.enderman.status", Map.of("status", status)),
                 "",
                 lang.getString("mobdrops-menu.enderman.toggle")
-            ));
+            ).stream().map(MobDropCommand::legacyComponent).toList());
             endermanItem.setItemMeta(endermanMeta);
         }
         menu.setItem(ENDERMAN_SLOT, endermanItem);
@@ -65,7 +67,7 @@ public class MobDropCommand extends BaseCommand {
         ItemStack glass = new ItemStack(Material.BLACK_STAINED_GLASS_PANE);
         ItemMeta glassMeta = glass.getItemMeta();
         if (glassMeta != null) {
-            glassMeta.setDisplayName(" ");
+            glassMeta.displayName(Component.text(" "));
             glass.setItemMeta(glassMeta);
         }
 
@@ -82,6 +84,10 @@ public class MobDropCommand extends BaseCommand {
         return ENDERMAN_SLOT;
     }
 
+    private static Component legacyComponent(String text) {
+        return LegacyComponentSerializer.legacySection().deserialize(text == null ? "" : text);
+    }
+
     private void openMobDropMenu(Player player) {
         openMobDropMenu(plugin, player);
     }

src/main/java/cn/infstar/essentialsC/commands/NightVisionCommand.java

@@ -1,19 +1,12 @@
 package cn.infstar.essentialsC.commands;
 
-import org.bukkit.NamespacedKey;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.persistence.PersistentDataType;
 
 public class NightVisionCommand extends BaseCommand {
 
-    private final NamespacedKey enabledKey;
-
     public NightVisionCommand() {
         super("essentialsc.command.nightvision");
-        this.enabledKey = new NamespacedKey(plugin, "nightvision_enabled");
     }
 
     @Override
@@ -26,15 +19,11 @@ public class NightVisionCommand extends BaseCommand {
         }
 
         if (targetState) {
-            player.addPotionEffect(new PotionEffect(PotionEffectType.NIGHT_VISION, Integer.MAX_VALUE, 0, false, false, false));
-            player.getPersistentDataContainer().set(enabledKey, PersistentDataType.BYTE, (byte) 1);
+            plugin.getPlayerStateManager().enableNightVision(player);
             playShortcutSound(player, Sound.BLOCK_BEACON_POWER_SELECT);
             player.sendMessage(getLang().getPrefixedString("messages.nightvision-enabled"));
         } else {
-            if (currentState) {
-                player.removePotionEffect(PotionEffectType.NIGHT_VISION);
-                player.getPersistentDataContainer().remove(enabledKey);
-            }
+            plugin.getPlayerStateManager().disableNightVision(player);
             playShortcutSound(player, Sound.BLOCK_BEACON_DEACTIVATE);
             player.sendMessage(getLang().getPrefixedString("messages.nightvision-disabled"));
         }
@@ -55,7 +44,6 @@ public class NightVisionCommand extends BaseCommand {
     }
 
     private boolean isPluginNightVisionEnabled(Player player) {
-        Byte value = player.getPersistentDataContainer().get(enabledKey, PersistentDataType.BYTE);
-        return value != null && value == (byte) 1;
+        return plugin.getPlayerStateManager().isNightVisionEnabled(player);
     }
 }

src/main/java/cn/infstar/essentialsC/commands/SeenCommand.java

@@ -21,6 +21,13 @@ public class SeenCommand extends BaseCommand {
             return true;
         }
 
+        Player onlineTarget = Bukkit.getPlayerExact(args[0]);
+        if (onlineTarget != null && VanishCommand.isVanished(onlineTarget)
+            && !player.hasPermission(VanishCommand.SEE_PERMISSION)) {
+            player.sendMessage(getLang().getPrefixedString("messages.player-not-found", Map.of("player", args[0])));
+            return true;
+        }
+
         OfflinePlayer target = Bukkit.getOfflinePlayer(args[0]);
         if (!target.hasPlayedBefore() && !target.isOnline()) {
             player.sendMessage(getLang().getPrefixedString("messages.player-not-found", Map.of("player", args[0])));

src/main/java/cn/infstar/essentialsC/commands/SmithingTableCommand.java

@@ -3,6 +3,7 @@ package cn.infstar.essentialsC.commands;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.MenuType;
 
 public class SmithingTableCommand extends BaseCommand {
 
@@ -12,7 +13,7 @@ public class SmithingTableCommand extends BaseCommand {
 
     @Override
     protected boolean execute(Player player, String[] args) {
-        player.openSmithingTable(null, true);
+        player.openInventory(MenuType.SMITHING.builder().checkReachable(false).build(player));
         playBlockShortcutSound(player, Material.SMITHING_TABLE, Sound.BLOCK_SMITHING_TABLE_USE);
         return true;
     }

src/main/java/cn/infstar/essentialsC/commands/StonecutterCommand.java

@@ -3,6 +3,7 @@ package cn.infstar.essentialsC.commands;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.MenuType;
 
 public class StonecutterCommand extends BaseCommand {
 
@@ -12,7 +13,7 @@ public class StonecutterCommand extends BaseCommand {
 
     @Override
     protected boolean execute(Player player, String[] args) {
-        player.openStonecutter(null, true);
+        player.openInventory(MenuType.STONECUTTER.builder().checkReachable(false).build(player));
         playBlockShortcutSound(player, Material.STONECUTTER, Sound.UI_STONECUTTER_SELECT_RECIPE);
         return true;
     }

src/main/java/cn/infstar/essentialsC/commands/TpIgnoreCommand.java

@@ -17,10 +17,13 @@ public final class TpIgnoreCommand extends BaseCommand {
             return true;
         }
 
-        boolean ignoring = manager.toggleIgnoringRequests(player);
-        player.sendMessage(getLang().getPrefixedComponent(ignoring
-            ? "tpa.messages.ignore-enabled"
-            : "tpa.messages.ignore-disabled"));
+        TeleportRequestManager.ToggleIgnoreResult result = manager.toggleIgnoringRequests(player);
+        String messagePath = switch (result) {
+            case ENABLED -> "tpa.messages.ignore-enabled";
+            case DISABLED -> "tpa.messages.ignore-disabled";
+            case SAVE_FAILED -> "tpa.messages.ignore-save-failed";
+        };
+        player.sendMessage(getLang().getPrefixedComponent(messagePath));
         return true;
     }
 }

src/main/java/cn/infstar/essentialsC/commands/VanishCommand.java

@@ -3,10 +3,12 @@ package cn.infstar.essentialsC.commands;
 import cn.infstar.essentialsC.EssentialsC;
 import cn.infstar.essentialsC.util.AtomicYamlWriter;
 import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
@@ -27,14 +29,23 @@ public class VanishCommand extends BaseCommand {
 
         if (vanishedPlayers.contains(uuid)) {
             vanishedPlayers.remove(uuid);
+            if (!saveState(plugin)) {
+                vanishedPlayers.add(uuid);
+                player.sendMessage(getLang().getPrefixedString("messages.vanish-save-failed"));
+                return true;
+            }
             showPlayerToAll(plugin, player);
             player.sendMessage(getLang().getPrefixedString("messages.vanish-disabled"));
         } else {
             vanishedPlayers.add(uuid);
+            if (!saveState(plugin)) {
+                vanishedPlayers.remove(uuid);
+                player.sendMessage(getLang().getPrefixedString("messages.vanish-save-failed"));
+                return true;
+            }
             hidePlayerFromAll(plugin, player);
             player.sendMessage(getLang().getPrefixedString("messages.vanish-enabled"));
         }
-        saveState(plugin);
         return true;
     }
 
@@ -44,7 +55,13 @@ public class VanishCommand extends BaseCommand {
         if (!stateFile.exists()) {
             return;
         }
-        FileConfiguration state = YamlConfiguration.loadConfiguration(stateFile);
+        YamlConfiguration state = new YamlConfiguration();
+        try {
+            state.load(stateFile);
+        } catch (IOException | InvalidConfigurationException exception) {
+            plugin.getLogger().severe("加载 vanished-players.yml 失败: " + exception.getMessage());
+            throw new IllegalStateException("无法加载 vanished-players.yml，请修复文件格式后重试。", exception);
+        }
         for (String value : state.getStringList("players")) {
             try {
                 vanishedPlayers.add(UUID.fromString(value));
@@ -65,15 +82,22 @@ public class VanishCommand extends BaseCommand {
         }
     }
 
-    public static void restoreVisibility(EssentialsC plugin, Player player, boolean notify) {
+    public static boolean restoreVisibility(EssentialsC plugin, Player player, boolean notify) {
         if (!vanishedPlayers.remove(player.getUniqueId())) {
-            return;
+            return true;
+        }
+        if (!saveState(plugin)) {
+            vanishedPlayers.add(player.getUniqueId());
+            if (notify) {
+                player.sendMessage(EssentialsC.getLangManager().getPrefixedString("messages.vanish-save-failed"));
+            }
+            return false;
         }
         showPlayerToAll(plugin, player);
-        saveState(plugin);
         if (notify) {
             player.sendMessage(EssentialsC.getLangManager().getPrefixedString("messages.vanish-permission-removed"));
         }
+        return true;
     }
 
     public static void applyHiddenState(EssentialsC plugin, Player player) {
@@ -111,7 +135,7 @@ public class VanishCommand extends BaseCommand {
         return vanishedPlayers.contains(player.getUniqueId());
     }
 
-    private static void saveState(EssentialsC plugin) {
+    private static boolean saveState(EssentialsC plugin) {
         if (stateFile == null) {
             stateFile = new File(plugin.getDataFolder(), "vanished-players.yml");
         }
@@ -119,8 +143,10 @@ public class VanishCommand extends BaseCommand {
         state.set("players", vanishedPlayers.stream().map(UUID::toString).sorted().toList());
         try {
             AtomicYamlWriter.save(state, stateFile);
+            return true;
         } catch (Exception exception) {
             plugin.getLogger().warning("保存 vanished-players.yml 失败: " + exception.getMessage());
+            return false;
         }
     }
 }

src/main/java/cn/infstar/essentialsC/commands/WorkbenchCommand.java

@@ -3,6 +3,7 @@ package cn.infstar.essentialsC.commands;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.MenuType;
 
 public class WorkbenchCommand extends BaseCommand {
 
@@ -12,7 +13,7 @@ public class WorkbenchCommand extends BaseCommand {
 
     @Override
     protected boolean execute(Player player, String[] args) {
-        player.openWorkbench(null, true);
+        player.openInventory(MenuType.CRAFTING.builder().checkReachable(false).build(player));
         playBlockShortcutSound(player, Material.CRAFTING_TABLE, Sound.UI_BUTTON_CLICK);
         return true;
     }

src/main/java/cn/infstar/essentialsC/listeners/JeiRecipeSyncListener.java

@@ -2,6 +2,7 @@ package cn.infstar.essentialsC.listeners;
 
 import cn.infstar.essentialsC.EssentialsC;
 import cn.infstar.essentialsC.compat.jei.JeiRecipeSyncAdapter;
+import io.papermc.paper.event.server.ServerResourcesReloadedEvent;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -52,6 +53,13 @@ public class JeiRecipeSyncListener implements Listener {
         plugin.getServer().getScheduler().runTaskLater(plugin, () -> detectAndSync(player), brandCheckDelayTicks);
     }
 
+    @EventHandler
+    public void onServerResourcesReloaded(ServerResourcesReloadedEvent event) {
+        if (adapter != null) {
+            adapter.clearCache();
+        }
+    }
+
     private void detectAndSync(Player player) {
         if (!player.isOnline()) {
             return;

src/main/java/cn/infstar/essentialsC/listeners/MobDropMenuListener.java

@@ -2,7 +2,6 @@ package cn.infstar.essentialsC.listeners;
 
 import cn.infstar.essentialsC.EssentialsC;
 import cn.infstar.essentialsC.commands.MobDropCommand;
-import cn.infstar.essentialsC.util.AtomicYamlWriter;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
@@ -19,7 +18,6 @@ public class MobDropMenuListener implements Listener {
 
     public MobDropMenuListener(EssentialsC plugin) {
         this.plugin = plugin;
-        plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
     @EventHandler
@@ -40,6 +38,12 @@ public class MobDropMenuListener implements Listener {
         }
 
         if (event.getRawSlot() == MobDropCommand.getEndermanSlot()) {
+            if (!player.hasPermission("essentialsc.mobdrops.enderman")) {
+                player.sendMessage(EssentialsC.getLangManager().getPrefixedString("messages.no-permission",
+                    Map.of("permission", "essentialsc.mobdrops.enderman")));
+                player.closeInventory();
+                return;
+            }
             toggleEndermanDrops(player);
             Bukkit.getScheduler().runTaskLater(plugin, () -> MobDropCommand.openMobDropMenu(plugin, player), 2L);
         }
@@ -48,13 +52,10 @@ public class MobDropMenuListener implements Listener {
     private void toggleEndermanDrops(Player player) {
         FileConfiguration config = plugin.getConfig();
         boolean newValue = !config.getBoolean("mob-drops.enderman.allow-drops", true);
-        config.set("mob-drops.enderman.allow-drops", newValue);
-
-        try {
-            AtomicYamlWriter.save(config, plugin.getDataFolder().toPath().resolve("config.yml").toFile());
-        } catch (Exception e) {
+        if (!plugin.getFeatureConfigManager().updateMainConfigValue(
+            "mob-drops.enderman.allow-drops", newValue)) {
             player.sendMessage(EssentialsC.getLangManager().getPrefixedString("messages.mobdrop-save-failed",
-                Map.of("error", e.getMessage())));
+                Map.of("error", "无法写入 config.yml")));
             return;
         }
 

src/main/java/cn/infstar/essentialsC/listeners/ShulkerBoxListener.java

@@ -1,8 +1,10 @@
 package cn.infstar.essentialsC.listeners;
 
 import cn.infstar.essentialsC.EssentialsC;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
 import org.bukkit.Sound;
 import org.bukkit.block.ShulkerBox;
 import org.bukkit.entity.Player;
@@ -10,13 +12,18 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
+import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryDragEvent;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerKickEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerSwapHandItemsEvent;
 import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.Inventory;
@@ -26,18 +33,20 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.BlockStateMeta;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.persistence.PersistentDataType;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Consumer;
 
 public class ShulkerBoxListener implements Listener {
 
     private static final int SHULKER_SIZE = 27;
+    private static final int OFF_HAND_SLOT = 40;
 
     private static final Set<Material> SHULKER_BOX_MATERIALS = Set.of(
         Material.SHULKER_BOX,
@@ -60,38 +69,47 @@ public class ShulkerBoxListener implements Listener {
     );
 
     private final EssentialsC plugin;
+    private final NamespacedKey sessionKey;
     private final Map<UUID, OpenShulkerSession> openShulkerBoxes = new HashMap<>();
 
     private static final class ShulkerBoxHolder implements InventoryHolder {
         private final Inventory inventory;
 
         private ShulkerBoxHolder(Component title) {
-            this.inventory = Bukkit.createInventory(this, SHULKER_SIZE, title);
+            this.inventory = Bukkit.createInventory(this, InventoryType.SHULKER_BOX, title);
         }
 
         @Override
         public Inventory getInventory() {
-            return this.inventory;
+            return inventory;
         }
     }
 
     private static final class OpenShulkerSession {
-        private final ItemStack sourceItem;
-        private final EquipmentSlot sourceHand;
+        private final String token;
+        private final Inventory inventory;
         private final int preferredSlot;
+        private boolean syncScheduled;
 
-        private OpenShulkerSession(ItemStack sourceItem, EquipmentSlot sourceHand, int preferredSlot) {
-            this.sourceItem = sourceItem;
-            this.sourceHand = sourceHand;
+        private OpenShulkerSession(String token, Inventory inventory, int preferredSlot) {
+            this.token = token;
+            this.inventory = inventory;
             this.preferredSlot = preferredSlot;
         }
     }
 
-    public ShulkerBoxListener(EssentialsC plugin) {
-        this.plugin = plugin;
+    private record LocatedSource(ItemStack item, Consumer<ItemStack> save) {
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
+    public ShulkerBoxListener(EssentialsC plugin) {
+        this.plugin = plugin;
+        this.sessionKey = new NamespacedKey(plugin, "open_shulker_session");
+        for (Player player : Bukkit.getOnlinePlayers()) {
+            clearStaleSessionTokens(player);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPlayerInteract(PlayerInteractEvent event) {
         if (event.getAction() != Action.RIGHT_CLICK_AIR && event.getAction() != Action.RIGHT_CLICK_BLOCK) {
             return;
@@ -111,21 +129,15 @@ public class ShulkerBoxListener implements Listener {
         if (!isShulkerBox(sourceItem)) {
             return;
         }
+
+        event.setUseItemInHand(org.bukkit.event.Event.Result.DENY);
+        event.setUseInteractedBlock(org.bukkit.event.Event.Result.DENY);
+
         if (sourceItem.getAmount() != 1) {
             player.sendMessage(EssentialsC.getLangManager().getPrefixedString("messages.shulkerbox-unstack-first"));
             return;
         }
 
-        if (!(sourceItem.getItemMeta() instanceof BlockStateMeta blockStateMeta)) {
-            return;
-        }
-        if (!(blockStateMeta.getBlockState() instanceof ShulkerBox shulkerBox)) {
-            return;
-        }
-
-        event.setUseItemInHand(org.bukkit.event.Event.Result.DENY);
-        event.setUseInteractedBlock(org.bukkit.event.Event.Result.DENY);
-
         ItemStack sourceSnapshot = sourceItem.clone();
         plugin.getServer().getScheduler().runTask(plugin, () -> {
             if (!player.isOnline() || openShulkerBoxes.containsKey(player.getUniqueId())) {
@@ -137,7 +149,7 @@ public class ShulkerBoxListener implements Listener {
                 return;
             }
 
-            openShulkerBox(player, hand, sourceSnapshot, shulkerBox);
+            openShulkerBox(player, hand, currentItem);
         });
     }
 
@@ -147,14 +159,33 @@ public class ShulkerBoxListener implements Listener {
             return;
         }
 
-        InventoryView view = event.getView();
-        Inventory topInventory = view.getTopInventory();
-        if (!(topInventory.getHolder(false) instanceof ShulkerBoxHolder)) {
+        OpenShulkerSession session = openShulkerBoxes.get(player.getUniqueId());
+        if (session == null || event.getView().getTopInventory() != session.inventory) {
             return;
         }
 
-        int topSize = topInventory.getSize();
-        boolean clickTopInventory = event.getRawSlot() >= 0 && event.getRawSlot() < topSize;
+        if (hasSessionToken(event.getCurrentItem(), session.token)
+            || hasSessionToken(event.getCursor(), session.token)) {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (event.getClick() == ClickType.NUMBER_KEY) {
+            ItemStack hotbarItem = player.getInventory().getItem(event.getHotbarButton());
+            if (hasSessionToken(hotbarItem, session.token)) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+
+        if (event.getClick() == ClickType.SWAP_OFFHAND
+            && hasSessionToken(player.getInventory().getItemInOffHand(), session.token)) {
+            event.setCancelled(true);
+            return;
+        }
+
+        int topSize = session.inventory.getSize();
+        boolean clickTopInventory = ShulkerBoxSessionPolicy.isTopSlot(event.getRawSlot(), topSize);
 
         if (clickTopInventory && isShulkerBox(event.getCursor())) {
             event.setCancelled(true);
@@ -171,43 +202,46 @@ public class ShulkerBoxListener implements Listener {
             }
         }
 
-        if (clickTopInventory && event.getClick() == ClickType.SWAP_OFFHAND) {
-            ItemStack offHandItem = player.getInventory().getItemInOffHand();
-            if (isShulkerBox(offHandItem)) {
-                event.setCancelled(true);
-                sendNestedMessage(player);
-                return;
-            }
+        if (clickTopInventory && event.getClick() == ClickType.SWAP_OFFHAND
+            && isShulkerBox(player.getInventory().getItemInOffHand())) {
+            event.setCancelled(true);
+            sendNestedMessage(player);
+            return;
         }
 
         if (event.isShiftClick() && isShulkerBox(event.getCurrentItem())) {
             event.setCancelled(true);
             sendNestedMessage(player);
+            return;
         }
+
+        scheduleSynchronization(player, session);
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onInventoryDrag(InventoryDragEvent event) {
-        InventoryView view = event.getView();
-        Inventory topInventory = view.getTopInventory();
-        if (!(topInventory.getHolder(false) instanceof ShulkerBoxHolder)) {
+        if (!(event.getWhoClicked() instanceof Player player)) {
             return;
         }
 
-        if (!isShulkerBox(event.getOldCursor())) {
+        OpenShulkerSession session = openShulkerBoxes.get(player.getUniqueId());
+        if (session == null || event.getView().getTopInventory() != session.inventory) {
             return;
         }
 
-        int topSize = topInventory.getSize();
-        for (int rawSlot : event.getRawSlots()) {
-            if (rawSlot >= 0 && rawSlot < topSize) {
-                event.setCancelled(true);
-                if (event.getWhoClicked() instanceof Player player) {
-                    sendNestedMessage(player);
-                }
-                return;
-            }
+        if (hasSessionToken(event.getOldCursor(), session.token)) {
+            event.setCancelled(true);
+            return;
         }
+
+        if (isShulkerBox(event.getOldCursor())
+            && ShulkerBoxSessionPolicy.touchesTopInventory(event.getRawSlots(), session.inventory.getSize())) {
+            event.setCancelled(true);
+            sendNestedMessage(player);
+            return;
+        }
+
+        scheduleSynchronization(player, session);
     }
 
     @EventHandler
@@ -221,111 +255,436 @@ public class ShulkerBoxListener implements Listener {
         }
     }
 
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onPlayerDropItem(PlayerDropItemEvent event) {
+        OpenShulkerSession session = openShulkerBoxes.get(event.getPlayer().getUniqueId());
+        if (session != null && hasSessionToken(event.getItemDrop().getItemStack(), session.token)) {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
+        OpenShulkerSession session = openShulkerBoxes.get(event.getPlayer().getUniqueId());
+        if (session == null) {
+            return;
+        }
+
+        if (hasSessionToken(event.getMainHandItem(), session.token)
+            || hasSessionToken(event.getOffHandItem(), session.token)) {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onPlayerDeath(PlayerDeathEvent event) {
+        Player player = event.getPlayer();
+        OpenShulkerSession session = openShulkerBoxes.remove(player.getUniqueId());
+        if (session == null) {
+            return;
+        }
+
+        boolean saved;
+        if (event.getKeepInventory()) {
+            saved = writeSessionToPlayer(player, session, true);
+        } else {
+            saved = writeSessionToDrops(event.getDrops(), session);
+            if (!saved) {
+                saved = writeSessionToPlayer(player, session, true);
+            }
+        }
+
+        if (!saved) {
+            handleLostSource(player, session, "玩家死亡时未找到唯一的源物品");
+        }
+    }
+
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
-        Player player = event.getPlayer();
-        commitOpenShulker(player, player.getOpenInventory().getTopInventory());
+        commitCurrentSession(event.getPlayer());
     }
 
     @EventHandler
     public void onPlayerKick(PlayerKickEvent event) {
-        Player player = event.getPlayer();
-        commitOpenShulker(player, player.getOpenInventory().getTopInventory());
+        commitCurrentSession(event.getPlayer());
+    }
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        if (!openShulkerBoxes.containsKey(event.getPlayer().getUniqueId())) {
+            clearStaleSessionTokens(event.getPlayer());
+        }
     }
 
     @EventHandler
     public void onPluginDisable(PluginDisableEvent event) {
-        if (event.getPlugin() != plugin) {
+        if (event.getPlugin() == plugin) {
+            shutdown();
+        }
+    }
+
+    public void shutdown() {
+        for (UUID playerId : List.copyOf(openShulkerBoxes.keySet())) {
+            Player player = Bukkit.getPlayer(playerId);
+            if (player == null) {
+                openShulkerBoxes.remove(playerId);
+                plugin.getLogger().warning("潜影盒会话关闭失败: 玩家 " + playerId + " 已离线。");
+                continue;
+            }
+
+            OpenShulkerSession session = openShulkerBoxes.get(playerId);
+            boolean viewingSession = session != null && player.getOpenInventory().getTopInventory() == session.inventory;
+            commitCurrentSession(player);
+            if (viewingSession) {
+                player.closeInventory();
+            }
+        }
+    }
+
+    private void openShulkerBox(Player player, EquipmentSlot hand, ItemStack sourceItem) {
+        if (!(sourceItem.getItemMeta() instanceof BlockStateMeta blockStateMeta)
+            || !(blockStateMeta.getBlockState() instanceof ShulkerBox shulkerBox)) {
+            sendOpenFailedMessage(player);
             return;
         }
 
-        for (Player player : Bukkit.getOnlinePlayers()) {
-            commitOpenShulker(player, player.getOpenInventory().getTopInventory());
+        String token = UUID.randomUUID().toString();
+        ItemStack taggedSource = sourceItem.clone();
+        setSessionToken(taggedSource, token);
+        setItemInHand(player, hand, taggedSource);
+
+        ShulkerBoxHolder holder;
+        try {
+            holder = new ShulkerBoxHolder(resolveTitle(sourceItem));
+            holder.getInventory().setContents(cloneContents(shulkerBox.getInventory().getContents()));
+        } catch (RuntimeException exception) {
+            clearTokenFromPlayer(player, token);
+            plugin.getLogger().warning("打开潜影盒失败: " + exception.getMessage());
+            sendOpenFailedMessage(player);
+            return;
+        }
+
+        int preferredSlot = hand == EquipmentSlot.HAND ? player.getInventory().getHeldItemSlot() : OFF_HAND_SLOT;
+        OpenShulkerSession session = new OpenShulkerSession(token, holder.getInventory(), preferredSlot);
+        openShulkerBoxes.put(player.getUniqueId(), session);
+
+        try {
+            InventoryView openedView = player.openInventory(session.inventory);
+            if (openedView == null
+                || openedView.getTopInventory() != session.inventory
+                || player.getOpenInventory().getTopInventory() != session.inventory) {
+                rollbackFailedOpen(player, session);
+                return;
+            }
+        } catch (RuntimeException exception) {
+            plugin.getLogger().warning("打开潜影盒失败: " + exception.getMessage());
+            rollbackFailedOpen(player, session);
+            return;
+        }
+
+        player.playSound(player.getLocation(), Sound.BLOCK_SHULKER_BOX_OPEN, 0.8F, 1.0F);
+    }
+
+    private void rollbackFailedOpen(Player player, OpenShulkerSession session) {
+        openShulkerBoxes.remove(player.getUniqueId(), session);
+        clearTokenFromPlayer(player, session.token);
+        sendOpenFailedMessage(player);
+    }
+
+    private void scheduleSynchronization(Player player, OpenShulkerSession session) {
+        if (session.syncScheduled) {
+            return;
+        }
+
+        session.syncScheduled = true;
+        plugin.getServer().getScheduler().runTask(plugin, () -> {
+            session.syncScheduled = false;
+            if (openShulkerBoxes.get(player.getUniqueId()) != session) {
+                return;
+            }
+
+            if (!writeSessionToPlayer(player, session, false)) {
+                openShulkerBoxes.remove(player.getUniqueId(), session);
+                handleLostSource(player, session, "同步期间未找到唯一的源物品");
+                if (player.getOpenInventory().getTopInventory() == session.inventory) {
+                    player.closeInventory();
+                }
+            }
+        });
+    }
+
+    private void commitCurrentSession(Player player) {
+        OpenShulkerSession session = openShulkerBoxes.get(player.getUniqueId());
+        if (session != null) {
+            commitOpenShulker(player, session.inventory);
         }
     }
 
     private boolean commitOpenShulker(Player player, Inventory inventory) {
-        if (!(inventory.getHolder(false) instanceof ShulkerBoxHolder)) {
+        OpenShulkerSession session = openShulkerBoxes.get(player.getUniqueId());
+        if (session == null || session.inventory != inventory) {
             return false;
         }
 
-        OpenShulkerSession session = openShulkerBoxes.remove(player.getUniqueId());
-        if (session == null) {
+        openShulkerBoxes.remove(player.getUniqueId(), session);
+        boolean saved = writeSessionToPlayer(player, session, true);
+        if (!saved) {
+            handleLostSource(player, session, "关闭期间未找到唯一的源物品");
+        }
+        return saved;
+    }
+
+    private boolean writeSessionToPlayer(Player player, OpenShulkerSession session, boolean clearToken) {
+        List<LocatedSource> sources = findSources(player, session);
+        if (sources.size() != 1) {
+            clearSessionTokens(sources);
             return false;
         }
 
-        ItemStack updatedShulker = session.sourceItem.clone();
-        writeInventoryBack(updatedShulker, inventory.getContents());
-        restoreItemToPlayer(player, session, updatedShulker);
+        LocatedSource source = sources.getFirst();
+        if (source.item().getAmount() != 1) {
+            clearSessionTokens(sources);
+            return false;
+        }
+
+        ItemStack updatedItem = source.item().clone();
+        if (!writeInventoryBack(updatedItem, session.inventory.getContents(), clearToken)) {
+            clearSessionTokens(sources);
+            return false;
+        }
+
+        source.save().accept(updatedItem);
         return true;
     }
 
-    private void openShulkerBox(Player player, EquipmentSlot hand, ItemStack sourceItem, ShulkerBox shulkerBox) {
-        removeItemFromHand(player, hand);
+    private boolean writeSessionToDrops(List<ItemStack> drops, OpenShulkerSession session) {
+        List<Integer> matchingIndexes = new ArrayList<>();
+        for (int index = 0; index < drops.size(); index++) {
+            if (hasSessionToken(drops.get(index), session.token)) {
+                matchingIndexes.add(index);
+            }
+        }
 
-        ShulkerBoxHolder holder = new ShulkerBoxHolder(resolveTitle(sourceItem));
-        holder.getInventory().setContents(cloneContents(shulkerBox.getInventory().getContents()));
+        if (matchingIndexes.size() != 1) {
+            clearTokensFromDrops(drops, matchingIndexes);
+            return false;
+        }
 
-        int preferredSlot = hand == EquipmentSlot.HAND ? player.getInventory().getHeldItemSlot() : -1;
-        openShulkerBoxes.put(player.getUniqueId(), new OpenShulkerSession(sourceItem, hand, preferredSlot));
-        player.openInventory(holder.getInventory());
-        player.playSound(player.getLocation(), Sound.BLOCK_SHULKER_BOX_OPEN, 0.8F, 1.0F);
+        int sourceIndex = matchingIndexes.getFirst();
+        ItemStack sourceItem = drops.get(sourceIndex);
+        if (sourceItem.getAmount() != 1) {
+            clearTokensFromDrops(drops, matchingIndexes);
+            return false;
+        }
+
+        ItemStack updatedItem = sourceItem.clone();
+        if (!writeInventoryBack(updatedItem, session.inventory.getContents(), true)) {
+            clearTokensFromDrops(drops, matchingIndexes);
+            return false;
+        }
+
+        drops.set(sourceIndex, updatedItem);
+        return true;
     }
 
-    private void writeInventoryBack(ItemStack shulkerItem, ItemStack[] contents) {
+    private boolean writeInventoryBack(ItemStack shulkerItem, ItemStack[] contents, boolean clearToken) {
+        if (containsShulkerBox(contents)) {
+            plugin.getLogger().warning("保存潜影盒内容失败: 虚拟容器中检测到嵌套潜影盒。");
+            return false;
+        }
+
         if (!(shulkerItem.getItemMeta() instanceof BlockStateMeta blockStateMeta)) {
             plugin.getLogger().warning("保存潜影盒内容失败: 缺少 BlockStateMeta。");
-            return;
+            return false;
         }
 
         if (!(blockStateMeta.getBlockState() instanceof ShulkerBox shulkerBox)) {
             plugin.getLogger().warning("保存潜影盒内容失败: 方块状态不是 ShulkerBox。");
-            return;
+            return false;
         }
 
-        shulkerBox.getInventory().setContents(cloneContents(contents));
-        blockStateMeta.setBlockState(shulkerBox);
-        shulkerItem.setItemMeta(blockStateMeta);
+        try {
+            shulkerBox.getInventory().setContents(cloneContents(contents));
+            blockStateMeta.setBlockState(shulkerBox);
+            if (clearToken) {
+                blockStateMeta.getPersistentDataContainer().remove(sessionKey);
+            }
+            shulkerItem.setItemMeta(blockStateMeta);
+            return true;
+        } catch (RuntimeException exception) {
+            plugin.getLogger().warning("保存潜影盒内容失败: " + exception.getMessage());
+            return false;
+        }
     }
 
-    private void restoreItemToPlayer(Player player, OpenShulkerSession session, ItemStack shulkerItem) {
+    private List<LocatedSource> findSources(Player player, OpenShulkerSession session) {
+        List<LocatedSource> sources = new ArrayList<>();
         PlayerInventory inventory = player.getInventory();
 
-        if (session.sourceHand == EquipmentSlot.OFF_HAND) {
-            if (isEmpty(inventory.getItemInOffHand())) {
-                inventory.setItemInOffHand(shulkerItem);
-                return;
-            }
-        } else if (session.preferredSlot >= 0 && isEmpty(inventory.getItem(session.preferredSlot))) {
-            inventory.setItem(session.preferredSlot, shulkerItem);
-            return;
+        if (session.preferredSlot >= 0 && session.preferredSlot < inventory.getSize()) {
+            addSourceIfMatching(
+                sources,
+                inventory.getItem(session.preferredSlot),
+                item -> inventory.setItem(session.preferredSlot, item),
+                session.token
+            );
         }
 
-        Map<Integer, ItemStack> leftovers = inventory.addItem(shulkerItem);
-        for (ItemStack leftover : leftovers.values()) {
-            player.getWorld().dropItemNaturally(player.getLocation(), leftover);
+        for (int slot = 0; slot < inventory.getSize(); slot++) {
+            if (slot == session.preferredSlot) {
+                continue;
+            }
+            int inventorySlot = slot;
+            addSourceIfMatching(
+                sources,
+                inventory.getItem(inventorySlot),
+                item -> inventory.setItem(inventorySlot, item),
+                session.token
+            );
         }
+
+        addSourceIfMatching(sources, player.getItemOnCursor(), player::setItemOnCursor, session.token);
+        return sources;
+    }
+
+    private void addSourceIfMatching(
+        List<LocatedSource> sources,
+        ItemStack item,
+        Consumer<ItemStack> save,
+        String token
+    ) {
+        if (hasSessionToken(item, token)) {
+            sources.add(new LocatedSource(item, save));
+        }
+    }
+
+    private void clearSessionTokens(List<LocatedSource> sources) {
+        for (LocatedSource source : sources) {
+            ItemStack cleanedItem = source.item().clone();
+            clearSessionToken(cleanedItem);
+            source.save().accept(cleanedItem);
+        }
+    }
+
+    private void clearTokensFromDrops(List<ItemStack> drops, List<Integer> indexes) {
+        for (int index : indexes) {
+            ItemStack cleanedItem = drops.get(index).clone();
+            clearSessionToken(cleanedItem);
+            drops.set(index, cleanedItem);
+        }
+    }
+
+    private void clearTokenFromPlayer(Player player, String token) {
+        PlayerInventory inventory = player.getInventory();
+        for (int slot = 0; slot < inventory.getSize(); slot++) {
+            ItemStack item = inventory.getItem(slot);
+            if (!hasSessionToken(item, token)) {
+                continue;
+            }
+            ItemStack cleanedItem = item.clone();
+            clearSessionToken(cleanedItem);
+            inventory.setItem(slot, cleanedItem);
+        }
+
+        ItemStack cursor = player.getItemOnCursor();
+        if (hasSessionToken(cursor, token)) {
+            ItemStack cleanedCursor = cursor.clone();
+            clearSessionToken(cleanedCursor);
+            player.setItemOnCursor(cleanedCursor);
+        }
+    }
+
+    private void clearStaleSessionTokens(Player player) {
+        PlayerInventory inventory = player.getInventory();
+        for (int slot = 0; slot < inventory.getSize(); slot++) {
+            ItemStack item = inventory.getItem(slot);
+            if (!hasAnySessionToken(item)) {
+                continue;
+            }
+            ItemStack cleanedItem = item.clone();
+            clearSessionToken(cleanedItem);
+            inventory.setItem(slot, cleanedItem);
+        }
+
+        ItemStack cursor = player.getItemOnCursor();
+        if (hasAnySessionToken(cursor)) {
+            ItemStack cleanedCursor = cursor.clone();
+            clearSessionToken(cleanedCursor);
+            player.setItemOnCursor(cleanedCursor);
+        }
+    }
+
+    private void handleLostSource(Player player, OpenShulkerSession session, String reason) {
+        clearTokenFromPlayer(player, session.token);
+        plugin.getLogger().warning("潜影盒会话已终止: " + player.getName() + " (" + player.getUniqueId() + ")，" + reason + "。");
+        if (player.isOnline()) {
+            player.sendMessage(EssentialsC.getLangManager().getPrefixedString("messages.shulkerbox-session-invalid"));
+        }
+    }
+
+    private void setSessionToken(ItemStack item, String token) {
+        ItemMeta itemMeta = item.getItemMeta();
+        itemMeta.getPersistentDataContainer().set(sessionKey, PersistentDataType.STRING, token);
+        item.setItemMeta(itemMeta);
+    }
+
+    private void clearSessionToken(ItemStack item) {
+        ItemMeta itemMeta = item.getItemMeta();
+        if (itemMeta == null) {
+            return;
+        }
+        itemMeta.getPersistentDataContainer().remove(sessionKey);
+        item.setItemMeta(itemMeta);
+    }
+
+    private boolean hasSessionToken(ItemStack item, String token) {
+        if (!isShulkerBox(item)) {
+            return false;
+        }
+        ItemMeta itemMeta = item.getItemMeta();
+        if (itemMeta == null) {
+            return false;
+        }
+        String storedToken = itemMeta.getPersistentDataContainer().get(sessionKey, PersistentDataType.STRING);
+        return token.equals(storedToken);
+    }
+
+    private boolean hasAnySessionToken(ItemStack item) {
+        if (!isShulkerBox(item)) {
+            return false;
+        }
+        ItemMeta itemMeta = item.getItemMeta();
+        return itemMeta != null && itemMeta.getPersistentDataContainer().has(sessionKey, PersistentDataType.STRING);
     }
 
     private ItemStack[] cloneContents(ItemStack[] contents) {
         ItemStack[] copied = new ItemStack[SHULKER_SIZE];
-        for (int i = 0; i < SHULKER_SIZE && i < contents.length; i++) {
-            copied[i] = contents[i] == null ? null : contents[i].clone();
+        for (int index = 0; index < SHULKER_SIZE && index < contents.length; index++) {
+            copied[index] = contents[index] == null ? null : contents[index].clone();
         }
         return copied;
     }
 
+    private boolean containsShulkerBox(ItemStack[] contents) {
+        for (ItemStack item : contents) {
+            if (isShulkerBox(item)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private ItemStack getItemFromHand(Player player, EquipmentSlot hand) {
         return hand == EquipmentSlot.OFF_HAND
             ? player.getInventory().getItemInOffHand()
             : player.getInventory().getItemInMainHand();
     }
 
-    private void removeItemFromHand(Player player, EquipmentSlot hand) {
+    private void setItemInHand(Player player, EquipmentSlot hand, ItemStack item) {
         if (hand == EquipmentSlot.OFF_HAND) {
-            player.getInventory().setItemInOffHand(null);
+            player.getInventory().setItemInOffHand(item);
         } else {
-            player.getInventory().setItem(player.getInventory().getHeldItemSlot(), null);
+            player.getInventory().setItem(player.getInventory().getHeldItemSlot(), item);
         }
     }
 
@@ -336,7 +695,6 @@ public class ShulkerBoxListener implements Listener {
             if (displayName != null) {
                 return displayName;
             }
-            return LegacyComponentSerializer.legacySection().deserialize(itemMeta.getDisplayName());
         }
 
         return Component.translatable(shulkerBox.getType().getItemTranslationKey());
@@ -346,12 +704,12 @@ public class ShulkerBoxListener implements Listener {
         player.sendMessage(EssentialsC.getLangManager().getPrefixedString("messages.shulkerbox-nested"));
     }
 
-    private boolean isShulkerBox(ItemStack item) {
-        return item != null && !item.getType().isAir() && SHULKER_BOX_MATERIALS.contains(item.getType());
+    private void sendOpenFailedMessage(Player player) {
+        player.sendMessage(EssentialsC.getLangManager().getPrefixedString("messages.shulkerbox-open-failed"));
     }
 
-    private boolean isEmpty(ItemStack item) {
-        return item == null || item.getType().isAir();
+    private boolean isShulkerBox(ItemStack item) {
+        return item != null && !item.getType().isAir() && SHULKER_BOX_MATERIALS.contains(item.getType());
     }
 
     private boolean isSameShulkerItem(ItemStack currentItem, ItemStack sourceSnapshot) {

src/main/java/cn/infstar/essentialsC/listeners/ShulkerBoxSessionPolicy.java

@@ -0,0 +1,17 @@
+package cn.infstar.essentialsC.listeners;
+
+import java.util.Set;
+
+final class ShulkerBoxSessionPolicy {
+
+    private ShulkerBoxSessionPolicy() {
+    }
+
+    static boolean isTopSlot(int rawSlot, int topInventorySize) {
+        return rawSlot >= 0 && rawSlot < topInventorySize;
+    }
+
+    static boolean touchesTopInventory(Set<Integer> rawSlots, int topInventorySize) {
+        return rawSlots.stream().anyMatch(rawSlot -> isTopSlot(rawSlot, topInventorySize));
+    }
+}

src/main/java/cn/infstar/essentialsC/listeners/VanishListener.java

@@ -9,10 +9,17 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.scheduler.BukkitTask;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
 public final class VanishListener implements Listener {
 
     private final EssentialsC plugin;
     private final BukkitTask permissionTask;
+    private final Map<UUID, Boolean> observerSeePermissions = new HashMap<>();
 
     public VanishListener(EssentialsC plugin) {
         this.plugin = plugin;
@@ -23,6 +30,7 @@ public final class VanishListener implements Listener {
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
+        observerSeePermissions.put(player.getUniqueId(), player.hasPermission(VanishCommand.SEE_PERMISSION));
         if (VanishCommand.isVanished(player) && !player.hasPermission("essentialsc.command.vanish")) {
             VanishCommand.restoreVisibility(plugin, player, false);
         }
@@ -35,6 +43,7 @@ public final class VanishListener implements Listener {
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
+        observerSeePermissions.remove(event.getPlayer().getUniqueId());
         Player player = event.getPlayer();
         if (VanishCommand.isVanished(player)) {
             event.quitMessage(null);
@@ -46,10 +55,34 @@ public final class VanishListener implements Listener {
     }
 
     private void checkPermissions() {
+        Set<UUID> onlinePlayers = new HashSet<>();
         for (Player player : plugin.getServer().getOnlinePlayers()) {
+            onlinePlayers.add(player.getUniqueId());
             if (VanishCommand.isVanished(player) && !player.hasPermission("essentialsc.command.vanish")) {
                 VanishCommand.restoreVisibility(plugin, player, true);
             }
         }
+        observerSeePermissions.keySet().removeIf(uuid -> !onlinePlayers.contains(uuid));
+
+        for (Player observer : plugin.getServer().getOnlinePlayers()) {
+            boolean canSeeVanished = observer.hasPermission(VanishCommand.SEE_PERMISSION);
+            Boolean previous = observerSeePermissions.put(observer.getUniqueId(), canSeeVanished);
+            if (previous == null || previous != canSeeVanished) {
+                refreshObserverVisibility(observer, canSeeVanished);
+            }
+        }
+    }
+
+    private void refreshObserverVisibility(Player observer, boolean canSeeVanished) {
+        for (Player player : plugin.getServer().getOnlinePlayers()) {
+            if (observer.equals(player) || !VanishCommand.isVanished(player)) {
+                continue;
+            }
+            if (canSeeVanished) {
+                observer.showPlayer(plugin, player);
+            } else {
+                observer.hidePlayer(plugin, player);
+            }
+        }
     }
 }

src/main/java/cn/infstar/essentialsC/maintenance/LuckPermsMaintenancePermissionResolver.java

@@ -0,0 +1,56 @@
+package cn.infstar.essentialsC.maintenance;
+
+import cn.infstar.essentialsC.EssentialsC;
+import net.luckperms.api.LuckPerms;
+import net.luckperms.api.model.user.User;
+import net.luckperms.api.model.user.UserManager;
+import net.luckperms.api.query.QueryOptions;
+
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public final class LuckPermsMaintenancePermissionResolver implements MaintenancePermissionResolver {
+
+    private final EssentialsC plugin;
+    private final LuckPerms luckPerms;
+    private final UserManager userManager;
+    private final AtomicBoolean failureLogged = new AtomicBoolean();
+
+    public LuckPermsMaintenancePermissionResolver(EssentialsC plugin) {
+        this.plugin = plugin;
+        this.luckPerms = plugin.getServer().getServicesManager().load(LuckPerms.class);
+        if (luckPerms == null) {
+            throw new IllegalStateException("LuckPerms 服务尚未注册");
+        }
+        this.userManager = luckPerms.getUserManager();
+    }
+
+    @Override
+    public PermissionResult checkPermission(UUID uniqueId, String permission) {
+        if (uniqueId == null || permission == null || permission.isBlank()) {
+            return PermissionResult.DENIED;
+        }
+
+        try {
+            User user = userManager.getUser(uniqueId);
+            if (user == null) {
+                user = userManager.loadUser(uniqueId).join();
+            }
+
+            QueryOptions queryOptions = luckPerms.getContextManager().getQueryOptions(user)
+                .orElseGet(() -> luckPerms.getContextManager().getStaticQueryOptions());
+            boolean granted = user.getCachedData()
+                .getPermissionData(queryOptions)
+                .checkPermission(permission)
+                .asBoolean();
+            failureLogged.set(false);
+            return granted ? PermissionResult.GRANTED : PermissionResult.DENIED;
+        } catch (RuntimeException exception) {
+            if (failureLogged.compareAndSet(false, true)) {
+                plugin.getLogger().warning("LuckPerms 维护权限查询失败，将在玩家加入后复核权限: "
+                    + exception.getMessage());
+            }
+            return PermissionResult.UNAVAILABLE;
+        }
+    }
+}

src/main/java/cn/infstar/essentialsC/maintenance/MaintenanceListener.java

@@ -4,95 +4,108 @@ import cn.infstar.essentialsC.EssentialsC;
 import cn.infstar.essentialsC.ModuleManager;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.server.ServerListPingEvent;
 
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.util.Map;
 
 public final class MaintenanceListener implements Listener {
 
     private final EssentialsC plugin;
+    private final MaintenanceManager maintenanceManager;
+    private final MaintenancePermissionResolver permissionResolver;
 
-    public MaintenanceListener(EssentialsC plugin) {
+    public MaintenanceListener(EssentialsC plugin, MaintenanceManager maintenanceManager) {
         this.plugin = plugin;
+        this.maintenanceManager = maintenanceManager;
+        this.permissionResolver = MaintenancePermissionResolverFactory.create(plugin);
     }
 
     @EventHandler
     public void onServerListPing(ServerListPingEvent event) {
-        MaintenanceManager maintenanceManager = plugin.getMaintenanceManager();
         if (!plugin.getModuleManager().isEnabled(ModuleManager.MAINTENANCE)
-            || maintenanceManager == null
             || !maintenanceManager.isEnabled()
             || !maintenanceManager.isMotdEnabled()) {
             return;
         }
 
-        event.setMotd(maintenanceManager.getMotd());
+        event.motd(maintenanceManager.getMotd());
     }
 
-    @EventHandler
-    public void onPlayerLogin(PlayerLoginEvent event) {
-        MaintenanceManager maintenanceManager = plugin.getMaintenanceManager();
-        if (!plugin.getModuleManager().isEnabled(ModuleManager.MAINTENANCE)
-            || maintenanceManager == null
-            || !maintenanceManager.isEnabled()) {
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onPlayerPreLogin(AsyncPlayerPreLoginEvent event) {
+        if (event.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) {
             return;
         }
 
-        if (maintenanceManager.canJoin(event.getPlayer())) {
+        MaintenanceManager.AccessSnapshot snapshot = maintenanceManager.getAccessSnapshot();
+        if (!snapshot.enabled() || snapshot.isWhitelisted(event.getUniqueId(), event.getName())) {
             return;
         }
 
-        event.disallow(PlayerLoginEvent.Result.KICK_OTHER, maintenanceManager.getKickMessage());
-        notifyBlockedLogin(event, maintenanceManager);
+        if (permissionResolver == null) {
+            return;
+        }
+
+        MaintenancePermissionResolver.PermissionResult permissionResult = permissionResolver
+            .checkPermission(event.getUniqueId(), snapshot.bypassPermission());
+        if (permissionResult != MaintenancePermissionResolver.PermissionResult.DENIED) {
+            return;
+        }
+
+        event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, snapshot.kickMessage());
+        notifyBlockedLogin(event.getName(), event.getUniqueId().toString(), event.getAddress(), snapshot);
     }
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
-        MaintenanceManager maintenanceManager = plugin.getMaintenanceManager();
-        if (!plugin.getModuleManager().isEnabled(ModuleManager.MAINTENANCE) || maintenanceManager == null) {
+        if (!plugin.getModuleManager().isEnabled(ModuleManager.MAINTENANCE)) {
             return;
         }
 
-        maintenanceManager.addBossBarPlayer(event.getPlayer());
+        Player player = event.getPlayer();
+        if (maintenanceManager.isEnabled() && !maintenanceManager.canJoin(player)) {
+            MaintenanceManager.AccessSnapshot snapshot = maintenanceManager.getAccessSnapshot();
+            player.kick(snapshot.kickMessage());
+            InetSocketAddress socketAddress = player.getAddress();
+            notifyBlockedLogin(player.getName(), player.getUniqueId().toString(),
+                socketAddress == null ? null : socketAddress.getAddress(), snapshot);
+            return;
+        }
+
+        maintenanceManager.addBossBarPlayer(player);
     }
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
-        MaintenanceManager maintenanceManager = plugin.getMaintenanceManager();
-        if (maintenanceManager != null) {
-            maintenanceManager.removeBossBarPlayer(event.getPlayer());
-        }
+        maintenanceManager.removeBossBarPlayer(event.getPlayer());
     }
 
-    private void notifyBlockedLogin(PlayerLoginEvent event, MaintenanceManager maintenanceManager) {
-        if (!maintenanceManager.isNotifyEnabled()) {
+    private void notifyBlockedLogin(String playerName, String uniqueId, InetAddress inetAddress,
+                                    MaintenanceManager.AccessSnapshot snapshot) {
+        if (!snapshot.notifyEnabled()) {
             return;
         }
 
-        String address = EssentialsC.getLangManager().getString("maintenance.status.address-hidden");
-        if (maintenanceManager.shouldIncludeAddressInNotification()) {
-            InetAddress inetAddress = event.getAddress();
-            if (inetAddress != null) {
-                address = inetAddress.getHostAddress();
-            }
-        }
+        String visibleAddress = snapshot.includeAddress() && inetAddress != null ? inetAddress.getHostAddress() : null;
+        plugin.getServer().getScheduler().runTask(plugin, () -> {
+            String address = visibleAddress == null
+                ? EssentialsC.getLangManager().getString("maintenance.status.address-hidden")
+                : visibleAddress;
+            var message = EssentialsC.getLangManager().getPrefixedComponent("maintenance.messages.login-blocked",
+                Map.of("player", playerName, "uuid", uniqueId, "address", address));
 
-        String message = EssentialsC.getLangManager().getPrefixedString("maintenance.messages.login-blocked",
-            Map.of(
-                "player", event.getPlayer().getName(),
-                "uuid", event.getPlayer().getUniqueId().toString(),
-                "address", address
-            ));
-
-        for (Player player : plugin.getServer().getOnlinePlayers()) {
-            if (player.hasPermission(maintenanceManager.getNotifyPermission())) {
-                player.sendMessage(message);
+            for (Player onlinePlayer : plugin.getServer().getOnlinePlayers()) {
+                if (onlinePlayer.hasPermission(snapshot.notifyPermission())) {
+                    onlinePlayer.sendMessage(message);
+                }
             }
-        }
+        });
     }
 }

src/main/java/cn/infstar/essentialsC/maintenance/MaintenanceManager.java

@@ -2,16 +2,19 @@ package cn.infstar.essentialsC.maintenance;
 
 import cn.infstar.essentialsC.EssentialsC;
 import cn.infstar.essentialsC.util.AtomicYamlWriter;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarStyle;
 import org.bukkit.boss.BossBar;
 import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -22,11 +25,14 @@ import java.util.UUID;
 public final class MaintenanceManager {
 
     private static final int CURRENT_CONFIG_VERSION = 1;
+    private static final LegacyComponentSerializer LEGACY_AMPERSAND = LegacyComponentSerializer.legacyAmpersand();
+    private static final LegacyComponentSerializer LEGACY_SECTION = LegacyComponentSerializer.legacySection();
 
     private final EssentialsC plugin;
     private final File configFile;
     private FileConfiguration config;
     private BossBar bossBar;
+    private volatile AccessSnapshot accessSnapshot = AccessSnapshot.disabled();
 
     public MaintenanceManager(EssentialsC plugin) {
         this.plugin = plugin;
@@ -39,7 +45,7 @@ public final class MaintenanceManager {
             plugin.saveResource("maintenance.yml", false);
         }
 
-        config = YamlConfiguration.loadConfiguration(configFile);
+        config = loadConfiguration();
         config.addDefault("config-version", CURRENT_CONFIG_VERSION);
         config.addDefault("enabled", false);
         config.addDefault("bypass-permission", "essentialsc.maintenance.bypass");
@@ -57,6 +63,7 @@ public final class MaintenanceManager {
         config.addDefault("bossbar.style", "SOLID");
         config.addDefault("bossbar.progress", 1.0D);
         config.options().copyDefaults(true);
+        publishAccessSnapshot();
         refreshBossBar();
         if (isEnabled()) {
             kickUnauthorizedPlayers();
@@ -67,13 +74,22 @@ public final class MaintenanceManager {
         return config.getBoolean("enabled", false);
     }
 
-    public void setEnabled(boolean enabled) {
+    public OperationResult setEnabled(boolean enabled) {
+        if (isEnabled() == enabled) {
+            return OperationResult.UNCHANGED;
+        }
+        boolean previous = isEnabled();
         config.set("enabled", enabled);
-        save();
+        if (!save()) {
+            config.set("enabled", previous);
+            return OperationResult.SAVE_FAILED;
+        }
+        publishAccessSnapshot();
         refreshBossBar();
         if (enabled) {
             kickUnauthorizedPlayers();
         }
+        return OperationResult.SUCCESS;
     }
 
     public String getBypassPermission() {
@@ -96,6 +112,10 @@ public final class MaintenanceManager {
         return player != null && (player.hasPermission(getBypassPermission()) || isWhitelisted(player));
     }
 
+    public AccessSnapshot getAccessSnapshot() {
+        return accessSnapshot;
+    }
+
     public boolean isWhitelisted(Player player) {
         if (player == null) {
             return false;
@@ -105,10 +125,10 @@ public final class MaintenanceManager {
             || getWhitelistNames().contains(normalizeName(player.getName()));
     }
 
-    public boolean addWhitelistEntry(String input) {
+    public OperationResult addWhitelistEntry(String input) {
         String normalized = normalizeEntry(input);
         if (normalized.isEmpty()) {
-            return false;
+            return OperationResult.UNCHANGED;
         }
 
         UUID uuid = parseUuid(normalized);
@@ -124,10 +144,10 @@ public final class MaintenanceManager {
         return addWhitelistName(input);
     }
 
-    public boolean removeWhitelistEntry(String input) {
+    public OperationResult removeWhitelistEntry(String input) {
         String normalized = normalizeEntry(input);
         if (normalized.isEmpty()) {
-            return false;
+            return OperationResult.UNCHANGED;
         }
 
         UUID uuid = parseUuid(normalized);
@@ -136,8 +156,11 @@ public final class MaintenanceManager {
         }
 
         Player onlinePlayer = Bukkit.getPlayerExact(normalized);
-        if (onlinePlayer != null && removeWhitelistUuid(onlinePlayer.getUniqueId().toString())) {
-            return true;
+        if (onlinePlayer != null) {
+            OperationResult uuidResult = removeWhitelistUuid(onlinePlayer.getUniqueId().toString());
+            if (uuidResult != OperationResult.UNCHANGED) {
+                return uuidResult;
+            }
         }
 
         return removeWhitelistName(input);
@@ -158,11 +181,11 @@ public final class MaintenanceManager {
         return config.getBoolean("motd.enabled", true);
     }
 
-    public String getMotd() {
+    public Component getMotd() {
         return colorizeLines(config.getStringList("motd.lines"));
     }
 
-    public String getKickMessage() {
+    public Component getKickMessage() {
         return colorizeLines(config.getStringList("kick-message"));
     }
 
@@ -173,7 +196,7 @@ public final class MaintenanceManager {
         }
 
         bossBar = plugin.getServer().createBossBar(
-            colorize(config.getString("bossbar.title", "&c服务器正在维护")),
+            LEGACY_SECTION.serialize(colorize(config.getString("bossbar.title", "&c服务器正在维护"))),
             readBossBarColor(),
             readBossBarStyle()
         );
@@ -199,15 +222,16 @@ public final class MaintenanceManager {
     }
 
     private void kickUnauthorizedPlayers() {
-        String message = getKickMessage();
+        Component message = getKickMessage();
         for (Player player : List.copyOf(plugin.getServer().getOnlinePlayers())) {
             if (!canJoin(player)) {
-                player.kickPlayer(message);
+                player.kick(message);
             }
         }
     }
 
     public void shutdown() {
+        accessSnapshot = AccessSnapshot.disabled();
         clearBossBar();
     }
 
@@ -248,27 +272,28 @@ public final class MaintenanceManager {
         return Math.max(0.0D, Math.min(1.0D, progress));
     }
 
-    private boolean addWhitelistUuid(String uuid) {
+    private OperationResult addWhitelistUuid(String uuid) {
         return updateWhitelist("whitelist.uuids", uuid.toLowerCase(Locale.ROOT), true);
     }
 
-    private boolean addWhitelistName(String name) {
+    private OperationResult addWhitelistName(String name) {
         return updateWhitelist("whitelist.names", normalizeName(name), true);
     }
 
-    private boolean removeWhitelistUuid(String uuid) {
+    private OperationResult removeWhitelistUuid(String uuid) {
         return updateWhitelist("whitelist.uuids", uuid.toLowerCase(Locale.ROOT), false);
     }
 
-    private boolean removeWhitelistName(String name) {
+    private OperationResult removeWhitelistName(String name) {
         return updateWhitelist("whitelist.names", normalizeName(name), false);
     }
 
-    private boolean updateWhitelist(String path, String value, boolean add) {
+    private OperationResult updateWhitelist(String path, String value, boolean add) {
         if (value == null || value.isBlank()) {
-            return false;
+            return OperationResult.UNCHANGED;
         }
 
+        List<String> previousEntries = new ArrayList<>(config.getStringList(path));
         Set<String> entries = path.endsWith(".names") ? getWhitelistNames() : getWhitelistUuids();
         boolean changed;
         if (add) {
@@ -277,15 +302,21 @@ public final class MaintenanceManager {
             changed = entries.remove(value);
         }
 
-        if (changed) {
-            config.set(path, new ArrayList<>(entries));
-            save();
-            refreshBossBar();
-            if (isEnabled()) {
-                kickUnauthorizedPlayers();
-            }
+        if (!changed) {
+            return OperationResult.UNCHANGED;
         }
-        return changed;
+
+        config.set(path, new ArrayList<>(entries));
+        if (!save()) {
+            config.set(path, previousEntries);
+            return OperationResult.SAVE_FAILED;
+        }
+        publishAccessSnapshot();
+        refreshBossBar();
+        if (isEnabled()) {
+            kickUnauthorizedPlayers();
+        }
+        return OperationResult.SUCCESS;
     }
 
     private Set<String> getWhitelistUuids() {
@@ -326,25 +357,85 @@ public final class MaintenanceManager {
         return normalizeEntry(input).toLowerCase(Locale.ROOT);
     }
 
-    private String colorizeLines(List<String> lines) {
+    private Component colorizeLines(List<String> lines) {
         if (lines == null || lines.isEmpty()) {
-            return "";
+            return Component.empty();
         }
 
-        return String.join("\n", lines.stream()
-            .map(this::colorize)
-            .toList());
+        return colorize(String.join("\n", lines));
     }
 
-    private String colorize(String text) {
-        return ChatColor.translateAlternateColorCodes('&', text == null ? "" : text);
+    private Component colorize(String text) {
+        return LEGACY_AMPERSAND.deserialize(text == null ? "" : text);
     }
 
-    private void save() {
+    private void publishAccessSnapshot() {
+        Set<UUID> whitelistUuids = new LinkedHashSet<>();
+        for (String value : getWhitelistUuids()) {
+            UUID uuid = parseUuid(value);
+            if (uuid != null) {
+                whitelistUuids.add(uuid);
+            }
+        }
+        accessSnapshot = new AccessSnapshot(
+            isEnabled(),
+            getBypassPermission(),
+            whitelistUuids,
+            getWhitelistNames(),
+            getKickMessage(),
+            isNotifyEnabled(),
+            getNotifyPermission(),
+            shouldIncludeAddressInNotification()
+        );
+    }
+
+    private boolean save() {
         try {
             AtomicYamlWriter.save(config, configFile);
+            return true;
         } catch (Exception e) {
             plugin.getLogger().warning("保存 maintenance.yml 失败: " + e.getMessage());
+            return false;
         }
     }
+
+    private YamlConfiguration loadConfiguration() {
+        YamlConfiguration loaded = new YamlConfiguration();
+        loaded.options().parseComments(true);
+        try {
+            loaded.load(configFile);
+        } catch (IOException | InvalidConfigurationException exception) {
+            plugin.getLogger().severe("加载 maintenance.yml 失败: " + exception.getMessage());
+            throw new IllegalStateException("无法加载 maintenance.yml，请修复配置格式后重试。", exception);
+        }
+        return loaded;
+    }
+
+    public record AccessSnapshot(boolean enabled, String bypassPermission, Set<UUID> whitelistUuids,
+                                 Set<String> whitelistNames, Component kickMessage, boolean notifyEnabled,
+                                 String notifyPermission, boolean includeAddress) {
+
+        public AccessSnapshot {
+            bypassPermission = bypassPermission == null ? "" : bypassPermission;
+            whitelistUuids = Set.copyOf(whitelistUuids);
+            whitelistNames = Set.copyOf(whitelistNames);
+            kickMessage = kickMessage == null ? Component.empty() : kickMessage;
+            notifyPermission = notifyPermission == null ? "" : notifyPermission;
+        }
+
+        public boolean isWhitelisted(UUID uniqueId, String playerName) {
+            return whitelistUuids.contains(uniqueId)
+                || whitelistNames.contains(playerName == null ? "" : playerName.trim().toLowerCase(Locale.ROOT));
+        }
+
+        private static AccessSnapshot disabled() {
+            return new AccessSnapshot(false, "", Set.of(), Set.of(), Component.empty(), false, "", false);
+        }
+    }
+
+    public enum OperationResult {
+        SUCCESS,
+        UNCHANGED,
+        SAVE_FAILED
+    }
 }

src/main/java/cn/infstar/essentialsC/maintenance/MaintenancePermissionResolver.java

@@ -0,0 +1,14 @@
+package cn.infstar.essentialsC.maintenance;
+
+import java.util.UUID;
+
+public interface MaintenancePermissionResolver {
+
+    PermissionResult checkPermission(UUID uniqueId, String permission);
+
+    enum PermissionResult {
+        GRANTED,
+        DENIED,
+        UNAVAILABLE
+    }
+}

src/main/java/cn/infstar/essentialsC/maintenance/MaintenancePermissionResolverFactory.java

@@ -0,0 +1,35 @@
+package cn.infstar.essentialsC.maintenance;
+
+import cn.infstar.essentialsC.EssentialsC;
+import org.bukkit.plugin.Plugin;
+
+import java.lang.reflect.InvocationTargetException;
+
+final class MaintenancePermissionResolverFactory {
+
+    private static final String LUCKPERMS_RESOLVER_CLASS =
+        "cn.infstar.essentialsC.maintenance.LuckPermsMaintenancePermissionResolver";
+
+    private MaintenancePermissionResolverFactory() {
+    }
+
+    static MaintenancePermissionResolver create(EssentialsC plugin) {
+        Plugin luckPerms = plugin.getServer().getPluginManager().getPlugin("LuckPerms");
+        if (luckPerms == null || !luckPerms.isEnabled()) {
+            plugin.getLogger().info("未检测到 LuckPerms，维护模式将在玩家加入后复核绕过权限。");
+            return null;
+        }
+
+        try {
+            Class<?> resolverClass = Class.forName(LUCKPERMS_RESOLVER_CLASS, true, plugin.getClass().getClassLoader());
+            return (MaintenancePermissionResolver) resolverClass
+                .getConstructor(EssentialsC.class)
+                .newInstance(plugin);
+        } catch (ClassNotFoundException | NoSuchMethodException | InstantiationException
+                 | IllegalAccessException | InvocationTargetException | LinkageError exception) {
+            plugin.getLogger().warning("LuckPerms 维护权限解析器初始化失败，将在玩家加入后复核权限: "
+                + exception.getMessage());
+            return null;
+        }
+    }
+}

src/main/java/cn/infstar/essentialsC/player/PlayerStateManager.java

@@ -0,0 +1,209 @@
+package cn.infstar.essentialsC.player;
+
+import cn.infstar.essentialsC.EssentialsC;
+import org.bukkit.GameMode;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.persistence.PersistentDataContainer;
+import org.bukkit.persistence.PersistentDataType;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.scheduler.BukkitTask;
+
+public final class PlayerStateManager implements Listener {
+
+    public static final String FLY_PERMISSION = "essentialsc.command.fly";
+    public static final String NIGHT_VISION_PERMISSION = "essentialsc.command.nightvision";
+    public static final String GLOW_PERMISSION = "essentialsc.command.glow";
+
+    private final EssentialsC plugin;
+    private final NamespacedKey flyEnabledKey;
+    private final NamespacedKey flyPreviousAllowKey;
+    private final NamespacedKey flyPreviousFlyingKey;
+    private final NamespacedKey nightVisionEnabledKey;
+    private final NamespacedKey glowEnabledKey;
+    private final BukkitTask permissionTask;
+
+    public PlayerStateManager(EssentialsC plugin) {
+        this.plugin = plugin;
+        this.flyEnabledKey = new NamespacedKey(plugin, "fly_enabled");
+        this.flyPreviousAllowKey = new NamespacedKey(plugin, "fly_previous_allow");
+        this.flyPreviousFlyingKey = new NamespacedKey(plugin, "fly_previous_flying");
+        this.nightVisionEnabledKey = new NamespacedKey(plugin, "nightvision_enabled");
+        this.glowEnabledKey = new NamespacedKey(plugin, "glow_enabled");
+        this.permissionTask = plugin.getServer().getScheduler()
+            .runTaskTimer(plugin, this::reconcileOnlinePlayers, 40L, 40L);
+    }
+
+    public boolean isFlyEnabled(Player player) {
+        return isMarked(player, flyEnabledKey);
+    }
+
+    public void enableFly(Player player) {
+        if (isFlyEnabled(player)) {
+            player.setAllowFlight(true);
+            player.setFlying(true);
+            return;
+        }
+
+        PersistentDataContainer data = player.getPersistentDataContainer();
+        setBoolean(data, flyPreviousAllowKey, player.getAllowFlight());
+        setBoolean(data, flyPreviousFlyingKey, player.isFlying());
+        setBoolean(data, flyEnabledKey, true);
+        player.setAllowFlight(true);
+        player.setFlying(true);
+    }
+
+    public void disableFly(Player player) {
+        PersistentDataContainer data = player.getPersistentDataContainer();
+        if (!isMarked(data, flyEnabledKey)) {
+            return;
+        }
+
+        boolean previousAllow = getBoolean(data, flyPreviousAllowKey);
+        boolean previousFlying = getBoolean(data, flyPreviousFlyingKey);
+        clearFlyMarkers(data);
+
+        boolean allowFlight = previousAllow || hasGameModeFlight(player);
+        player.setFlying(previousFlying && allowFlight);
+        player.setAllowFlight(allowFlight);
+    }
+
+    public boolean isNightVisionEnabled(Player player) {
+        return isMarked(player, nightVisionEnabledKey);
+    }
+
+    public void enableNightVision(Player player) {
+        if (!player.hasPotionEffect(PotionEffectType.NIGHT_VISION)) {
+            player.addPotionEffect(new PotionEffect(
+                PotionEffectType.NIGHT_VISION, Integer.MAX_VALUE, 0, false, false, false));
+            setBoolean(player.getPersistentDataContainer(), nightVisionEnabledKey, true);
+        }
+    }
+
+    public void disableNightVision(Player player) {
+        if (!isNightVisionEnabled(player)) {
+            return;
+        }
+        player.removePotionEffect(PotionEffectType.NIGHT_VISION);
+        player.getPersistentDataContainer().remove(nightVisionEnabledKey);
+    }
+
+    public boolean isGlowEnabled(Player player) {
+        return isMarked(player, glowEnabledKey);
+    }
+
+    public void enableGlow(Player player) {
+        if (!player.isGlowing()) {
+            player.setGlowing(true);
+            setBoolean(player.getPersistentDataContainer(), glowEnabledKey, true);
+        }
+    }
+
+    public void disableGlow(Player player) {
+        if (!isGlowEnabled(player)) {
+            return;
+        }
+        player.setGlowing(false);
+        player.getPersistentDataContainer().remove(glowEnabledKey);
+    }
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        plugin.getServer().getScheduler().runTask(plugin, () -> reconcilePlayer(event.getPlayer(), false));
+    }
+
+    public void shutdown() {
+        permissionTask.cancel();
+        for (Player player : plugin.getServer().getOnlinePlayers()) {
+            releaseOwnedStates(player, false);
+        }
+    }
+
+    private void reconcileOnlinePlayers() {
+        for (Player player : plugin.getServer().getOnlinePlayers()) {
+            reconcilePlayer(player, true);
+        }
+    }
+
+    private void reconcilePlayer(Player player, boolean notify) {
+        if (isFlyEnabled(player)) {
+            if (!player.hasPermission(FLY_PERMISSION)) {
+                disableFly(player);
+                notifyPermissionRemoval(player, "messages.fly-permission-removed", notify);
+            } else if (!player.getAllowFlight()) {
+                player.setAllowFlight(true);
+            }
+        }
+
+        if (isNightVisionEnabled(player)) {
+            if (!player.hasPermission(NIGHT_VISION_PERMISSION)) {
+                disableNightVision(player);
+                notifyPermissionRemoval(player, "messages.nightvision-permission-removed", notify);
+            } else if (!player.hasPotionEffect(PotionEffectType.NIGHT_VISION)) {
+                player.addPotionEffect(new PotionEffect(
+                    PotionEffectType.NIGHT_VISION, Integer.MAX_VALUE, 0, false, false, false));
+            }
+        }
+
+        if (isGlowEnabled(player)) {
+            if (!player.hasPermission(GLOW_PERMISSION)) {
+                disableGlow(player);
+                notifyPermissionRemoval(player, "messages.glow-permission-removed", notify);
+            } else if (!player.isGlowing()) {
+                player.setGlowing(true);
+            }
+        }
+    }
+
+    private void releaseOwnedStates(Player player, boolean notify) {
+        if (isFlyEnabled(player)) {
+            disableFly(player);
+            notifyPermissionRemoval(player, "messages.fly-permission-removed", notify);
+        }
+        if (isNightVisionEnabled(player)) {
+            disableNightVision(player);
+            notifyPermissionRemoval(player, "messages.nightvision-permission-removed", notify);
+        }
+        if (isGlowEnabled(player)) {
+            disableGlow(player);
+            notifyPermissionRemoval(player, "messages.glow-permission-removed", notify);
+        }
+    }
+
+    private void notifyPermissionRemoval(Player player, String path, boolean notify) {
+        if (notify) {
+            player.sendMessage(EssentialsC.getLangManager().getPrefixedString(path));
+        }
+    }
+
+    private boolean isMarked(Player player, NamespacedKey key) {
+        return isMarked(player.getPersistentDataContainer(), key);
+    }
+
+    private boolean isMarked(PersistentDataContainer data, NamespacedKey key) {
+        Byte value = data.get(key, PersistentDataType.BYTE);
+        return value != null && value == (byte) 1;
+    }
+
+    private boolean getBoolean(PersistentDataContainer data, NamespacedKey key) {
+        return isMarked(data, key);
+    }
+
+    private void setBoolean(PersistentDataContainer data, NamespacedKey key, boolean value) {
+        data.set(key, PersistentDataType.BYTE, value ? (byte) 1 : (byte) 0);
+    }
+
+    private void clearFlyMarkers(PersistentDataContainer data) {
+        data.remove(flyEnabledKey);
+        data.remove(flyPreviousAllowKey);
+        data.remove(flyPreviousFlyingKey);
+    }
+
+    private boolean hasGameModeFlight(Player player) {
+        return player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR;
+    }
+}

src/main/java/cn/infstar/essentialsC/skinbridge/SkinBridgeManager.java

@@ -1,7 +1,6 @@
 package cn.infstar.essentialsC.skinbridge;
 
 import cn.infstar.essentialsC.EssentialsC;
-import cn.infstar.essentialsC.util.AtomicYamlWriter;
 import com.destroystokyo.paper.profile.ProfileProperty;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -10,21 +9,19 @@ import com.google.gson.JsonParser;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
 
-import java.io.File;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Base64;
@@ -37,6 +34,9 @@ import java.util.UUID;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -51,13 +51,19 @@ public final class SkinBridgeManager implements Listener {
     private final EssentialsC plugin;
     private final HttpClient httpClient;
     private final ThreadPoolExecutor executor;
-    private final File generatedCacheFile;
+    private final SkinCacheStore cacheStore;
     private final ConcurrentMap<UUID, CachedLookup> cache = new ConcurrentHashMap<>();
-    private final ConcurrentMap<SkinCacheKey, GeneratedCacheEntry> generatedSkinCache = new ConcurrentHashMap<>();
+    private final ConcurrentMap<SkinCacheStore.Key, SkinCacheStore.Entry> generatedSkinCache = new ConcurrentHashMap<>();
     private final ConcurrentMap<UUID, Long> pendingLookups = new ConcurrentHashMap<>();
+    private final ConcurrentMap<UUID, BukkitRunnable> scheduledLookups = new ConcurrentHashMap<>();
+    private final ConcurrentMap<LookupKey, Future<?>> runningLookups = new ConcurrentHashMap<>();
     private final ConcurrentMap<UUID, Long> forceRefreshCooldowns = new ConcurrentHashMap<>();
     private final ConcurrentMap<UUID, String> loginSkinUrls = new ConcurrentHashMap<>();
+    private final ConcurrentMap<SkinCacheStore.Key, CompletableFuture<GeneratedSkin>> pendingGenerations = new ConcurrentHashMap<>();
     private final AtomicLong configurationGeneration = new AtomicLong();
+    private BukkitTask generatedCacheSaveTask;
+    private boolean generatedCacheDirty;
+    private volatile boolean shuttingDown;
 
     private volatile List<SkinProvider> providers = List.of();
     private volatile SkinBridgeGateway gateway;
@@ -66,6 +72,7 @@ public final class SkinBridgeManager implements Listener {
     private volatile boolean logDetectionResults;
     private volatile int requestTimeoutSeconds;
     private volatile int cacheMinutes;
+    private volatile int maxGeneratedCacheEntries;
     private volatile int forceRefreshCooldownSeconds;
     private volatile boolean requireCurrentTextureMatch;
     private volatile long joinDelayTicks;
@@ -74,7 +81,7 @@ public final class SkinBridgeManager implements Listener {
 
     public SkinBridgeManager(EssentialsC plugin) {
         this.plugin = plugin;
-        this.generatedCacheFile = new File(plugin.getDataFolder(), "skin-cache.yml");
+        this.cacheStore = new SkinCacheStore(plugin);
         this.httpClient = HttpClient.newBuilder()
             .connectTimeout(Duration.ofSeconds(5))
             .followRedirects(HttpClient.Redirect.NEVER)
@@ -94,6 +101,10 @@ public final class SkinBridgeManager implements Listener {
 
     public void reload() {
         configurationGeneration.incrementAndGet();
+        cancelScheduledLookups();
+        cancelRunningLookups();
+        pendingLookups.clear();
+        pendingGenerations.clear();
         FileConfiguration config = plugin.getConfig();
 
         debug = plugin.getConfig().getBoolean("debug", false);
@@ -107,6 +118,7 @@ public final class SkinBridgeManager implements Listener {
         long minimumSubmitIntervalMillis = clamp(
             config.getLong("skin-bridge.mineskin.minimum-submit-interval-millis", 1000L), 0L, 10000L);
         cacheMinutes = clamp(config.getInt("skin-bridge.cache-minutes", 120), 5, 10080);
+        maxGeneratedCacheEntries = clamp(config.getInt("skin-bridge.max-generated-cache-entries", 500), 10, 10_000);
         forceRefreshCooldownSeconds = clamp(config.getInt("skin-bridge.force-refresh-cooldown-seconds", 30), 0, 3600);
         requireCurrentTextureMatch = config.getBoolean("skin-bridge.require-current-texture-match", true);
         joinDelayTicks = clamp(config.getLong("skin-bridge.join-delay-ticks", 20L), 0, 200);
@@ -123,12 +135,17 @@ public final class SkinBridgeManager implements Listener {
     }
 
     public void shutdown() {
+        shuttingDown = true;
         configurationGeneration.incrementAndGet();
+        cancelScheduledLookups();
+        cancelRunningLookups();
         executor.shutdownNow();
+        cancelGeneratedCacheSave();
         saveGeneratedSkinCache();
         cache.clear();
         generatedSkinCache.clear();
         pendingLookups.clear();
+        pendingGenerations.clear();
         forceRefreshCooldowns.clear();
         loginSkinUrls.clear();
     }
@@ -145,7 +162,11 @@ public final class SkinBridgeManager implements Listener {
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
-        loginSkinUrls.remove(event.getPlayer().getUniqueId());
+        UUID playerId = event.getPlayer().getUniqueId();
+        loginSkinUrls.remove(playerId);
+        pendingLookups.remove(playerId);
+        cancelScheduledLookup(playerId);
+        cancelRunningLookup(playerId);
     }
 
     public SyncResult queueSync(Player player, boolean force) {
@@ -200,8 +221,18 @@ public final class SkinBridgeManager implements Listener {
         String loginSkinUrl = loginSkinUrls.computeIfAbsent(playerId,
             ignored -> getCurrentSkinUrl(player).orElse(""));
         String currentSkinUrl = loginSkinUrl.isEmpty() ? null : loginSkinUrl;
-        Bukkit.getScheduler().runTaskLater(plugin,
-            () -> startLookup(playerId, playerName, currentSkinUrl, lookupGeneration), joinDelayTicks);
+        BukkitRunnable scheduledLookup = new BukkitRunnable() {
+            @Override
+            public void run() {
+                scheduledLookups.remove(playerId, this);
+                startLookup(playerId, playerName, currentSkinUrl, lookupGeneration);
+            }
+        };
+        BukkitRunnable previousLookup = scheduledLookups.put(playerId, scheduledLookup);
+        if (previousLookup != null) {
+            previousLookup.cancel();
+        }
+        scheduledLookup.runTaskLater(plugin, joinDelayTicks);
         sendPlayerNotification(playerId, "skin-bridge.notifications.detecting", Map.of());
         return SyncResult.QUEUED;
     }
@@ -241,15 +272,18 @@ public final class SkinBridgeManager implements Listener {
     }
 
     private void startLookup(UUID playerId, String playerName, String currentSkinUrl, long lookupGeneration) {
-        if (executor.isShutdown() || lookupGeneration != configurationGeneration.get()) {
+        Player player = Bukkit.getPlayer(playerId);
+        if (executor.isShutdown() || lookupGeneration != configurationGeneration.get()
+            || !isLookupActive(playerId, lookupGeneration) || player == null || !player.isOnline()) {
             pendingLookups.remove(playerId, lookupGeneration);
             return;
         }
+        LookupKey lookupKey = new LookupKey(playerId, lookupGeneration);
         try {
-            executor.execute(() -> {
+            Future<?> lookupTask = executor.submit(() -> {
                 try {
                     CachedLookup resolved = resolve(playerId, playerName, currentSkinUrl);
-                    if (lookupGeneration != configurationGeneration.get()) {
+                    if (lookupGeneration != configurationGeneration.get() || !isLookupActive(playerId, lookupGeneration)) {
                         return;
                     }
                     cache.put(playerId, resolved);
@@ -262,6 +296,9 @@ public final class SkinBridgeManager implements Listener {
                         }
                     }
                 } catch (Exception exception) {
+                    if (!isLookupActive(playerId, lookupGeneration) || exception instanceof InterruptedException) {
+                        return;
+                    }
                     plugin.getLogger().warning("SkinBridge 查询 " + playerName + " 的皮肤资料失败: " + exception.getMessage());
                     sendPlayerNotification(playerId, "skin-bridge.notifications.failed", Map.of());
                     if (debug) {
@@ -269,8 +306,15 @@ public final class SkinBridgeManager implements Listener {
                     }
                 } finally {
                     pendingLookups.remove(playerId, lookupGeneration);
+                    runningLookups.remove(lookupKey);
                 }
             });
+            runningLookups.put(lookupKey, lookupTask);
+            if (!isLookupActive(playerId, lookupGeneration)) {
+                runningLookups.remove(lookupKey, lookupTask);
+                lookupTask.cancel(true);
+                executor.purge();
+            }
         } catch (RejectedExecutionException exception) {
             pendingLookups.remove(playerId, lookupGeneration);
             plugin.getLogger().warning("SkinBridge 查询队列拒绝了玩家任务: " + playerName);
@@ -324,18 +368,8 @@ public final class SkinBridgeManager implements Listener {
             if (logDetectionResults) {
                 plugin.getLogger().info("SkinBridge 已识别玩家 " + playerName + " 的皮肤来源: " + provider.name());
             }
-            SkinCacheKey cacheKey = new SkinCacheKey(matchedProfile.skinUrl(), matchedProfile.model());
-            GeneratedCacheEntry generatedEntry = generatedSkinCache.get(cacheKey);
-            GeneratedSkin generatedSkin;
-            if (generatedEntry != null && !generatedEntry.hasExpired()) {
-                generatedSkin = generatedEntry.skin();
-            } else {
-                generatedSkinCache.remove(cacheKey);
-                generatedSkin = currentGateway.generateSkin(matchedProfile.skinUrl(), matchedProfile.model());
-                generatedSkinCache.put(cacheKey, new GeneratedCacheEntry(generatedSkin,
-                    System.currentTimeMillis() + Duration.ofMinutes(cacheMinutes).toMillis()));
-                saveGeneratedSkinCache();
-            }
+            SkinCacheStore.Key cacheKey = new SkinCacheStore.Key(matchedProfile.skinUrl(), matchedProfile.model());
+            GeneratedSkin generatedSkin = getOrGenerateSkin(cacheKey, currentGateway);
             return cached(provider.name(), generatedSkin, State.EXTERNAL);
         }
 
@@ -350,7 +384,7 @@ public final class SkinBridgeManager implements Listener {
         HttpRequest request = HttpRequest.newBuilder(requestUri)
             .timeout(Duration.ofSeconds(requestTimeoutSeconds))
             .header("Accept", "application/json")
-            .header("User-Agent", "EssentialsC/" + plugin.getDescription().getVersion() + " SkinBridge")
+            .header("User-Agent", "EssentialsC/" + plugin.getPluginMeta().getVersion() + " SkinBridge")
             .GET()
             .build();
         HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
@@ -447,60 +481,150 @@ public final class SkinBridgeManager implements Listener {
     }
 
     private void loadGeneratedSkinCache() {
-        if (!generatedCacheFile.exists()) {
-            return;
-        }
-        FileConfiguration config = YamlConfiguration.loadConfiguration(generatedCacheFile);
-        ConfigurationSection entries = config.getConfigurationSection("entries");
-        if (entries == null) {
-            return;
-        }
-        long now = System.currentTimeMillis();
-        for (String id : entries.getKeys(false)) {
-            String path = "entries." + id;
-            try {
-                String skinUrl = config.getString(path + ".skin-url", "");
-                SkinModel model = SkinModel.valueOf(config.getString(path + ".model", "CLASSIC"));
-                long expiresAt = config.getLong(path + ".expires-at", 0L);
-                String value = config.getString(path + ".value", "");
-                String signature = config.getString(path + ".signature", "");
-                if (expiresAt > now && !skinUrl.isBlank() && !value.isBlank() && !signature.isBlank()) {
-                    generatedSkinCache.put(new SkinCacheKey(skinUrl, model),
-                        new GeneratedCacheEntry(new GeneratedSkin(value, signature), expiresAt));
-                }
-            } catch (IllegalArgumentException ignored) {
-                plugin.getLogger().warning("忽略无效的 SkinBridge 缓存记录: " + id);
-            }
-        }
+        generatedSkinCache.putAll(cacheStore.load());
+        trimGeneratedSkinCache();
     }
 
     private synchronized void saveGeneratedSkinCache() {
-        FileConfiguration config = new YamlConfiguration();
+        if (!generatedCacheDirty) {
+            return;
+        }
         long now = System.currentTimeMillis();
         generatedSkinCache.entrySet().removeIf(entry -> entry.getValue().expiresAtMillis() <= now);
-        generatedSkinCache.forEach((key, entry) -> {
-            String path = "entries." + cacheId(key);
-            config.set(path + ".skin-url", key.skinUrl());
-            config.set(path + ".model", key.model().name());
-            config.set(path + ".expires-at", entry.expiresAtMillis());
-            config.set(path + ".value", entry.skin().value());
-            config.set(path + ".signature", entry.skin().signature());
-        });
-        try {
-            AtomicYamlWriter.save(config, generatedCacheFile);
-        } catch (Exception exception) {
-            plugin.getLogger().warning("保存 skin-cache.yml 失败: " + exception.getMessage());
+        trimGeneratedSkinCache();
+        if (cacheStore.save(generatedSkinCache)) {
+            generatedCacheDirty = false;
+        } else if (!shuttingDown) {
+            scheduleGeneratedCacheSave();
         }
     }
 
-    private String cacheId(SkinCacheKey key) {
-        try {
-            MessageDigest digest = MessageDigest.getInstance("SHA-256");
-            byte[] hash = digest.digest((key.skinUrl() + "\n" + key.model().name()).getBytes(StandardCharsets.UTF_8));
-            return Base64.getUrlEncoder().withoutPadding().encodeToString(hash);
-        } catch (NoSuchAlgorithmException exception) {
-            throw new IllegalStateException("当前 Java 环境不支持 SHA-256。", exception);
+    private GeneratedSkin getOrGenerateSkin(SkinCacheStore.Key cacheKey, SkinBridgeGateway currentGateway) throws Exception {
+        SkinCacheStore.Entry cachedEntry = generatedSkinCache.get(cacheKey);
+        if (cachedEntry != null && !cachedEntry.hasExpired()) {
+            return cachedEntry.skin();
         }
+        if (cachedEntry != null) {
+            generatedSkinCache.remove(cacheKey, cachedEntry);
+        }
+
+        CompletableFuture<GeneratedSkin> created = new CompletableFuture<>();
+        CompletableFuture<GeneratedSkin> running = pendingGenerations.putIfAbsent(cacheKey, created);
+        if (running != null) {
+            return awaitGeneratedSkin(running);
+        }
+
+        try {
+            GeneratedSkin generated = currentGateway.generateSkin(cacheKey.skinUrl(), cacheKey.model());
+            cacheGeneratedSkin(cacheKey, generated);
+            created.complete(generated);
+            return generated;
+        } catch (Exception exception) {
+            created.completeExceptionally(exception);
+            throw exception;
+        } catch (Error error) {
+            created.completeExceptionally(error);
+            throw error;
+        } finally {
+            pendingGenerations.remove(cacheKey, created);
+        }
+    }
+
+    private GeneratedSkin awaitGeneratedSkin(CompletableFuture<GeneratedSkin> running) throws Exception {
+        try {
+            return running.get();
+        } catch (InterruptedException exception) {
+            Thread.currentThread().interrupt();
+            throw exception;
+        } catch (ExecutionException exception) {
+            Throwable cause = exception.getCause();
+            if (cause instanceof Exception nested) {
+                throw nested;
+            }
+            if (cause instanceof Error error) {
+                throw error;
+            }
+            throw new IllegalStateException("MineSkin 生成任务失败。", cause);
+        }
+    }
+
+    private synchronized void cacheGeneratedSkin(SkinCacheStore.Key cacheKey, GeneratedSkin generatedSkin) {
+        if (shuttingDown) {
+            return;
+        }
+        generatedSkinCache.put(cacheKey, new SkinCacheStore.Entry(generatedSkin,
+            System.currentTimeMillis() + Duration.ofMinutes(cacheMinutes).toMillis()));
+        trimGeneratedSkinCache();
+        generatedCacheDirty = true;
+        scheduleGeneratedCacheSave();
+    }
+
+    private synchronized void scheduleGeneratedCacheSave() {
+        if (shuttingDown || generatedCacheSaveTask != null) {
+            return;
+        }
+        generatedCacheSaveTask = Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, () -> {
+            synchronized (this) {
+                generatedCacheSaveTask = null;
+            }
+            saveGeneratedSkinCache();
+        }, 100L);
+    }
+
+    private synchronized void cancelGeneratedCacheSave() {
+        if (generatedCacheSaveTask != null) {
+            generatedCacheSaveTask.cancel();
+            generatedCacheSaveTask = null;
+        }
+    }
+
+    private void trimGeneratedSkinCache() {
+        long now = System.currentTimeMillis();
+        generatedSkinCache.entrySet().removeIf(entry -> entry.getValue().expiresAtMillis() <= now);
+        int excessEntries = generatedSkinCache.size() - maxGeneratedCacheEntries;
+        if (excessEntries <= 0) {
+            return;
+        }
+        generatedSkinCache.entrySet().stream()
+            .sorted(Comparator.comparingLong(entry -> entry.getValue().expiresAtMillis()))
+            .limit(excessEntries)
+            .map(Map.Entry::getKey)
+            .forEach(generatedSkinCache::remove);
+    }
+
+    private boolean isLookupActive(UUID playerId, long lookupGeneration) {
+        return Long.valueOf(lookupGeneration).equals(pendingLookups.get(playerId));
+    }
+
+    private void cancelScheduledLookup(UUID playerId) {
+        BukkitRunnable scheduledLookup = scheduledLookups.remove(playerId);
+        if (scheduledLookup != null) {
+            scheduledLookup.cancel();
+        }
+    }
+
+    private void cancelScheduledLookups() {
+        for (UUID playerId : List.copyOf(scheduledLookups.keySet())) {
+            cancelScheduledLookup(playerId);
+        }
+    }
+
+    private void cancelRunningLookup(UUID playerId) {
+        runningLookups.forEach((lookupKey, lookupTask) -> {
+            if (lookupKey.playerId().equals(playerId) && runningLookups.remove(lookupKey, lookupTask)) {
+                lookupTask.cancel(true);
+            }
+        });
+        executor.purge();
+    }
+
+    private void cancelRunningLookups() {
+        runningLookups.forEach((lookupKey, lookupTask) -> {
+            if (runningLookups.remove(lookupKey, lookupTask)) {
+                lookupTask.cancel(true);
+            }
+        });
+        executor.purge();
     }
 
     private List<SkinProvider> loadProviders(FileConfiguration config) {
@@ -550,7 +674,7 @@ public final class SkinBridgeManager implements Listener {
         try {
             return new MineSkinGateway(httpClient, endpoint, apiKey, visibility, timeoutSeconds,
                 minimumSubmitIntervalMillis,
-                "EssentialsC/" + plugin.getDescription().getVersion() + " SkinBridge");
+                "EssentialsC/" + plugin.getPluginMeta().getVersion() + " SkinBridge");
         } catch (Exception | LinkageError exception) {
             plugin.getLogger().warning("加载 MineSkin SkinBridge 适配器失败: " + exception.getMessage());
             return null;
@@ -652,13 +776,7 @@ public final class SkinBridgeManager implements Listener {
     private record ProviderProfile(String skinUrl, SkinModel model) {
     }
 
-    private record SkinCacheKey(String skinUrl, SkinModel model) {
-    }
-
-    private record GeneratedCacheEntry(GeneratedSkin skin, long expiresAtMillis) {
-        private boolean hasExpired() {
-            return System.currentTimeMillis() >= expiresAtMillis;
-        }
+    private record LookupKey(UUID playerId, long generation) {
     }
 
     private record CachedLookup(String providerId, GeneratedSkin skin, State state, long expiresAtMillis) {

src/main/java/cn/infstar/essentialsC/skinbridge/SkinCacheStore.java

@@ -0,0 +1,95 @@
+package cn.infstar.essentialsC.skinbridge;
+
+import cn.infstar.essentialsC.EssentialsC;
+import cn.infstar.essentialsC.util.AtomicYamlWriter;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+final class SkinCacheStore {
+
+    private final EssentialsC plugin;
+    private final File cacheFile;
+
+    SkinCacheStore(EssentialsC plugin) {
+        this.plugin = plugin;
+        this.cacheFile = new File(plugin.getDataFolder(), "skin-cache.yml");
+    }
+
+    Map<Key, Entry> load() {
+        Map<Key, Entry> loaded = new HashMap<>();
+        if (!cacheFile.exists()) {
+            return loaded;
+        }
+
+        YamlConfiguration config = YamlConfiguration.loadConfiguration(cacheFile);
+        ConfigurationSection entries = config.getConfigurationSection("entries");
+        if (entries == null) {
+            return loaded;
+        }
+        long now = System.currentTimeMillis();
+        for (String id : entries.getKeys(false)) {
+            String path = "entries." + id;
+            try {
+                String skinUrl = config.getString(path + ".skin-url", "");
+                SkinModel model = SkinModel.valueOf(config.getString(path + ".model", "CLASSIC"));
+                long expiresAt = config.getLong(path + ".expires-at", 0L);
+                String value = config.getString(path + ".value", "");
+                String signature = config.getString(path + ".signature", "");
+                if (expiresAt > now && !skinUrl.isBlank() && !value.isBlank() && !signature.isBlank()) {
+                    loaded.put(new Key(skinUrl, model),
+                        new Entry(new GeneratedSkin(value, signature), expiresAt));
+                }
+            } catch (IllegalArgumentException exception) {
+                plugin.getLogger().warning("忽略无效的 SkinBridge 缓存记录: " + id);
+            }
+        }
+        return loaded;
+    }
+
+    boolean save(Map<Key, Entry> entries) {
+        YamlConfiguration config = new YamlConfiguration();
+        entries.forEach((key, entry) -> {
+            String path = "entries." + cacheId(key);
+            config.set(path + ".skin-url", key.skinUrl());
+            config.set(path + ".model", key.model().name());
+            config.set(path + ".expires-at", entry.expiresAtMillis());
+            config.set(path + ".value", entry.skin().value());
+            config.set(path + ".signature", entry.skin().signature());
+        });
+        try {
+            AtomicYamlWriter.save(config, cacheFile);
+            return true;
+        } catch (Exception exception) {
+            plugin.getLogger().warning("保存 skin-cache.yml 失败: " + exception.getMessage());
+            return false;
+        }
+    }
+
+    private String cacheId(Key key) {
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA-256");
+            byte[] hash = digest.digest((key.skinUrl() + "\n" + key.model().name())
+                .getBytes(StandardCharsets.UTF_8));
+            return Base64.getUrlEncoder().withoutPadding().encodeToString(hash);
+        } catch (NoSuchAlgorithmException exception) {
+            throw new IllegalStateException("当前 Java 环境不支持 SHA-256。", exception);
+        }
+    }
+
+    record Key(String skinUrl, SkinModel model) {
+    }
+
+    record Entry(GeneratedSkin skin, long expiresAtMillis) {
+        boolean hasExpired() {
+            return System.currentTimeMillis() >= expiresAtMillis;
+        }
+    }
+}

src/main/java/cn/infstar/essentialsC/teleport/TeleportRequestManager.java

@@ -8,12 +8,9 @@ import cn.infstar.essentialsC.api.event.TeleportRequestSendEvent;
 import cn.infstar.essentialsC.api.event.TeleportWarmupCancelledEvent;
 import cn.infstar.essentialsC.api.event.TeleportWarmupEvent;
 import cn.infstar.essentialsC.commands.VanishCommand;
-import cn.infstar.essentialsC.util.AtomicYamlWriter;
 import net.kyori.adventure.title.Title;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -25,7 +22,6 @@ import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.scheduler.BukkitTask;
 
-import java.io.File;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayDeque;
@@ -57,8 +53,7 @@ public final class TeleportRequestManager implements Listener {
     private final Set<UUID> warmupDamagedPlayers = new HashSet<>();
     private final Set<UUID> invulnerablePlayers = new HashSet<>();
     private final Set<UUID> ignoringRequests = new HashSet<>();
-    private final File ignoreFile;
-    private final File cooldownFile;
+    private final TeleportStateStore stateStore;
     private BukkitTask cleanupTask;
 
     private int timeoutSeconds;
@@ -82,10 +77,11 @@ public final class TeleportRequestManager implements Listener {
 
     public TeleportRequestManager(EssentialsC plugin) {
         this.plugin = plugin;
-        this.ignoreFile = new File(plugin.getDataFolder(), "teleport-ignore.yml");
-        this.cooldownFile = new File(plugin.getDataFolder(), "teleport-cooldowns.yml");
+        this.stateStore = new TeleportStateStore(plugin);
         reload();
-        loadCooldowns();
+        TeleportStateStore.CooldownState cooldownState = stateStore.loadCooldowns();
+        sendCooldowns.putAll(cooldownState.send());
+        acceptCooldowns.putAll(cooldownState.accept());
         cleanupTask = Bukkit.getScheduler().runTaskTimer(plugin, this::cleanupExpiredState, 1200L, 1200L);
     }
 
@@ -131,7 +127,8 @@ public final class TeleportRequestManager implements Listener {
         warmupSound = plugin.getConfig().getString("tpa.sounds.warmup", "block.note_block.banjo");
         cancelSound = plugin.getConfig().getString("tpa.sounds.cancelled", "entity.item.break");
         completeSound = plugin.getConfig().getString("tpa.sounds.complete", "entity.enderman.teleport");
-        loadIgnoringRequests();
+        ignoringRequests.clear();
+        ignoringRequests.addAll(stateStore.loadIgnoringRequests());
     }
 
     public void shutdown() {
@@ -139,13 +136,13 @@ public final class TeleportRequestManager implements Listener {
             cleanupTask.cancel();
             cleanupTask = null;
         }
-        saveCooldowns();
+        stateStore.saveCooldowns(sendCooldowns, acceptCooldowns);
         requests.clear();
         sendCooldowns.clear();
         acceptCooldowns.clear();
         cancelAllWarmups();
         clearAllInvulnerability();
-        saveIgnoringRequests();
+        stateStore.saveIgnoringRequests(ignoringRequests);
     }
 
     public CreateRequestResult createRequest(Player requester, Player target, TeleportRequest.Type type) {
@@ -230,24 +227,24 @@ public final class TeleportRequestManager implements Listener {
     }
 
     public List<String> getIncomingRequesterNames(Player target, String partial) {
-        String partialLower = partial == null ? "" : partial.toLowerCase();
+        String partialLower = partial == null ? "" : partial.toLowerCase(Locale.ROOT);
         return requests.getOrDefault(target.getUniqueId(), new ArrayDeque<>()).stream()
             .filter(request -> !request.hasExpired())
             .map(TeleportRequest::requesterName)
-            .filter(name -> name.toLowerCase().startsWith(partialLower))
+            .filter(name -> name.toLowerCase(Locale.ROOT).startsWith(partialLower))
             .distinct()
             .sorted(String.CASE_INSENSITIVE_ORDER)
             .toList();
     }
 
     public List<String> getOutgoingTargetNames(Player requester, String partial) {
-        String partialLower = partial == null ? "" : partial.toLowerCase();
+        String partialLower = partial == null ? "" : partial.toLowerCase(Locale.ROOT);
         return requests.values().stream()
             .flatMap(Deque::stream)
             .filter(request -> request.requesterId().equals(requester.getUniqueId()))
             .filter(request -> !request.hasExpired())
             .map(TeleportRequest::targetName)
-            .filter(name -> name.toLowerCase().startsWith(partialLower))
+            .filter(name -> name.toLowerCase(Locale.ROOT).startsWith(partialLower))
             .distinct()
             .sorted(String.CASE_INSENSITIVE_ORDER)
             .toList();
@@ -335,16 +332,10 @@ public final class TeleportRequestManager implements Listener {
     }
 
     public boolean isVanished(Player player) {
-        if (VanishCommand.isVanished(player)) {
-            return true;
-        }
-        return player.hasMetadata("vanished") && player.getMetadata("vanished").stream()
-            .map(metadata -> metadata.asBoolean())
-            .findFirst()
-            .orElse(false);
+        return VanishCommand.isVanished(player);
     }
 
-    public boolean toggleIgnoringRequests(Player player) {
+    public ToggleIgnoreResult toggleIgnoringRequests(Player player) {
         UUID uuid = player.getUniqueId();
         boolean nowIgnoring;
         if (ignoringRequests.contains(uuid)) {
@@ -354,8 +345,15 @@ public final class TeleportRequestManager implements Listener {
             ignoringRequests.add(uuid);
             nowIgnoring = true;
         }
-        saveIgnoringRequests();
-        return nowIgnoring;
+        if (!stateStore.saveIgnoringRequests(ignoringRequests)) {
+            if (nowIgnoring) {
+                ignoringRequests.remove(uuid);
+            } else {
+                ignoringRequests.add(uuid);
+            }
+            return ToggleIgnoreResult.SAVE_FAILED;
+        }
+        return nowIgnoring ? ToggleIgnoreResult.ENABLED : ToggleIgnoreResult.DISABLED;
     }
 
     public void playRequestReceivedSound(Player player) {
@@ -395,11 +393,11 @@ public final class TeleportRequestManager implements Listener {
             return exactMatch;
         }
 
-        String playerNameLower = playerName.toLowerCase();
+        String playerNameLower = playerName.toLowerCase(Locale.ROOT);
         return Bukkit.getOnlinePlayers().stream()
             .map(Player.class::cast)
             .filter(filter)
-            .filter(player -> player.getName().toLowerCase().startsWith(playerNameLower))
+            .filter(player -> player.getName().toLowerCase(Locale.ROOT).startsWith(playerNameLower))
             .findFirst();
     }
 
@@ -750,7 +748,7 @@ public final class TeleportRequestManager implements Listener {
         placeholders.put("requester", request.requesterName());
         placeholders.put("target", request.targetName());
         placeholders.put("seconds", String.valueOf(timeoutSeconds));
-        placeholders.put("type", request.type().name().toLowerCase());
+        placeholders.put("type", request.type().name().toLowerCase(Locale.ROOT));
         return placeholders;
     }
 
@@ -815,89 +813,13 @@ public final class TeleportRequestManager implements Listener {
         long now = System.currentTimeMillis();
         sendCooldowns.values().removeIf(expiresAt -> expiresAt <= now);
         acceptCooldowns.values().removeIf(expiresAt -> expiresAt <= now);
-        saveCooldowns();
+        stateStore.saveCooldowns(sendCooldowns, acceptCooldowns);
     }
 
-    private void loadCooldowns() {
-        if (!cooldownFile.exists()) {
-            return;
-        }
-        FileConfiguration cooldownConfig = YamlConfiguration.loadConfiguration(cooldownFile);
-        loadCooldownMap(cooldownConfig, "send", sendCooldowns);
-        loadCooldownMap(cooldownConfig, "accept", acceptCooldowns);
-    }
-
-    private void loadCooldownMap(FileConfiguration config, String path, Map<UUID, Long> destination) {
-        if (!config.isConfigurationSection(path)) {
-            return;
-        }
-        long now = System.currentTimeMillis();
-        for (String key : config.getConfigurationSection(path).getKeys(false)) {
-            try {
-                UUID uuid = UUID.fromString(key);
-                long expiresAt = config.getLong(path + "." + key, 0L);
-                if (expiresAt > now) {
-                    destination.put(uuid, expiresAt);
-                }
-            } catch (IllegalArgumentException ignored) {
-                plugin.getLogger().warning("忽略无效的 TPA 冷却记录 UUID: " + key);
-            }
-        }
-    }
-
-    private void saveCooldowns() {
-        FileConfiguration cooldownConfig = new YamlConfiguration();
-        long now = System.currentTimeMillis();
-        saveCooldownMap(cooldownConfig, "send", sendCooldowns, now);
-        saveCooldownMap(cooldownConfig, "accept", acceptCooldowns, now);
-        try {
-            AtomicYamlWriter.save(cooldownConfig, cooldownFile);
-        } catch (Exception exception) {
-            plugin.getLogger().warning("保存 teleport-cooldowns.yml 失败: " + exception.getMessage());
-        }
-    }
-
-    private void saveCooldownMap(FileConfiguration config, String path, Map<UUID, Long> source, long now) {
-        source.forEach((uuid, expiresAt) -> {
-            if (expiresAt > now) {
-                config.set(path + "." + uuid, expiresAt);
-            }
-        });
-    }
-
-    private void loadIgnoringRequests() {
-        ignoringRequests.clear();
-        if (!ignoreFile.exists()) {
-            return;
-        }
-
-        FileConfiguration ignoreConfig = YamlConfiguration.loadConfiguration(ignoreFile);
-        if (!ignoreConfig.isConfigurationSection("ignored")) {
-            return;
-        }
-
-        for (String key : ignoreConfig.getConfigurationSection("ignored").getKeys(false)) {
-            if (!ignoreConfig.getBoolean("ignored." + key, false)) {
-                continue;
-            }
-            try {
-                ignoringRequests.add(UUID.fromString(key));
-            } catch (IllegalArgumentException ignored) {
-                plugin.getLogger().warning("忽略无效的 TPA 忽略记录 UUID: " + key);
-            }
-        }
-    }
-
-    private void saveIgnoringRequests() {
-        FileConfiguration ignoreConfig = new YamlConfiguration();
-        for (UUID uuid : ignoringRequests) {
-            ignoreConfig.set("ignored." + uuid, true);
-        }
-        try {
-            AtomicYamlWriter.save(ignoreConfig, ignoreFile);
-        } catch (Exception e) {
-            plugin.getLogger().warning("保存 teleport-ignore.yml 失败: " + e.getMessage());
-        }
+    public enum ToggleIgnoreResult {
+        ENABLED,
+        DISABLED,
+        SAVE_FAILED
     }
 
     public enum CreateRequestStatus {

src/main/java/cn/infstar/essentialsC/teleport/TeleportStateStore.java

@@ -0,0 +1,145 @@
+package cn.infstar.essentialsC.teleport;
+
+import cn.infstar.essentialsC.EssentialsC;
+import cn.infstar.essentialsC.util.AtomicYamlWriter;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+final class TeleportStateStore {
+
+    private final EssentialsC plugin;
+    private final File cooldownFile;
+    private final File ignoreFile;
+    private boolean cooldownWritable = true;
+    private boolean ignoreWritable = true;
+
+    TeleportStateStore(EssentialsC plugin) {
+        this.plugin = plugin;
+        this.cooldownFile = new File(plugin.getDataFolder(), "teleport-cooldowns.yml");
+        this.ignoreFile = new File(plugin.getDataFolder(), "teleport-ignore.yml");
+    }
+
+    CooldownState loadCooldowns() {
+        Map<UUID, Long> send = new HashMap<>();
+        Map<UUID, Long> accept = new HashMap<>();
+        if (!cooldownFile.exists()) {
+            return new CooldownState(send, accept);
+        }
+
+        YamlConfiguration config = new YamlConfiguration();
+        try {
+            config.load(cooldownFile);
+        } catch (IOException | InvalidConfigurationException exception) {
+            cooldownWritable = false;
+            plugin.getLogger().severe("加载 teleport-cooldowns.yml 失败，已禁止覆盖原文件: "
+                + exception.getMessage());
+            return new CooldownState(send, accept);
+        }
+        loadCooldownMap(config, "send", send);
+        loadCooldownMap(config, "accept", accept);
+        return new CooldownState(send, accept);
+    }
+
+    void saveCooldowns(Map<UUID, Long> send, Map<UUID, Long> accept) {
+        if (!cooldownWritable) {
+            return;
+        }
+        YamlConfiguration config = new YamlConfiguration();
+        long now = System.currentTimeMillis();
+        saveCooldownMap(config, "send", send, now);
+        saveCooldownMap(config, "accept", accept, now);
+        try {
+            AtomicYamlWriter.save(config, cooldownFile);
+        } catch (Exception exception) {
+            plugin.getLogger().warning("保存 teleport-cooldowns.yml 失败: " + exception.getMessage());
+        }
+    }
+
+    Set<UUID> loadIgnoringRequests() {
+        Set<UUID> ignoredPlayers = new HashSet<>();
+        if (!ignoreFile.exists()) {
+            return ignoredPlayers;
+        }
+
+        YamlConfiguration config = new YamlConfiguration();
+        try {
+            config.load(ignoreFile);
+        } catch (IOException | InvalidConfigurationException exception) {
+            ignoreWritable = false;
+            plugin.getLogger().severe("加载 teleport-ignore.yml 失败，已禁止覆盖原文件: "
+                + exception.getMessage());
+            return ignoredPlayers;
+        }
+        ConfigurationSection ignored = config.getConfigurationSection("ignored");
+        if (ignored == null) {
+            return ignoredPlayers;
+        }
+        for (String key : ignored.getKeys(false)) {
+            if (!ignored.getBoolean(key, false)) {
+                continue;
+            }
+            try {
+                ignoredPlayers.add(UUID.fromString(key));
+            } catch (IllegalArgumentException exception) {
+                plugin.getLogger().warning("忽略无效的 TPA 忽略记录 UUID: " + key);
+            }
+        }
+        return ignoredPlayers;
+    }
+
+    boolean saveIgnoringRequests(Set<UUID> ignoredPlayers) {
+        if (!ignoreWritable) {
+            return false;
+        }
+        YamlConfiguration config = new YamlConfiguration();
+        for (UUID playerId : ignoredPlayers) {
+            config.set("ignored." + playerId, true);
+        }
+        try {
+            AtomicYamlWriter.save(config, ignoreFile);
+            return true;
+        } catch (Exception exception) {
+            plugin.getLogger().warning("保存 teleport-ignore.yml 失败: " + exception.getMessage());
+            return false;
+        }
+    }
+
+    private void loadCooldownMap(YamlConfiguration config, String path, Map<UUID, Long> destination) {
+        ConfigurationSection section = config.getConfigurationSection(path);
+        if (section == null) {
+            return;
+        }
+        long now = System.currentTimeMillis();
+        for (String key : section.getKeys(false)) {
+            try {
+                UUID playerId = UUID.fromString(key);
+                long expiresAt = section.getLong(key, 0L);
+                if (expiresAt > now) {
+                    destination.put(playerId, expiresAt);
+                }
+            } catch (IllegalArgumentException exception) {
+                plugin.getLogger().warning("忽略无效的 TPA 冷却记录 UUID: " + key);
+            }
+        }
+    }
+
+    private void saveCooldownMap(YamlConfiguration config, String path, Map<UUID, Long> source, long now) {
+        source.forEach((playerId, expiresAt) -> {
+            if (expiresAt > now) {
+                config.set(path + "." + playerId, expiresAt);
+            }
+        });
+    }
+
+    record CooldownState(Map<UUID, Long> send, Map<UUID, Long> accept) {
+    }
+}

src/main/java/cn/infstar/essentialsC/tpsbar/TpsBarManager.java

@@ -1,8 +1,9 @@
 package cn.infstar.essentialsC.tpsbar;
 
 import cn.infstar.essentialsC.EssentialsC;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarStyle;
 import org.bukkit.boss.BossBar;
@@ -26,6 +27,8 @@ import java.util.UUID;
 
 public final class TpsBarManager implements Listener, TpsBarService {
 
+    private static final LegacyComponentSerializer LEGACY_SECTION = LegacyComponentSerializer.legacySection();
+    private static final PlainTextComponentSerializer PLAIN_TEXT = PlainTextComponentSerializer.plainText();
     private static final double MAX_TPS = 20.0D;
     private static final int UPDATE_INTERVAL_TICKS = 20;
     private static final BarStyle BAR_STYLE = BarStyle.SEGMENTED_20;
@@ -282,11 +285,11 @@ public final class TpsBarManager implements Listener, TpsBarService {
     }
 
     private String buildTitle(double tps, double mspt, int ping) {
-        return ChatColor.translateAlternateColorCodes('&', applyPlaceholders(titleFormat, Map.of(
+        return applyPlaceholders(titleFormat, Map.of(
             "tps_1m", formatDouble(tps),
             "mspt", formatDouble(mspt),
             "ping", Integer.toString(ping)
-        )));
+        ));
     }
 
     private BarColor resolveBarColor(double tps, double mspt, int ping) {
@@ -317,7 +320,7 @@ public final class TpsBarManager implements Listener, TpsBarService {
     }
 
     private String prefixed(String message) {
-        return EssentialsC.getLangManager().getPrefix() + ChatColor.translateAlternateColorCodes('&', message);
+        return EssentialsC.getLangManager().getPrefix() + message;
     }
 
     private String applyPlaceholders(String text, Map<String, String> placeholders) {
@@ -329,7 +332,7 @@ public final class TpsBarManager implements Listener, TpsBarService {
     }
 
     private String stripColor(String message) {
-        return ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', message));
+        return PLAIN_TEXT.serialize(LEGACY_SECTION.deserialize(message == null ? "" : message));
     }
 
     private String formatDouble(double value) {

src/main/java/cn/infstar/essentialsC/util/AtomicYamlWriter.java

@@ -22,7 +22,11 @@ public final class AtomicYamlWriter {
             Files.createDirectories(parent);
         }
 
-        Path temporary = Files.createTempFile(parent, targetFile.getName(), ".tmp");
+        String temporaryPrefix = targetFile.getName();
+        if (temporaryPrefix.length() < 3) {
+            temporaryPrefix = (temporaryPrefix + "___").substring(0, 3);
+        }
+        Path temporary = Files.createTempFile(parent, temporaryPrefix, ".tmp");
         try {
             Files.writeString(temporary, configuration.saveToString(), StandardCharsets.UTF_8);
             try {

src/main/resources/config.yml

@@ -79,6 +79,8 @@ skin-bridge:
   join-delay-ticks: 20
   # 检测结果与生成皮肤的内存缓存时间，单位为分钟。
   cache-minutes: 120
+  # 持久化 MineSkin 纹理缓存的最大条目数，超出时优先清理最早过期的记录。
+  max-generated-cache-entries: 500
   # 强制刷新同一玩家皮肤的冷却时间，单位为秒。
   force-refresh-cooldown-seconds: 30
   # 仅当 Provider 纹理与玩家登录时携带的纹理一致时，才确认其来自该皮肤站。

src/main/resources/lang/en_US.yml

@@ -20,14 +20,18 @@ messages:
   suicide-message: '<#FF7E5E>{player} died by suicide.</#FF7E5E>'
   fly-enabled: '<#00FB9A>Flight mode enabled.</#00FB9A>'
   fly-disabled: '<#FF7E5E>Flight mode disabled.</#FF7E5E>'
+  fly-permission-removed: '<#FF7E5E>Your flight permission was removed, so flight mode was disabled.</#FF7E5E>'
   nightvision-enabled: '<#00FB9A>Night vision enabled.</#00FB9A>'
   nightvision-disabled: '<#FF7E5E>Night vision disabled.</#FF7E5E>'
+  nightvision-permission-removed: '<#FF7E5E>Your night vision permission was removed, so night vision was disabled.</#FF7E5E>'
   nightvision-usage: '<#FF3300>Error:</#FF3300> <#FF7E5E>Usage: /nightvision [on|off|toggle]</#FF7E5E>'
   glow-enabled: '<#00FB9A>Glowing enabled.</#00FB9A>'
   glow-disabled: '<#FF7E5E>Glowing disabled.</#FF7E5E>'
+  glow-permission-removed: '<#FF7E5E>Your glowing permission was removed, so glowing was disabled.</#FF7E5E>'
   glow-usage: '<#FF3300>Error:</#FF3300> <#FF7E5E>Usage: /glow [on|off|toggle]</#FF7E5E>'
   vanish-enabled: '<#00FB9A>You are now vanished.</#00FB9A>'
   vanish-disabled: '<#FF7E5E>You are no longer vanished.</#FF7E5E>'
+  vanish-save-failed: '<#FF3300>Error:</#FF3300> <#FF7E5E>Failed to save vanish state; no changes were applied.</#FF7E5E>'
   vanish-permission-removed: '<#FFC43B>Your vanish permission was removed, so vanish mode was disabled.</#FFC43B>'
   seen-usage: '<#FF3300>Error:</#FF3300> <#FF7E5E>Usage: /seen [player]</#FF7E5E>'
   seen-usage-console: '<#FF3300>Error:</#FF3300> <#FF7E5E>Usage: /seen [player]</#FF7E5E>'
@@ -59,6 +63,8 @@ messages:
   mobdrop-toggled: '<#00FB9A>Enderman drops are now {status}.</#00FB9A>'
   shulkerbox-nested: '<#FF3300>Error:</#FF3300> <#FF7E5E>You cannot put a shulker box inside another shulker box.</#FF7E5E>'
   shulkerbox-unstack-first: '<#FF3300>Error:</#FF3300> <#FF7E5E>Please unstack the shulker box before quick opening it.</#FF7E5E>'
+  shulkerbox-open-failed: '<#FF3300>Error:</#FF3300> <#FF7E5E>Failed to open the shulker box. Please try again.</#FF7E5E>'
+  shulkerbox-session-invalid: '<#FF3300>Error:</#FF3300> <#FF7E5E>The shulker box session became invalid. Saving was stopped to prevent item duplication.</#FF7E5E>'
   jei-sync-fabric: '<#00FB9A>Synchronizing recipes for your <bold>Fabric</bold> client…</#00FB9A>'
   jei-sync-neoforge: '<#00FB9A>Synchronizing recipes for your <bold>NeoForge</bold> client…</#00FB9A>'
 
@@ -138,6 +144,7 @@ tpa:
     teleport-failed: '<#FF3300>Error:</#FF3300> <#FF7E5E>Teleportation could not be completed. Please try again.</#FF7E5E>'
     ignore-enabled: '<#00FB9A>Now</#00FB9A> <bold><#00FB9A>ignoring</#00FB9A></bold> <#00FB9A>incoming teleport requests.</#00FB9A>'
     ignore-disabled: '<#00FB9A>Now</#00FB9A> <bold><#00FB9A>listening</#00FB9A></bold> <#00FB9A>to incoming teleport requests.</#00FB9A>'
+    ignore-save-failed: '<#FF3300>Error:</#FF3300> <#FF7E5E>Failed to save the teleport request ignore state; no changes were applied.</#FF7E5E>'
     ignore-notification: '<gray>You are currently ignoring teleport requests.</gray>'
     tpaall-sent: '<#00FB9A>You sent a teleport request to every player asking them to teleport to you.</#00FB9A>'
     tpaall-no-targets: '<#FF3300>Error:</#FF3300> <#FF7E5E>There are no other players online.</#FF7E5E>'
@@ -260,6 +267,7 @@ maintenance:
     enabled: '<#00FB9A>Maintenance mode enabled.</#00FB9A>'
     disabled: '<#FF7E5E>Maintenance mode disabled.</#FF7E5E>'
     reloaded: '<#00FB9A>Maintenance configuration reloaded.</#00FB9A>'
+    save-failed: '<#FF3300>Error:</#FF3300> <#FF7E5E>Failed to save maintenance configuration; no changes were applied.</#FF7E5E>'
     status: '<gray>Maintenance mode status: {status} | Whitelist: <white>{whitelist_count}</white></gray>'
     usage: '<#FF3300>Error:</#FF3300> <#FF7E5E>Usage: /maintenance [on|off|status|reload|add|remove|list]</#FF7E5E>'
     add-usage: '<#FF3300>Error:</#FF3300> <#FF7E5E>Usage: /maintenance add [player|uuid]</#FF7E5E>'

src/main/resources/lang/zh_CN.yml

@@ -20,14 +20,18 @@ messages:
   suicide-message: '<#FF7E5E>{player} 自杀了.</#FF7E5E>'
   fly-enabled: '<#00FB9A>飞行模式已开启.</#00FB9A>'
   fly-disabled: '<#FF7E5E>飞行模式已关闭.</#FF7E5E>'
+  fly-permission-removed: '<#FF7E5E>你的飞行权限已被移除，飞行模式已关闭.</#FF7E5E>'
   nightvision-enabled: '<#00FB9A>夜视已开启.</#00FB9A>'
   nightvision-disabled: '<#FF7E5E>夜视已关闭.</#FF7E5E>'
+  nightvision-permission-removed: '<#FF7E5E>你的夜视权限已被移除，夜视已关闭.</#FF7E5E>'
   nightvision-usage: '<#FF3300>错误:</#FF3300> <#FF7E5E>用法: /nightvision [on|off|toggle]</#FF7E5E>'
   glow-enabled: '<#00FB9A>发光已开启.</#00FB9A>'
   glow-disabled: '<#FF7E5E>发光已关闭.</#FF7E5E>'
+  glow-permission-removed: '<#FF7E5E>你的发光权限已被移除，发光已关闭.</#FF7E5E>'
   glow-usage: '<#FF3300>错误:</#FF3300> <#FF7E5E>用法: /glow [on|off|toggle]</#FF7E5E>'
   vanish-enabled: '<#00FB9A>你已进入隐身模式.</#00FB9A>'
   vanish-disabled: '<#FF7E5E>你已退出隐身模式.</#FF7E5E>'
+  vanish-save-failed: '<#FF3300>错误:</#FF3300> <#FF7E5E>无法保存隐身状态，本次操作未生效.</#FF7E5E>'
   vanish-permission-removed: '<#FFC43B>你的隐身权限已被移除,隐身模式已自动关闭.</#FFC43B>'
   seen-usage: '<#FF3300>错误:</#FF3300> <#FF7E5E>用法: /seen [玩家]</#FF7E5E>'
   seen-usage-console: '<#FF3300>错误:</#FF3300> <#FF7E5E>用法: /seen [玩家]</#FF7E5E>'
@@ -59,6 +63,8 @@ messages:
   mobdrop-toggled: '<#00FB9A>末影人掉落已切换为 {status}.</#00FB9A>'
   shulkerbox-nested: '<#FF3300>错误:</#FF3300> <#FF7E5E>不能将潜影盒放入另一个潜影盒.</#FF7E5E>'
   shulkerbox-unstack-first: '<#FF3300>错误:</#FF3300> <#FF7E5E>请先将潜影盒拆分为单个后再快捷打开.</#FF7E5E>'
+  shulkerbox-open-failed: '<#FF3300>错误:</#FF3300> <#FF7E5E>潜影盒打开失败，请稍后重试.</#FF7E5E>'
+  shulkerbox-session-invalid: '<#FF3300>错误:</#FF3300> <#FF7E5E>潜影盒会话异常，已停止保存以避免物品复制.</#FF7E5E>'
   jei-sync-fabric: '<#00FB9A>正在为 <bold>Fabric</bold> 客户端同步配方…</#00FB9A>'
   jei-sync-neoforge: '<#00FB9A>正在为 <bold>NeoForge</bold> 客户端同步配方…</#00FB9A>'
 
@@ -138,6 +144,7 @@ tpa:
     teleport-failed: '<#FF3300>错误:</#FF3300> <#FF7E5E>无法完成传送,请稍后重试</#FF7E5E>'
     ignore-enabled: '<#00FB9A>你已</#00FB9A> <bold><#00FB9A>忽略</#00FB9A></bold> <#00FB9A>传送请求</#00FB9A>'
     ignore-disabled: '<#00FB9A>你已</#00FB9A> <bold><#00FB9A>恢复接收</#00FB9A></bold> <#00FB9A>传送请求</#00FB9A>'
+    ignore-save-failed: '<#FF3300>错误:</#FF3300> <#FF7E5E>无法保存传送请求忽略状态，本次操作未生效.</#FF7E5E>'
     ignore-notification: '<gray>你当前正在忽略传送请求.</gray>'
     tpaall-sent: '<#00FB9A>你已向所有玩家发送传送请求,请求他们传送到你的位置</#00FB9A>'
     tpaall-no-targets: '<#FF3300>错误:</#FF3300> <#FF7E5E>当前没有其他在线玩家.</#FF7E5E>'
@@ -260,6 +267,7 @@ maintenance:
     enabled: '<#00FB9A>维护模式已开启.</#00FB9A>'
     disabled: '<#FF7E5E>维护模式已关闭.</#FF7E5E>'
     reloaded: '<#00FB9A>维护模式配置已重载.</#00FB9A>'
+    save-failed: '<#FF3300>错误:</#FF3300> <#FF7E5E>维护模式配置保存失败，操作未生效.</#FF7E5E>'
     status: '<gray>维护模式当前状态: {status} | 白名单: <white>{whitelist_count}</white></gray>'
     usage: '<#FF3300>错误:</#FF3300> <#FF7E5E>用法: /maintenance [on|off|status|reload|add|remove|list]</#FF7E5E>'
     add-usage: '<#FF3300>错误:</#FF3300> <#FF7E5E>用法: /maintenance add [玩家|UUID]</#FF7E5E>'

src/main/resources/paper-plugin.yml

@@ -7,6 +7,13 @@ api-version: '1.21.11'
 load: POSTWORLD
 folia-supported: false
 
+dependencies:
+  server:
+    LuckPerms:
+      load: BEFORE
+      required: false
+      join-classpath: true
+
 authors: [ Coldsmiles_7 ]
 website: www.infstar.cn
 

src/test/java/cn/infstar/essentialsC/ConfigurationResourcesTest.java

@@ -3,6 +3,7 @@ package cn.infstar.essentialsC;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -10,6 +11,7 @@ import java.nio.charset.StandardCharsets;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class ConfigurationResourcesTest {
 
@@ -32,10 +34,29 @@ class ConfigurationResourcesTest {
             if (resourcePath.equals("config.yml")) {
                 assertEquals(2, configuration.getInt("config-version"));
                 assertEquals(5, configuration.getInt("tpa.max-pending-requests"));
+                assertEquals(500, configuration.getInt("skin-bridge.max-generated-cache-entries"));
+                assertTrue(configuration.getString("skin-bridge.mineskin.api-key", "").isBlank());
             }
             if (resourcePath.equals("paper-plugin.yml")) {
                 assertEquals("1.21.11", configuration.getString("api-version"));
             }
         }
     }
+
+    @Test
+    void bundledLanguagesContainTheSameKeys() throws Exception {
+        YamlConfiguration chinese = loadResource("lang/zh_CN.yml");
+        YamlConfiguration english = loadResource("lang/en_US.yml");
+
+        assertEquals(chinese.getKeys(true), english.getKeys(true));
+    }
+
+    private YamlConfiguration loadResource(String resourcePath) throws Exception {
+        try (InputStream input = getClass().getClassLoader().getResourceAsStream(resourcePath)) {
+            assertNotNull(input, resourcePath);
+            YamlConfiguration configuration = new YamlConfiguration();
+            configuration.load(new InputStreamReader(input, StandardCharsets.UTF_8));
+            return configuration;
+        }
+    }
 }

src/test/java/cn/infstar/essentialsC/admin/AdminModeStoreTest.java

@@ -0,0 +1,45 @@
+package cn.infstar.essentialsC.admin;
+
+import cn.infstar.essentialsC.util.AtomicYamlWriter;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.UUID;
+import java.util.logging.Logger;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class AdminModeStoreTest {
+
+    @TempDir
+    Path temporaryDirectory;
+
+    @Test
+    void migratesLegacyPlayersIntoIndependentFiles() throws Exception {
+        UUID playerId = UUID.randomUUID();
+        Path legacyFile = temporaryDirectory.resolve("admin-mode.yml");
+        YamlConfiguration legacy = new YamlConfiguration();
+        legacy.set("players." + playerId + ".active", true);
+        legacy.set("players." + playerId + ".normal.level", 27);
+        AtomicYamlWriter.save(legacy, legacyFile.toFile());
+
+        AdminModeStore store = new AdminModeStore(
+            temporaryDirectory.resolve("admin-mode").toFile(), legacyFile.toFile(), Logger.getAnonymousLogger());
+
+        YamlConfiguration migrated = store.load(playerId);
+        assertNotNull(migrated);
+        assertTrue(migrated.getBoolean("active"));
+        assertEquals(27, migrated.getInt("normal.level"));
+        assertTrue(Files.exists(temporaryDirectory.resolve("admin-mode").resolve(playerId + ".yml")));
+        assertFalse(Files.exists(legacyFile));
+        try (var backups = Files.list(temporaryDirectory)) {
+            assertTrue(backups.anyMatch(path -> path.getFileName().toString().startsWith("admin-mode.legacy-")));
+        }
+    }
+}

src/test/java/cn/infstar/essentialsC/compat/jei/RecipeGroupingTest.java

@@ -0,0 +1,23 @@
+package cn.infstar.essentialsC.compat.jei;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class RecipeGroupingTest {
+
+    @Test
+    void groupsValuesInOnePassAndPreservesOrder() {
+        List<String> recipes = List.of("crafting:first", "smelting:second", "crafting:third");
+
+        Map<String, List<String>> grouped = RecipeGrouping.groupBy(
+            recipes, value -> value.substring(0, value.indexOf(':')));
+
+        assertEquals(List.of("crafting", "smelting"), grouped.keySet().stream().toList());
+        assertEquals(List.of("crafting:first", "crafting:third"), grouped.get("crafting"));
+        assertEquals(List.of("smelting:second"), grouped.get("smelting"));
+    }
+}

src/test/java/cn/infstar/essentialsC/listeners/ShulkerBoxSessionPolicyTest.java

@@ -0,0 +1,25 @@
+package cn.infstar.essentialsC.listeners;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class ShulkerBoxSessionPolicyTest {
+
+    @Test
+    void identifiesOnlySlotsInsideTopInventory() {
+        assertFalse(ShulkerBoxSessionPolicy.isTopSlot(-999, 27));
+        assertTrue(ShulkerBoxSessionPolicy.isTopSlot(0, 27));
+        assertTrue(ShulkerBoxSessionPolicy.isTopSlot(26, 27));
+        assertFalse(ShulkerBoxSessionPolicy.isTopSlot(27, 27));
+    }
+
+    @Test
+    void detectsDragsThatTouchTopInventory() {
+        assertTrue(ShulkerBoxSessionPolicy.touchesTopInventory(Set.of(5, 30), 27));
+        assertFalse(ShulkerBoxSessionPolicy.touchesTopInventory(Set.of(27, 35), 27));
+    }
+}

src/test/java/cn/infstar/essentialsC/util/AtomicYamlWriterTest.java

@@ -0,0 +1,76 @@
+package cn.infstar.essentialsC.util;
+
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class AtomicYamlWriterTest {
+
+    @TempDir
+    Path temporaryDirectory;
+
+    @Test
+    void createsParentDirectoriesAndWritesUtf8Yaml() throws Exception {
+        Path target = temporaryDirectory.resolve("nested/data.yml");
+        YamlConfiguration configuration = new YamlConfiguration();
+        configuration.set("message", "中文内容");
+
+        AtomicYamlWriter.save(configuration, target.toFile());
+
+        assertTrue(Files.exists(target));
+        assertTrue(Files.readString(target, StandardCharsets.UTF_8).contains("中文内容"));
+        try (var files = Files.list(target.getParent())) {
+            assertFalse(files.anyMatch(path -> path.getFileName().toString().endsWith(".tmp")));
+        }
+    }
+
+    @Test
+    void replacesExistingYamlWithoutRetainingOldValues() throws Exception {
+        Path target = temporaryDirectory.resolve("state.yml");
+        YamlConfiguration initial = new YamlConfiguration();
+        initial.set("old-value", true);
+        AtomicYamlWriter.save(initial, target.toFile());
+
+        YamlConfiguration replacement = new YamlConfiguration();
+        replacement.set("new-value", 42);
+        AtomicYamlWriter.save(replacement, target.toFile());
+
+        YamlConfiguration loaded = YamlConfiguration.loadConfiguration(target.toFile());
+        assertFalse(loaded.contains("old-value"));
+        assertEquals(42, loaded.getInt("new-value"));
+    }
+
+    @Test
+    void supportsShortTargetFileNames() throws Exception {
+        Path target = temporaryDirectory.resolve("x");
+        YamlConfiguration configuration = new YamlConfiguration();
+        configuration.set("written", true);
+
+        AtomicYamlWriter.save(configuration, target.toFile());
+
+        assertTrue(YamlConfiguration.loadConfiguration(target.toFile()).getBoolean("written"));
+    }
+
+    @Test
+    void preservesParsedChineseComments() throws Exception {
+        Path target = temporaryDirectory.resolve("commented.yml");
+        YamlConfiguration configuration = new YamlConfiguration();
+        configuration.options().parseComments(true);
+        configuration.loadFromString("# 中文配置注释\nenabled: false\n");
+        configuration.set("enabled", true);
+
+        AtomicYamlWriter.save(configuration, target.toFile());
+
+        String saved = Files.readString(target, StandardCharsets.UTF_8);
+        assertTrue(saved.contains("# 中文配置注释"));
+        assertTrue(saved.contains("enabled: true"));
+    }
+}

versions/v1_21_11/src/main/java/cn/infstar/essentialsC/v1_21_11/jei/JeiRecipeSyncAdapterImpl.java

@@ -1,6 +1,7 @@
 package cn.infstar.essentialsC.v1_21_11.jei;
 
 import cn.infstar.essentialsC.compat.jei.JeiRecipeSyncAdapter;
+import cn.infstar.essentialsC.compat.jei.RecipeGrouping;
 import io.netty.buffer.Unpooled;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.RegistryFriendlyByteBuf;
@@ -22,6 +23,9 @@ import java.util.logging.Logger;
 
 public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
 
+    private DiscardedPayload fabricPayloadCache;
+    private DiscardedPayload neoForgePayloadCache;
+
     @Override
     @SuppressWarnings({"unchecked", "deprecation"})
     public void sendFabricRecipeSync(Player player, Logger logger, boolean debug) {
@@ -33,6 +37,10 @@ public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
             }
             return;
         }
+        if (fabricPayloadCache != null) {
+            serverPlayer.connection.send(new ClientboundCustomPayloadPacket(fabricPayloadCache));
+            return;
+        }
 
         RecipeMap recipeMap = server.getRecipeManager().recipes;
         if (debug) {
@@ -41,20 +49,17 @@ public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
 
         var list = new ArrayList<FabricRecipeEntry>();
         var seen = new HashSet<RecipeSerializer<?>>();
+        var groupedRecipes = RecipeGrouping.groupBy(
+            recipeMap.values(), holder -> holder.value().getSerializer());
 
         for (RecipeSerializer<?> serializer : BuiltInRegistries.RECIPE_SERIALIZER) {
             if (!seen.add(serializer)) {
                 continue;
             }
 
-            List<RecipeHolder<?>> recipes = new ArrayList<>();
-            for (RecipeHolder<?> holder : recipeMap.values()) {
-                if (holder.value().getSerializer() == serializer) {
-                    recipes.add(holder);
-                }
-            }
+            List<RecipeHolder<?>> recipes = groupedRecipes.get(serializer);
 
-            if (!recipes.isEmpty()) {
+            if (recipes != null && !recipes.isEmpty()) {
                 RecipeSerializer<?> entrySerializer = recipes.get(0).value().getSerializer();
                 list.add(new FabricRecipeEntry(entrySerializer, recipes));
             }
@@ -66,13 +71,18 @@ public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
         }
 
         RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
-        getFabricCodec().encode(buffer, payload);
-
-        byte[] bytes = new byte[buffer.writerIndex()];
-        buffer.getBytes(0, bytes);
+        byte[] bytes;
+        try {
+            getFabricCodec().encode(buffer, payload);
+            bytes = new byte[buffer.writerIndex()];
+            buffer.getBytes(0, bytes);
+        } finally {
+            buffer.release();
+        }
 
         Identifier id = Identifier.fromNamespaceAndPath("fabric", "recipe_sync");
         DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
+        fabricPayloadCache = discardedPayload;
         serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
 
         if (debug) {
@@ -91,6 +101,11 @@ public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
             }
             return;
         }
+        if (neoForgePayloadCache != null) {
+            serverPlayer.connection.send(new ClientboundCustomPayloadPacket(neoForgePayloadCache));
+            sendTags(serverPlayer, server);
+            return;
+        }
 
         RecipeMap recipeMap = server.getRecipeManager().recipes;
         if (debug) {
@@ -105,23 +120,38 @@ public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
 
         var payload = createNeoForgePayload(allRecipeTypes, recipeMap);
         RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
-        getNeoForgeStreamCodec().encode(buffer, payload);
-
-        byte[] bytes = new byte[buffer.writerIndex()];
-        buffer.getBytes(0, bytes);
+        byte[] bytes;
+        try {
+            getNeoForgeStreamCodec().encode(buffer, payload);
+            bytes = new byte[buffer.writerIndex()];
+            buffer.getBytes(0, bytes);
+        } finally {
+            buffer.release();
+        }
 
         Identifier id = Identifier.fromNamespaceAndPath("neoforge", "recipe_content");
         DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
+        neoForgePayloadCache = discardedPayload;
         serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
-        serverPlayer.connection.send(new net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket(
-            net.minecraft.tags.TagNetworkSerialization.serializeTagsToNetwork(server.registries())
-        ));
+        sendTags(serverPlayer, server);
 
         if (debug) {
             logger.info("已发送 NeoForge 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
         }
     }
 
+    @Override
+    public void clearCache() {
+        fabricPayloadCache = null;
+        neoForgePayloadCache = null;
+    }
+
+    private void sendTags(ServerPlayer serverPlayer, MinecraftServer server) {
+        serverPlayer.connection.send(new net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket(
+            net.minecraft.tags.TagNetworkSerialization.serializeTagsToNetwork(server.registries())
+        ));
+    }
+
     @SuppressWarnings({"unchecked", "deprecation"})
     private net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, FabricRecipeSyncPayload> getFabricCodec() {
         return FabricRecipeEntry.CODEC.apply(net.minecraft.network.codec.ByteBufCodecs.list())

versions/v26_1_2/build.gradle

@@ -1,3 +1,5 @@
+import org.gradle.api.attributes.java.TargetJvmVersion
+
 plugins {
     id 'java-library'
     id 'io.papermc.paperweight.userdev'
@@ -13,15 +15,20 @@ repositories {
 
 dependencies {
     api project(':compat-api')
-    paperweight.paperDevBundle('26.1.2.build.72-stable')
+    paperweight.paperDevBundle('26.1.2.build.74-stable')
 }
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(25))
 }
 
+configurations.configureEach {
+    attributes.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 25)
+}
+
 paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.getMOJANG_PRODUCTION()
 
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
+    options.release.set(21)
 }

versions/v26_1_2/src/main/java/cn/infstar/essentialsC/v26_1_2/jei/JeiRecipeSyncAdapterImpl.java

@@ -1,6 +1,7 @@
 package cn.infstar.essentialsC.v26_1_2.jei;
 
 import cn.infstar.essentialsC.compat.jei.JeiRecipeSyncAdapter;
+import cn.infstar.essentialsC.compat.jei.RecipeGrouping;
 import io.netty.buffer.Unpooled;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.RegistryFriendlyByteBuf;
@@ -22,6 +23,9 @@ import java.util.logging.Logger;
 
 public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
 
+    private DiscardedPayload fabricPayloadCache;
+    private DiscardedPayload neoForgePayloadCache;
+
     @Override
     @SuppressWarnings({"unchecked", "deprecation"})
     public void sendFabricRecipeSync(Player player, Logger logger, boolean debug) {
@@ -33,6 +37,10 @@ public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
             }
             return;
         }
+        if (fabricPayloadCache != null) {
+            serverPlayer.connection.send(new ClientboundCustomPayloadPacket(fabricPayloadCache));
+            return;
+        }
 
         RecipeMap recipeMap = server.getRecipeManager().recipes;
         if (debug) {
@@ -41,20 +49,17 @@ public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
 
         var list = new ArrayList<FabricRecipeEntry>();
         var seen = new HashSet<RecipeSerializer<?>>();
+        var groupedRecipes = RecipeGrouping.groupBy(
+            recipeMap.values(), holder -> holder.value().getSerializer());
 
         for (RecipeSerializer<?> serializer : BuiltInRegistries.RECIPE_SERIALIZER) {
             if (!seen.add(serializer)) {
                 continue;
             }
 
-            List<RecipeHolder<?>> recipes = new ArrayList<>();
-            for (RecipeHolder<?> holder : recipeMap.values()) {
-                if (holder.value().getSerializer() == serializer) {
-                    recipes.add(holder);
-                }
-            }
+            List<RecipeHolder<?>> recipes = groupedRecipes.get(serializer);
 
-            if (!recipes.isEmpty()) {
+            if (recipes != null && !recipes.isEmpty()) {
                 RecipeSerializer<?> entrySerializer = recipes.get(0).value().getSerializer();
                 list.add(new FabricRecipeEntry(entrySerializer, recipes));
             }
@@ -66,13 +71,18 @@ public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
         }
 
         RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
-        getFabricCodec().encode(buffer, payload);
-
-        byte[] bytes = new byte[buffer.writerIndex()];
-        buffer.getBytes(0, bytes);
+        byte[] bytes;
+        try {
+            getFabricCodec().encode(buffer, payload);
+            bytes = new byte[buffer.writerIndex()];
+            buffer.getBytes(0, bytes);
+        } finally {
+            buffer.release();
+        }
 
         Identifier id = Identifier.fromNamespaceAndPath("fabric", "recipe_sync");
         DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
+        fabricPayloadCache = discardedPayload;
         serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
 
         if (debug) {
@@ -91,6 +101,11 @@ public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
             }
             return;
         }
+        if (neoForgePayloadCache != null) {
+            serverPlayer.connection.send(new ClientboundCustomPayloadPacket(neoForgePayloadCache));
+            sendTags(serverPlayer, server);
+            return;
+        }
 
         RecipeMap recipeMap = server.getRecipeManager().recipes;
         if (debug) {
@@ -105,23 +120,38 @@ public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
 
         var payload = createNeoForgePayload(allRecipeTypes, recipeMap);
         RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
-        getNeoForgeStreamCodec().encode(buffer, payload);
-
-        byte[] bytes = new byte[buffer.writerIndex()];
-        buffer.getBytes(0, bytes);
+        byte[] bytes;
+        try {
+            getNeoForgeStreamCodec().encode(buffer, payload);
+            bytes = new byte[buffer.writerIndex()];
+            buffer.getBytes(0, bytes);
+        } finally {
+            buffer.release();
+        }
 
         Identifier id = Identifier.fromNamespaceAndPath("neoforge", "recipe_content");
         DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
+        neoForgePayloadCache = discardedPayload;
         serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
-        serverPlayer.connection.send(new net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket(
-            net.minecraft.tags.TagNetworkSerialization.serializeTagsToNetwork(server.registries())
-        ));
+        sendTags(serverPlayer, server);
 
         if (debug) {
             logger.info("已发送 NeoForge 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
         }
     }
 
+    @Override
+    public void clearCache() {
+        fabricPayloadCache = null;
+        neoForgePayloadCache = null;
+    }
+
+    private void sendTags(ServerPlayer serverPlayer, MinecraftServer server) {
+        serverPlayer.connection.send(new net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket(
+            net.minecraft.tags.TagNetworkSerialization.serializeTagsToNetwork(server.registries())
+        ));
+    }
+
     @SuppressWarnings({"unchecked", "deprecation"})
     private net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, FabricRecipeSyncPayload> getFabricCodec() {
         return FabricRecipeEntry.CODEC.apply(net.minecraft.network.codec.ByteBufCodecs.list())

versions/v26_2/build.gradle

@@ -1,3 +1,5 @@
+import org.gradle.api.attributes.java.TargetJvmVersion
+
 plugins {
     id 'java-library'
     id 'io.papermc.paperweight.userdev'
@@ -13,15 +15,20 @@ repositories {
 
 dependencies {
     api project(':compat-api')
-    paperweight.paperDevBundle('26.2.build.31-alpha')
+    paperweight.paperDevBundle('26.2.build.87-stable')
 }
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(25))
 }
 
+configurations.configureEach {
+    attributes.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 25)
+}
+
 paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.getMOJANG_PRODUCTION()
 
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
+    options.release.set(21)
 }

versions/v26_2/src/main/java/cn/infstar/essentialsC/v26_2/jei/JeiRecipeSyncAdapterImpl.java

@@ -1,6 +1,7 @@
 package cn.infstar.essentialsC.v26_2.jei;
 
 import cn.infstar.essentialsC.compat.jei.JeiRecipeSyncAdapter;
+import cn.infstar.essentialsC.compat.jei.RecipeGrouping;
 import io.netty.buffer.Unpooled;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.RegistryFriendlyByteBuf;
@@ -22,6 +23,9 @@ import java.util.logging.Logger;
 
 public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
 
+    private DiscardedPayload fabricPayloadCache;
+    private DiscardedPayload neoForgePayloadCache;
+
     @Override
     @SuppressWarnings({"unchecked", "deprecation"})
     public void sendFabricRecipeSync(Player player, Logger logger, boolean debug) {
@@ -33,6 +37,10 @@ public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
             }
             return;
         }
+        if (fabricPayloadCache != null) {
+            serverPlayer.connection.send(new ClientboundCustomPayloadPacket(fabricPayloadCache));
+            return;
+        }
 
         RecipeMap recipeMap = server.getRecipeManager().recipes;
         if (debug) {
@@ -41,20 +49,17 @@ public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
 
         var list = new ArrayList<FabricRecipeEntry>();
         var seen = new HashSet<RecipeSerializer<?>>();
+        var groupedRecipes = RecipeGrouping.groupBy(
+            recipeMap.values(), holder -> holder.value().getSerializer());
 
         for (RecipeSerializer<?> serializer : BuiltInRegistries.RECIPE_SERIALIZER) {
             if (!seen.add(serializer)) {
                 continue;
             }
 
-            List<RecipeHolder<?>> recipes = new ArrayList<>();
-            for (RecipeHolder<?> holder : recipeMap.values()) {
-                if (holder.value().getSerializer() == serializer) {
-                    recipes.add(holder);
-                }
-            }
+            List<RecipeHolder<?>> recipes = groupedRecipes.get(serializer);
 
-            if (!recipes.isEmpty()) {
+            if (recipes != null && !recipes.isEmpty()) {
                 RecipeSerializer<?> entrySerializer = recipes.get(0).value().getSerializer();
                 list.add(new FabricRecipeEntry(entrySerializer, recipes));
             }
@@ -66,13 +71,18 @@ public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
         }
 
         RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
-        getFabricCodec().encode(buffer, payload);
-
-        byte[] bytes = new byte[buffer.writerIndex()];
-        buffer.getBytes(0, bytes);
+        byte[] bytes;
+        try {
+            getFabricCodec().encode(buffer, payload);
+            bytes = new byte[buffer.writerIndex()];
+            buffer.getBytes(0, bytes);
+        } finally {
+            buffer.release();
+        }
 
         Identifier id = Identifier.fromNamespaceAndPath("fabric", "recipe_sync");
         DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
+        fabricPayloadCache = discardedPayload;
         serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
 
         if (debug) {
@@ -91,6 +101,11 @@ public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
             }
             return;
         }
+        if (neoForgePayloadCache != null) {
+            serverPlayer.connection.send(new ClientboundCustomPayloadPacket(neoForgePayloadCache));
+            sendTags(serverPlayer, server);
+            return;
+        }
 
         RecipeMap recipeMap = server.getRecipeManager().recipes;
         if (debug) {
@@ -105,23 +120,38 @@ public final class JeiRecipeSyncAdapterImpl implements JeiRecipeSyncAdapter {
 
         var payload = createNeoForgePayload(allRecipeTypes, recipeMap);
         RegistryFriendlyByteBuf buffer = new RegistryFriendlyByteBuf(Unpooled.buffer(), server.registryAccess());
-        getNeoForgeStreamCodec().encode(buffer, payload);
-
-        byte[] bytes = new byte[buffer.writerIndex()];
-        buffer.getBytes(0, bytes);
+        byte[] bytes;
+        try {
+            getNeoForgeStreamCodec().encode(buffer, payload);
+            bytes = new byte[buffer.writerIndex()];
+            buffer.getBytes(0, bytes);
+        } finally {
+            buffer.release();
+        }
 
         Identifier id = Identifier.fromNamespaceAndPath("neoforge", "recipe_content");
         DiscardedPayload discardedPayload = new DiscardedPayload(id, bytes);
+        neoForgePayloadCache = discardedPayload;
         serverPlayer.connection.send(new ClientboundCustomPayloadPacket(discardedPayload));
-        serverPlayer.connection.send(new net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket(
-            net.minecraft.tags.TagNetworkSerialization.serializeTagsToNetwork(server.registries())
-        ));
+        sendTags(serverPlayer, server);
 
         if (debug) {
             logger.info("已发送 NeoForge 配方同步 [" + id + "], 大小: " + bytes.length + " bytes");
         }
     }
 
+    @Override
+    public void clearCache() {
+        fabricPayloadCache = null;
+        neoForgePayloadCache = null;
+    }
+
+    private void sendTags(ServerPlayer serverPlayer, MinecraftServer server) {
+        serverPlayer.connection.send(new net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket(
+            net.minecraft.tags.TagNetworkSerialization.serializeTagsToNetwork(server.registries())
+        ));
+    }
+
     @SuppressWarnings({"unchecked", "deprecation"})
     private net.minecraft.network.codec.StreamCodec<RegistryFriendlyByteBuf, FabricRecipeSyncPayload> getFabricCodec() {
         return FabricRecipeEntry.CODEC.apply(net.minecraft.network.codec.ByteBufCodecs.list())