[1.10.0]1.10.0 Update

YufiriaMazenta · Jun 15, 2024 · 3492ec7 · 3492ec7
1 parent 9da83ea
commit 3492ec7
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 import java.text.SimpleDateFormat
-version = "1.10.0-dev1"
+version = "1.10.0"
 
 plugins {
     `java-library`

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/AnvilRecipeCreator.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/AnvilRecipeCreator.java
@@ -48,7 +48,7 @@ public AnvilRecipeCreator(@NotNull Player player, @NotNull String recipeName) {
                     "#***#%%%#",
                     "# * A% %#",
                     "#***#%%%#",
-                    "####B####"
+                    "#########"
                 ), () -> {
                     Map<Character, Icon> layoutMap = new HashMap<>();
                     layoutMap.put('#', getFrameIcon());

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/SmithingRecipeCreator.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/SmithingRecipeCreator.java
@@ -35,7 +35,7 @@ public SmithingRecipeCreator(@NotNull Player player, @NotNull String recipeName)
                     () -> Arrays.asList(
                         "####F####",
                         "#***#%%%#",
-                        "# * A% %#",
+                        "#   A% %#",
                         "#***#%%%#",
                         "####B####"
                     ),

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java b/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java
@@ -10,6 +10,7 @@
 import com.github.yufiriamazenta.craftorithm.recipe.registry.RecipeRegistry;
 import com.github.yufiriamazenta.craftorithm.util.CollectionsUtil;
 import com.github.yufiriamazenta.craftorithm.util.LangUtil;
+import com.github.yufiriamazenta.craftorithm.util.RecipeUtil;
 import crypticlib.CrypticLib;
 import crypticlib.chat.MsgSender;
 import crypticlib.config.ConfigWrapper;
@@ -65,17 +66,17 @@ public enum RecipeManager {
         serverRecipesCache = new ConcurrentHashMap<>();
 
         //设置各类型配方的注册方法
-        recipeRegisterMap.put(RecipeType.SHAPED, Bukkit::addRecipe);
+        recipeRegisterMap.put(RecipeType.SHAPED, RecipeUtil::regRecipe);
         recipeRemoverMap.put(RecipeType.SHAPED, this::removeRecipes);
-        recipeRegisterMap.put(RecipeType.SHAPELESS, Bukkit::addRecipe);
+        recipeRegisterMap.put(RecipeType.SHAPELESS, RecipeUtil::regRecipe);
         recipeRemoverMap.put(RecipeType.SHAPELESS, this::removeRecipes);
-        recipeRegisterMap.put(RecipeType.COOKING, Bukkit::addRecipe);
+        recipeRegisterMap.put(RecipeType.COOKING, RecipeUtil::regRecipe);
         recipeRemoverMap.put(RecipeType.COOKING, this::removeRecipes);
-        recipeRegisterMap.put(RecipeType.STONE_CUTTING, Bukkit::addRecipe);
+        recipeRegisterMap.put(RecipeType.STONE_CUTTING, RecipeUtil::regRecipe);
         recipeRemoverMap.put(RecipeType.STONE_CUTTING, this::removeRecipes);
-        recipeRegisterMap.put(RecipeType.SMITHING, Bukkit::addRecipe);
+        recipeRegisterMap.put(RecipeType.SMITHING, RecipeUtil::regRecipe);
         recipeRemoverMap.put(RecipeType.SMITHING, this::removeRecipes);
-        recipeRegisterMap.put(RecipeType.RANDOM_COOKING, Bukkit::addRecipe);
+        recipeRegisterMap.put(RecipeType.RANDOM_COOKING, RecipeUtil::regRecipe);
         recipeRemoverMap.put(RecipeType.RANDOM_COOKING, this::removeRecipes);
 
         if (PluginConfigs.ENABLE_ANVIL_RECIPE.value()) {

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/util/RecipeUtil.java b/src/main/java/com/github/yufiriamazenta/craftorithm/util/RecipeUtil.java
@@ -0,0 +1,20 @@
+package com.github.yufiriamazenta.craftorithm.util;
+
+import crypticlib.CrypticLib;
+import crypticlib.platform.IPlatform;
+import org.bukkit.Bukkit;
+import org.bukkit.inventory.Recipe;
+
+public class RecipeUtil {
+
+    public static void regRecipe(Recipe recipe) {
+        if (CrypticLib.platform().platform().equals(IPlatform.Platform.BUKKIT)) {
+            //当不是Paper端时，使用Bukkit的注册方法
+            Bukkit.addRecipe(recipe);
+        } else {
+            //当是Paper及其衍生端时，使用会刷新配方的方法注册
+            Bukkit.addRecipe(recipe, true);
+        }
+    }
+
+}