From 7d346b97798ee95eace2ab818f01d528f7eef258 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <972454774@qq.com>
Date: Mon, 29 Sep 2025 01:54:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bukkit/plugin/BukkitCraftEngine.java           | 14 ++++++++++++++
 .../core/block/AbstractBlockManager.java           |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/BukkitCraftEngine.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/BukkitCraftEngine.java
index 9acb350a2..e5a984612 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/BukkitCraftEngine.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/BukkitCraftEngine.java
@@ -55,6 +55,7 @@ import org.jspecify.annotations.Nullable;
 import java.io.*;
 import java.net.URL;
 import java.net.URLConnection;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Objects;
@@ -210,6 +211,19 @@ public class BukkitCraftEngine extends CraftEngine {
         super.furnitureManager = new BukkitFurnitureManager(this);
         super.onPluginEnable();
         super.compatibilityManager().onEnable();
+
+        // todo 未来版本移除
+        Path legacyFile1 = this.dataFolderPath().resolve("additional-real-blocks.yml");
+        Path legacyFile2 = this.dataFolderPath().resolve("mappings.yml");
+        if (Files.exists(legacyFile1)) {
+            try {
+                Files.delete(legacyFile1);
+                Files.deleteIfExists(legacyFile2);
+                this.saveResource("resources/internal/configuration/mappings.yml");
+            } catch (IOException e) {
+                this.logger.warn("Failed to delete legacy files", e);
+            }
+        }
     }
 
     @Override
diff --git a/core/src/main/java/net/momirealms/craftengine/core/block/AbstractBlockManager.java b/core/src/main/java/net/momirealms/craftengine/core/block/AbstractBlockManager.java
index 8f2f9f035..c9bda8d59 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/block/AbstractBlockManager.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/block/AbstractBlockManager.java
@@ -674,7 +674,7 @@ public abstract class AbstractBlockManager extends AbstractModelGenerator implem
                 // 获取原版方块的id
                 Key block = split.length == 2 ? Key.of(split[0]) : Key.of(split[0], split[1]);
                 try {
-                    List<BlockStateWrapper> arranger =blockStateArranger.get(block);
+                    List<BlockStateWrapper> arranger = AbstractBlockManager.this.blockStateArranger.get(block);
                     if (arranger == null) {
                         throw new LocalizedResourceConfigException("warning.config.block.state.unavailable_vanilla", blockState);
                     }