diff --git a/build.gradle.kts b/build.gradle.kts index 407ce182..1f0bcd75 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ import java.text.SimpleDateFormat -version = "1.6.0-beta1" +version = "1.6.0-beta2" plugins { `java-library` diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/config/Languages.java b/src/main/java/com/github/yufiriamazenta/craftorithm/config/Languages.java index 03a71dbe..00895482 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/config/Languages.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/config/Languages.java @@ -51,6 +51,7 @@ public class Languages { public static final StringConfigEntry MENU_RECIPE_DISPLAY_TITLE_SMITHING = new StringConfigEntry("menu.recipe_display.title.smithing", "锻造配方"); public static final StringConfigEntry MENU_RECIPE_DISPLAY_TITLE_STONE_CUTTING = new StringConfigEntry("menu.recipe_display.title.stone_cutting", "切石配方"); public static final StringConfigEntry MENU_RECIPE_DISPLAY_TITLE_POTION = new StringConfigEntry("menu.recipe_display.title.potion", "酿造配方"); + public static final StringConfigEntry MENU_RECIPE_DISPLAY_TITLE_ANVIL = new StringConfigEntry("menu.recipe_display.title.anvil", "铁砧配方"); public static final StringConfigEntry MENU_RECIPE_CREATOR_TITLE = new StringConfigEntry("menu.recipe_creator.title", "&3创建配方: "); public static final StringConfigEntry MENU_RECIPE_CREATOR_ICON_FRAME = new StringConfigEntry("menu.recipe_creator.icon.frame", "&a创建配方"); public static final StringConfigEntry MENU_RECIPE_CREATOR_ICON_RESULT_FRAME = new StringConfigEntry("menu.recipe_creator.icon.result_frame", "&a配方结果"); diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/impl/recipe/RecipeDisplayMenuHolder.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/impl/recipe/RecipeDisplayMenuHolder.java index dfb9c60a..53388bbb 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/impl/recipe/RecipeDisplayMenuHolder.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/impl/recipe/RecipeDisplayMenuHolder.java @@ -6,6 +6,7 @@ import com.github.yufiriamazenta.craftorithm.menu.bukkit.ItemDisplayIcon; import com.github.yufiriamazenta.craftorithm.recipe.RecipeManager; import com.github.yufiriamazenta.craftorithm.recipe.RecipeType; +import com.github.yufiriamazenta.craftorithm.recipe.custom.AnvilRecipe; import com.github.yufiriamazenta.craftorithm.recipe.custom.PotionMixRecipe; import crypticlib.CrypticLib; import crypticlib.util.TextUtil; @@ -81,6 +82,11 @@ else if (recipe instanceof SmokingRecipe) { inventoryType = InventoryType.BREWING; invTitle = Languages.MENU_RECIPE_DISPLAY_TITLE_POTION.value(); break; + case ANVIL: + setAnvilRecipeMenu(); + inventoryType = InventoryType.ANVIL; + invTitle = Languages.MENU_RECIPE_DISPLAY_TITLE_ANVIL.value(); + break; default: invTitle = "Unknown Type"; inventoryType = InventoryType.CHEST; @@ -182,6 +188,18 @@ private void setPotionMixRecipeMenu() { } + private void setAnvilRecipeMenu() { + AnvilRecipe anvilRecipe = (AnvilRecipe) recipe; + ItemStack base = anvilRecipe.base(); + ItemStack addition = anvilRecipe.addition(); + ItemStack result = anvilRecipe.getResult(); + menuIconMap().put(0, ItemDisplayIcon.icon(base)); + menuIconMap().put(1, ItemDisplayIcon.icon(addition)); + menuIconMap().put(2, ItemDisplayIcon.icon(result)); + } + + + @Override public BukkitMenuHandler parentMenu() { return parentMenu; diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java b/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java index fe34988a..d948fcf4 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java @@ -372,6 +372,8 @@ else if (recipe instanceof StonecuttingRecipe) return RecipeType.STONE_CUTTING; else if (recipe instanceof PotionMixRecipe) return RecipeType.POTION; + else if (recipe instanceof AnvilRecipe) + return RecipeType.ANVIL; else return RecipeType.UNKNOWN; } diff --git a/src/main/resources/lang.yml b/src/main/resources/lang.yml index c88b4abf..c5252e06 100644 --- a/src/main/resources/lang.yml +++ b/src/main/resources/lang.yml @@ -63,6 +63,7 @@ menu: smithing: 锻造配方 stone_cutting: 切石配方 potion: 酿造配方 + anvil: 铁砧配方 recipe_creator: title: '&3创建配方: ' icon: