优化代码结构及多语言模块功能,为无序配方类型的配方展示做准备

YufiriaMazenta · YufiriaMazenta · commit d9e179105fc2 · 2025-05-15T14:35:30.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -36,7 +36,9 @@ dependencies {
     compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
     compileOnly("pers.neige.neigeitems:NeigeItems:1.15.113")
     compileOnly("net.kyori:adventure-api:4.14.0")
-    compileOnly("com.github.MilkBowl:VaultAPI:1.7.1")
+    compileOnly("com.github.MilkBowl:VaultAPI:1.7") {
+        exclude("org.bukkit", "bukkit")
+    }
     compileOnly("org.black_ixx:playerpoints:3.2.5")
     compileOnly("net.luckperms:api:5.4")
     compileOnly("me.clip:placeholderapi:2.11.6")
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-crypticlibVer=1.12.3.3
+crypticlibVer=1.13.1.1
diff --git a/src/main/java/pers/yufiria/craftorithm/command/recipe/DisplayRecipeCommand.java b/src/main/java/pers/yufiria/craftorithm/command/recipe/DisplayRecipeCommand.java
@@ -24,8 +24,8 @@
 import pers.yufiria.craftorithm.recipe.RecipeTypeMap;
 import pers.yufiria.craftorithm.recipe.SimpleRecipeTypes;
 import pers.yufiria.craftorithm.recipe.extra.AnvilRecipe;
-import pers.yufiria.craftorithm.ui.anvil.AnvilDisplayMenuManager;
-import pers.yufiria.craftorithm.ui.vanillaShaped.VanillaShapedDisplayMenuManager;
+import pers.yufiria.craftorithm.ui.display.anvil.AnvilDisplayMenuManager;
+import pers.yufiria.craftorithm.ui.display.vanillaShaped.VanillaShapedDisplayMenuManager;
 import pers.yufiria.craftorithm.util.CommandUtils;
 import pers.yufiria.craftorithm.util.LangUtils;
 
diff --git a/src/main/java/pers/yufiria/craftorithm/config/Languages.java b/src/main/java/pers/yufiria/craftorithm/config/Languages.java
@@ -33,11 +33,12 @@ public class Languages {
     public static final StringLangEntry COMMAND_CREATE_UNSUPPORTED_RECIPE_NAME = new StringLangEntry("command.create.unsupported_recipe_name");
     public static final StringLangEntry COMMAND_CREATE_NAME_USED = new StringLangEntry("command.create.name_used");
     public static final StringLangEntry COMMAND_DISPLAY_UNSUPPORTED_RECIPE_TYPE = new StringLangEntry("command.display.unsupported_recipe_type");
-    public static final StringLangEntry LOAD_FINISH = new StringLangEntry("load.finish");
-    public static final StringLangEntry LOAD_RECIPE_LOAD_EXCEPTION = new StringLangEntry("load.recipe_load_exception");
-    public static final StringLangEntry LOAD_ITEM_LOAD_EXCEPTION = new StringLangEntry("load.item_load_exception");
-    public static final StringLangEntry LOAD_HOOK_PLUGIN_SUCCESS = new StringLangEntry("load.hook_plugin.success");
-    public static final StringLangEntry LOAD_HOOK_PLUGIN_NOT_EXIST = new StringLangEntry("load.hook_plugin.not_exist");
+
+    public static final StringLangEntry LOAD_FINISH = new StringLangEntry("load_finish");
+    public static final StringLangEntry RECIPE_LOAD_EXCEPTION = new StringLangEntry("recipe_load_exception");
+    public static final StringLangEntry ITEM_LOAD_EXCEPTION = new StringLangEntry("item_load_exception");
+    public static final StringLangEntry LOAD_HOOK_PLUGIN_SUCCESS = new StringLangEntry("hook_plugin_success");
+
     public static final StringLangEntry RECIPE_TYPE_NAME_VANILLA_SHAPED = new StringLangEntry("recipe_type_name.vanilla_shaped");
     public static final StringLangEntry RECIPE_TYPE_NAME_VANILLA_SHAPELESS = new StringLangEntry("recipe_type_name.vanilla_shapeless");
     public static final StringLangEntry RECIPE_TYPE_NAME_VANILLA_SMELTING_FURNACE = new StringLangEntry("recipe_type_name.vanilla_smelting_furnace");
@@ -48,7 +49,7 @@ public class Languages {
     public static final StringLangEntry RECIPE_TYPE_NAME_VANILLA_STONECUTTING = new StringLangEntry("recipe_type_name.vanilla_stonecutting");
     public static final StringLangEntry RECIPE_TYPE_NAME_VANILLA_BREWING = new StringLangEntry("recipe_type_name.vanilla_brewing");
     public static final StringLangEntry RECIPE_TYPE_NAME_ANVIL = new StringLangEntry("recipe_type_name.anvil");
-    public static final StringLangEntry MENU_RECIPE_CREATOR = new StringLangEntry("menu.recipe_creator");
-    public static final StringLangEntry MENU_RECIPE_DISPLAY_ANVIL_COST_LEVEL = new StringLangEntry("menu.recipe_display.anvil.cost_level");
+    public static final StringLangEntry MENU_RECIPE_CREATOR_NAME = new StringLangEntry("menu.recipe_creator_name");
+
 
 }
diff --git a/src/main/java/pers/yufiria/craftorithm/item/impl/CraftorithmItemProvider.java b/src/main/java/pers/yufiria/craftorithm/item/impl/CraftorithmItemProvider.java
@@ -112,7 +112,7 @@ private void loadItems() {
                     }
                     itemMap.put(namespace + ":" + itemKey, item);
                 } catch (Exception e) {
-                    LangUtils.info(Languages.LOAD_ITEM_LOAD_EXCEPTION, CollectionsUtils.newStringHashMap("<item_name>", itemKey));
+                    LangUtils.info(Languages.ITEM_LOAD_EXCEPTION, CollectionsUtils.newStringHashMap("<item_name>", itemKey));
                     e.printStackTrace();
                 }
             }
diff --git a/src/main/java/pers/yufiria/craftorithm/recipe/RecipeManager.java b/src/main/java/pers/yufiria/craftorithm/recipe/RecipeManager.java
@@ -407,7 +407,7 @@ public void loadRecipes(List<File> files) {
                         recipeNum ++;
                     }
                 } catch (Throwable throwable) {
-                    LangUtils.info(Languages.LOAD_RECIPE_LOAD_EXCEPTION, CollectionsUtils.newStringHashMap("<recipe_name>", recipeName));
+                    LangUtils.info(Languages.RECIPE_LOAD_EXCEPTION, CollectionsUtils.newStringHashMap("<recipe_name>", recipeName));
                     throwable.printStackTrace();
                 }
             }
diff --git a/src/main/java/pers/yufiria/craftorithm/ui/display/anvil/AnvilAdditionIcon.java b/src/main/java/pers/yufiria/craftorithm/ui/display/anvil/AnvilAdditionIcon.java
@@ -1,4 +1,4 @@
-package pers.yufiria.craftorithm.ui.anvil;
+package pers.yufiria.craftorithm.ui.display.anvil;
 
 import pers.yufiria.craftorithm.ui.icon.ItemDisplayIcon;
 
diff --git a/src/main/java/pers/yufiria/craftorithm/ui/display/anvil/AnvilBaseIcon.java b/src/main/java/pers/yufiria/craftorithm/ui/display/anvil/AnvilBaseIcon.java
@@ -1,4 +1,4 @@
-package pers.yufiria.craftorithm.ui.anvil;
+package pers.yufiria.craftorithm.ui.display.anvil;
 
 import pers.yufiria.craftorithm.ui.icon.ItemDisplayIcon;
 
diff --git a/src/main/java/pers/yufiria/craftorithm/ui/display/anvil/AnvilDisplayIconParser.java b/src/main/java/pers/yufiria/craftorithm/ui/display/anvil/AnvilDisplayIconParser.java
@@ -1,4 +1,4 @@
-package pers.yufiria.craftorithm.ui.anvil;
+package pers.yufiria.craftorithm.ui.display.anvil;
 
 import crypticlib.ui.display.Icon;
 import org.bukkit.configuration.ConfigurationSection;
diff --git a/src/main/java/pers/yufiria/craftorithm/ui/display/anvil/AnvilDisplayMenu.java b/src/main/java/pers/yufiria/craftorithm/ui/display/anvil/AnvilDisplayMenu.java
@@ -1,4 +1,4 @@
-package pers.yufiria.craftorithm.ui.anvil;
+package pers.yufiria.craftorithm.ui.display.anvil;
 
 import crypticlib.chat.BukkitTextProcessor;
 import crypticlib.lang.LangManager;
diff --git a/src/main/java/pers/yufiria/craftorithm/ui/display/anvil/AnvilDisplayMenuManager.java b/src/main/java/pers/yufiria/craftorithm/ui/display/anvil/AnvilDisplayMenuManager.java
@@ -1,4 +1,4 @@
-package pers.yufiria.craftorithm.ui.anvil;
+package pers.yufiria.craftorithm.ui.display.anvil;
 
 import crypticlib.lifecycle.AutoTask;
 import crypticlib.lifecycle.BukkitLifeCycleTask;
diff --git a/src/main/java/pers/yufiria/craftorithm/ui/display/vanillaShaped/VanillaShapedDisplayIconParser.java b/src/main/java/pers/yufiria/craftorithm/ui/display/vanillaShaped/VanillaShapedDisplayIconParser.java
@@ -1,4 +1,4 @@
-package pers.yufiria.craftorithm.ui.vanillaShaped;
+package pers.yufiria.craftorithm.ui.display.vanillaShaped;
 
 import crypticlib.ui.display.Icon;
 import org.bukkit.configuration.ConfigurationSection;
diff --git a/src/main/java/pers/yufiria/craftorithm/ui/display/vanillaShaped/VanillaShapedDisplayMenu.java b/src/main/java/pers/yufiria/craftorithm/ui/display/vanillaShaped/VanillaShapedDisplayMenu.java
@@ -1,4 +1,4 @@
-package pers.yufiria.craftorithm.ui.vanillaShaped;
+package pers.yufiria.craftorithm.ui.display.vanillaShaped;
 
 import crypticlib.chat.BukkitTextProcessor;
 import crypticlib.lang.LangManager;
diff --git a/src/main/java/pers/yufiria/craftorithm/ui/display/vanillaShaped/VanillaShapedDisplayMenuManager.java b/src/main/java/pers/yufiria/craftorithm/ui/display/vanillaShaped/VanillaShapedDisplayMenuManager.java
@@ -1,4 +1,4 @@
-package pers.yufiria.craftorithm.ui.vanillaShaped;
+package pers.yufiria.craftorithm.ui.display.vanillaShaped;
 
 import crypticlib.lifecycle.AutoTask;
 import crypticlib.lifecycle.BukkitLifeCycleTask;
diff --git a/src/main/java/pers/yufiria/craftorithm/ui/display/vanillaShaped/VanillaShapedIngredientIcon.java b/src/main/java/pers/yufiria/craftorithm/ui/display/vanillaShaped/VanillaShapedIngredientIcon.java
@@ -1,4 +1,4 @@
-package pers.yufiria.craftorithm.ui.vanillaShaped;
+package pers.yufiria.craftorithm.ui.display.vanillaShaped;
 
 import org.bukkit.inventory.ItemStack;
 import pers.yufiria.craftorithm.ui.icon.ItemDisplayIcon;
diff --git a/src/main/java/pers/yufiria/craftorithm/ui/display/vanillaShapeless/VanillaShapelessDisplayIconParser.java b/src/main/java/pers/yufiria/craftorithm/ui/display/vanillaShapeless/VanillaShapelessDisplayIconParser.java
@@ -0,0 +1,31 @@
+package pers.yufiria.craftorithm.ui.display.vanillaShapeless;
+
+import crypticlib.ui.display.Icon;
+import org.bukkit.configuration.ConfigurationSection;
+import pers.yufiria.craftorithm.ui.icon.IconParser;
+import pers.yufiria.craftorithm.ui.icon.RecipeResultIcon;
+
+import java.util.function.Supplier;
+
+public enum VanillaShapelessDisplayIconParser implements IconParser {
+
+    INSTANCE;
+
+    @Override
+    public Supplier<Icon> parse(ConfigurationSection config) {
+        String iconType = config.getString("icon_type", "common").toLowerCase();
+        switch (iconType) {
+            case "vanilla_shapeless_ingredient" -> {
+                int ingredientId = config.getInt("ingredient_slot", 0);
+                return () -> new VanillaShapelessIngredientIcon(ingredientId);
+            }
+            case "result" -> {
+                return RecipeResultIcon::new;
+            }
+            default -> {
+                return IconParser.super.parse(config);
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/pers/yufiria/craftorithm/ui/display/vanillaShapeless/VanillaShapelessDisplayMenu.java b/src/main/java/pers/yufiria/craftorithm/ui/display/vanillaShapeless/VanillaShapelessDisplayMenu.java
@@ -0,0 +1,46 @@
+package pers.yufiria.craftorithm.ui.display.vanillaShapeless;
+
+import crypticlib.chat.BukkitTextProcessor;
+import crypticlib.lang.LangManager;
+import crypticlib.ui.display.Icon;
+import crypticlib.ui.display.MenuDisplay;
+import crypticlib.ui.menu.Menu;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ShapelessRecipe;
+import org.jetbrains.annotations.NotNull;
+import pers.yufiria.craftorithm.ui.icon.RecipeResultIcon;
+
+public class VanillaShapelessDisplayMenu extends Menu {
+
+    private final ShapelessRecipe recipe;
+
+    public VanillaShapelessDisplayMenu(@NotNull Player player, @NotNull MenuDisplay display, ShapelessRecipe recipe) {
+        super(player, display);
+        this.recipe = recipe;
+    }
+
+    @Override
+    public String parsedMenuTitle() {
+        String originTitle = this.display.title();
+        Player player = this.player();
+        String title = LangManager.INSTANCE.replaceLang(originTitle, player);
+        return BukkitTextProcessor.color(BukkitTextProcessor.placeholder(player, title));
+    }
+
+    @Override
+    public void preprocessIconWhenUpdateLayout(Integer slot, @NotNull Icon icon) {
+        switch (icon) {
+            case VanillaShapelessIngredientIcon vanillaShapelessIngredientIcon -> {
+                int ingredientSlot = vanillaShapelessIngredientIcon.ingredientSlot();
+//
+//                if (recipeChoice == null) return;
+//                vanillaShapelessIngredientIcon.setDisplayItem(recipeChoice.getItemStack());
+            }
+            case RecipeResultIcon recipeResultIcon -> {
+                recipeResultIcon.setDisplayItem(recipe.getResult());
+            }
+            default -> {}
+        }
+    }
+
+}
diff --git a/src/main/java/pers/yufiria/craftorithm/ui/display/vanillaShapeless/VanillaShapelessIngredientIcon.java b/src/main/java/pers/yufiria/craftorithm/ui/display/vanillaShapeless/VanillaShapelessIngredientIcon.java
@@ -0,0 +1,25 @@
+package pers.yufiria.craftorithm.ui.display.vanillaShapeless;
+
+import org.bukkit.inventory.ItemStack;
+import pers.yufiria.craftorithm.ui.icon.ItemDisplayIcon;
+
+public class VanillaShapelessIngredientIcon extends ItemDisplayIcon {
+
+    private final Integer ingredientSlot;
+
+    public VanillaShapelessIngredientIcon(int ingredientSlot) {
+        this.ingredientSlot = ingredientSlot;
+    }
+
+    public Integer ingredientSlot() {
+        return ingredientSlot;
+    }
+
+    @Override
+    public ItemStack display() {
+        ItemStack display = super.display();
+        display.setAmount(1);
+        return display;
+    }
+
+}
diff --git a/src/main/java/pers/yufiria/craftorithm/ui/vanillaShapeless/VanillaShapelessDisplayMenu.java b/src/main/java/pers/yufiria/craftorithm/ui/vanillaShapeless/VanillaShapelessDisplayMenu.java
diff --git a/src/main/resources/lang/zh_cn.yml b/src/main/resources/lang/zh_cn.yml
@@ -36,13 +36,7 @@ command:
     unsupported_recipe_type: '<prefix> &c不支持的配方类型'
     unsupported_recipe_name: '<prefix> &c不支持的配方名字，只允许使用小写英文字母、数字、"_"、"-"和"."。'
     name_used: '<prefix> &c配方ID已经被使用'
-    null_result: '<prefix> &c配方结果不允许为空！'
-    null_source: '<prefix> &c配方原料不允许为空！'
     success: '<prefix> &a<recipe_type>类型配方<recipe_name>创建成功'
-  run_arcenciel:
-    success: '<prefix> &a运行成功，耗时<time>ms'
-  list:
-    unsupported_version: '<prefix> &c此功能只在1.16及以上版本可用'
 recipe_type_name:
   vanilla_shaped: 有序配方
   vanilla_shapeless: 无序配方
@@ -55,15 +49,13 @@ recipe_type_name:
   vanilla_brewing: 酿造配方
   anvil: 铁砧配方
 #插件加载的反馈信息
-load:
-  finish: '<prefix> &a插件加载完毕'
-  recipe_load_exception: '<prefix> &c加载配方<recipe_name>时出现错误'
-  item_load_exception: '<prefix> &c加载物品<item_name>时出现错误'
-  hook_plugin:
-    success: '<prefix> &a发现<plugin>，已挂钩'
-    not_exist: '<prefix> &c未发现<plugin>'
+load_finish: '<prefix> &a插件加载完毕'
+recipe_load_exception: '<prefix> &c加载配方<recipe_name>时出现错误'
+item_load_exception: '<prefix> &c加载物品<item_name>时出现错误'
+hook_plugin_success: '<prefix> &a发现<plugin>，已挂钩'
 menu:
-  recipe_creator: '创建器'
-  recipe_display:
-    anvil:
-      cost_level: '&3所需经验: &a<level>'
+  recipe_creator:
+    name: '创建器'
+    null_result: '<prefix> &c配方结果不允许为空！'
+    null_source: '<prefix> &c配方原料不允许为空！'
+custom_lang: 测试
diff --git a/src/main/resources/menus/display/vanilla_shapeless.yml b/src/main/resources/menus/display/vanilla_shapeless.yml
@@ -0,0 +1,40 @@
+title: <translate:lang:recipe_type_name.vanilla_shapeless>
+layout:
+  - '#########'
+  - '#ABC#####'
+  - '#DEF###R#'
+  - '#GHI#####'
+  - '#########'
+icons:
+  '#':
+    material: minecraft:green_stained_glass_pane
+    name: '&a<translate:lang:recipe_type_name.vanilla_shapeless>'
+  A:
+    icon_type: vanilla_shapeless_ingredient
+    ingredient_slot: 0
+  B:
+    icon_type: vanilla_shapeless_ingredient
+    ingredient_slot: 1
+  C:
+    icon_type: vanilla_shapeless_ingredient
+    ingredient_slot: 2
+  D:
+    icon_type: vanilla_shapeless_ingredient
+    ingredient_slot: 3
+  E:
+    icon_type: vanilla_shapeless_ingredient
+    ingredient_slot: 4
+  F:
+    icon_type: vanilla_shapeless_ingredient
+    ingredient_slot: 5
+  G:
+    icon_type: vanilla_shapeless_ingredient
+    ingredient_slot: 6
+  H:
+    icon_type: vanilla_shapeless_ingredient
+    ingredient_slot: 7
+  I:
+    icon_type: vanilla_shapeless_ingredient
+    ingredient_slot: 8
+  R:
+    icon_type: result

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-crypticlibVer=1.12.3.3`
	`1`	`+crypticlibVer=1.13.1.1`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ private void loadItems() {`
`112`	`112`	`}`
`113`	`113`	`itemMap.put(namespace + ":" + itemKey, item);`
`114`	`114`	`} catch (Exception e) {`
`115`		`- LangUtils.info(Languages.LOAD_ITEM_LOAD_EXCEPTION, CollectionsUtils.newStringHashMap("<item_name>", itemKey));`
	`115`	`+ LangUtils.info(Languages.ITEM_LOAD_EXCEPTION, CollectionsUtils.newStringHashMap("<item_name>", itemKey));`
`116`	`116`	`e.printStackTrace();`
`117`	`117`	`}`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ public void loadRecipes(List<File> files) {`
`407`	`407`	`recipeNum ++;`
`408`	`408`	`}`
`409`	`409`	`} catch (Throwable throwable) {`
`410`		`- LangUtils.info(Languages.LOAD_RECIPE_LOAD_EXCEPTION, CollectionsUtils.newStringHashMap("<recipe_name>", recipeName));`
	`410`	`+ LangUtils.info(Languages.RECIPE_LOAD_EXCEPTION, CollectionsUtils.newStringHashMap("<recipe_name>", recipeName));`
`411`	`411`	`throwable.printStackTrace();`
`412`	`412`	`}`
`413`	`413`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package pers.yufiria.craftorithm.ui.anvil;`
	`1`	`+package pers.yufiria.craftorithm.ui.display.anvil;`
`2`	`2`
`3`	`3`	`import pers.yufiria.craftorithm.ui.icon.ItemDisplayIcon;`
`4`	`4`