[1.4.7-dev4]修复配方重载的bug

YufiriaMazenta · Nov 16, 2023 · 6d4e71f · 6d4e71f
1 parent 381e697
commit 6d4e71f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 22 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -38,7 +38,7 @@ dependencies {
 }
 
 group = "com.github.yufiriamazenta"
-version = "1.4.7-dev3"
+version = "1.4.7-dev4"
 var pluginVersion: String = version.toString() + "-" + SimpleDateFormat("yyyyMMdd").format(System.currentTimeMillis())
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 java.targetCompatibility = JavaVersion.VERSION_1_8

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/Craftorithm.java b/src/main/java/com/github/yufiriamazenta/craftorithm/Craftorithm.java
@@ -39,7 +39,7 @@ public void enable() {
         saveDefaultConfig();
         ConfigUpdater.INSTANCE.updateConfig();
 
-        ItemManager.loadItemManager();
+        ItemManager.reloadItemManager();
         RecipeManager.loadRecipeManager();
         regListeners();
         PluginHookUtil.hookPlugins();
@@ -105,7 +105,7 @@ public void onServerLoad(ServerLoadEvent event) {
                     map.put(namespace, recipes);
                 }
             }
-            RecipeManager.reloadRecipes();
+            RecipeManager.reloadRecipesManager();
         }
     }
 }
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/subcmd/ReloadCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/subcmd/ReloadCommand.java
@@ -33,22 +33,15 @@ public boolean onCommand(CommandSender sender, List<String> args) {
 
     public static void reloadPlugin() {
         reloadConfigs();
-        ItemManager.loadItems();
-        reloadRecipes();
+        ItemManager.reloadItemManager();
+        RecipeManager.reloadRecipesManager();
     }
 
     public static void reloadConfigs() {
         Craftorithm.getInstance().reloadConfig();
-        LangUtil.reloadMsgConfig();
-        RecipeManager.getRemovedRecipeConfig().reloadConfig();
-        ItemManager.loadItemFiles();
-        RecipeManager.reloadRecipeFiles();
-        ArcencielDispatcher.INSTANCE.getFunctionFile().reloadConfig();
         ItemUtil.reloadCannotCraftLore();
-    }
-
-    public static void reloadRecipes() {
-        RecipeManager.reloadRecipes();
+        LangUtil.reloadLangConfig();
+        ArcencielDispatcher.INSTANCE.getFunctionFile().reloadConfig();
     }
 
 }
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/item/ItemManager.java b/src/main/java/com/github/yufiriamazenta/craftorithm/item/ItemManager.java
@@ -26,12 +26,12 @@ public class ItemManager {
     private static final Map<String, ItemStack> itemMap = new HashMap<>();
     private static final File itemFileFolder = new File(Craftorithm.getInstance().getDataFolder().getPath(), "items");
 
-    public static void loadItemManager() {
-        loadItemFiles();
-        loadItems();
+    public static void reloadItemManager() {
+        reloadItemFiles();
+        reloadItems();
     }
 
-    public static void loadItems() {
+    public static void reloadItems() {
         itemMap.clear();
         for (String fileKey : itemFileMap.keySet()) {
             YamlConfigWrapper itemFile = itemFileMap.get(fileKey);
@@ -75,7 +75,7 @@ public static ItemStack getCraftorithmItem(String itemName) {
         return itemMap.getOrDefault(itemName, new ItemStack(Material.AIR)).clone();
     }
 
-    public static void loadItemFiles() {
+    public static void reloadItemFiles() {
         itemFileMap.clear();
         if (!itemFileFolder.exists()) {
             boolean mkdirResult = itemFileFolder.mkdir();

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java b/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java
@@ -67,15 +67,16 @@ public static void reloadRecipeFiles() {
         }
     }
 
-    public static void reloadRecipes() {
+    public static void reloadRecipesManager() {
+        resetRecipes();
+        reloadRecipeFiles();
         reloadCraftorithmRecipes();
         reloadOtherPluginsRecipes();
         reloadRemovedRecipes();
         reloadServerRecipeMap();
     }
 
     public static void reloadCraftorithmRecipes() {
-        resetRecipes();
         for (String fileName : recipeConfigWrapperMap.keySet()) {
             try {
                 YamlConfigWrapper configWrapper = recipeConfigWrapperMap.get(fileName);
@@ -132,6 +133,7 @@ private static void reloadOtherPluginsRecipes() {
     }
 
     private static void reloadRemovedRecipes() {
+        removedRecipeConfig.reloadConfig();
         List<String> removedRecipes = removedRecipeConfig.config().getStringList("recipes");
         if (Craftorithm.getInstance().getConfig().getBoolean("remove_all_vanilla_recipe", false)) {
             for (NamespacedKey key : serverRecipeList) {

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/util/LangUtil.java b/src/main/java/com/github/yufiriamazenta/craftorithm/util/LangUtil.java
@@ -51,7 +51,7 @@ public static void info(String msgKey) {
         sendLang(Bukkit.getConsoleSender(), msgKey);
     }
 
-    public static void reloadMsgConfig() {
+    public static void reloadLangConfig() {
         langConfigFile.reloadConfig();
     }