From dd8441079ece6997589a779d70c629390fc52330 Mon Sep 17 00:00:00 2001 From: wdfaESfaef <2622389575@qq.com> Date: Sat, 27 Apr 2024 16:18:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=BB=E9=80=A0=E9=85=8D=E6=96=B9=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generator/recipe/VanillaRecipesLoader.java | 18 ++++++++++++------ .../recipes/smithing/royal_anvil.json | 4 +++- .../recipes/smithing/royal_grindstone.json | 4 +++- .../recipes/smithing/royal_smithing_table.json | 4 +++- .../assets/anvilcraft/lang/en_ud.json | 7 ++++--- .../assets/anvilcraft/lang/en_us.json | 7 ++++--- .../recipes/smithing/royal_anvil.json | 4 +++- .../recipes/smithing/royal_grindstone.json | 4 +++- .../recipes/smithing/royal_smithing_table.json | 4 +++- 9 files changed, 38 insertions(+), 18 deletions(-) diff --git a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/VanillaRecipesLoader.java b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/VanillaRecipesLoader.java index 8a9c9ff4b..d4d922913 100644 --- a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/VanillaRecipesLoader.java +++ b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/VanillaRecipesLoader.java @@ -149,21 +149,27 @@ public static void init(RegistrateRecipeProvider provider) { .unlocks(AnvilCraftDatagen.hasItem(ModItems.AMETHYST_SWORD.asItem()), AnvilCraftDatagen.has(ModItems.AMETHYST_SWORD)) .save(provider, AnvilCraft.of("smithing/royal_steel_sword")); - SmithingTransformRecipeBuilder.smithing(Ingredient.of(), Ingredient.of(Items.GRINDSTONE), - Ingredient.of(ModBlocks.ROYAL_STEEL_BLOCK), RecipeCategory.TOOLS, ModBlocks.ROYAL_GRINDSTONE.asItem()) + SmithingTransformRecipeBuilder.smithing( + Ingredient.of(ModItems.ROYAL_STEEL_UPGRADE_SMITHING_TEMPLATE), Ingredient.of(Items.GRINDSTONE), + Ingredient.of(ModBlocks.ROYAL_STEEL_BLOCK), RecipeCategory.TOOLS, ModBlocks.ROYAL_GRINDSTONE.asItem() + ) .unlocks(AnvilCraftDatagen.hasItem(ModBlocks.ROYAL_STEEL_BLOCK.asItem()), AnvilCraftDatagen.has(ModBlocks.ROYAL_STEEL_BLOCK)) .unlocks(AnvilCraftDatagen.hasItem(Items.GRINDSTONE), AnvilCraftDatagen.has(Items.GRINDSTONE)) .save(provider, AnvilCraft.of("smithing/royal_grindstone")); - SmithingTransformRecipeBuilder.smithing(Ingredient.of(), Ingredient.of(Items.ANVIL), - Ingredient.of(ModBlocks.ROYAL_STEEL_BLOCK), RecipeCategory.TOOLS, ModBlocks.ROYAL_ANVIL.asItem()) + SmithingTransformRecipeBuilder.smithing( + Ingredient.of(ModItems.ROYAL_STEEL_UPGRADE_SMITHING_TEMPLATE), Ingredient.of(Items.ANVIL), + Ingredient.of(ModBlocks.ROYAL_STEEL_BLOCK), RecipeCategory.TOOLS, ModBlocks.ROYAL_ANVIL.asItem() + ) .unlocks(AnvilCraftDatagen.hasItem(ModBlocks.ROYAL_STEEL_BLOCK.asItem()), AnvilCraftDatagen.has(ModBlocks.ROYAL_STEEL_BLOCK)) .unlocks(AnvilCraftDatagen.hasItem(Items.ANVIL), AnvilCraftDatagen.has(Items.ANVIL)) .save(provider, AnvilCraft.of("smithing/royal_anvil")); - SmithingTransformRecipeBuilder.smithing(Ingredient.of(), Ingredient.of(Items.SMITHING_TABLE), + SmithingTransformRecipeBuilder.smithing( + Ingredient.of(ModItems.ROYAL_STEEL_UPGRADE_SMITHING_TEMPLATE), Ingredient.of(Items.SMITHING_TABLE), Ingredient.of(ModBlocks.ROYAL_STEEL_BLOCK), RecipeCategory.TOOLS, - ModBlocks.ROYAL_SMITHING_TABLE.asItem()) + ModBlocks.ROYAL_SMITHING_TABLE.asItem() + ) .unlocks(AnvilCraftDatagen.hasItem(ModBlocks.ROYAL_STEEL_BLOCK.asItem()), AnvilCraftDatagen.has(ModBlocks.ROYAL_STEEL_BLOCK)) .unlocks(AnvilCraftDatagen.hasItem(Items.SMITHING_TABLE), AnvilCraftDatagen.has(Items.SMITHING_TABLE)) diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/smithing/royal_anvil.json b/fabric/src/generated/resources/data/anvilcraft/recipes/smithing/royal_anvil.json index e5bb0a615..d846d987e 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/smithing/royal_anvil.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/smithing/royal_anvil.json @@ -9,5 +9,7 @@ "result": { "item": "anvilcraft:royal_anvil" }, - "template": [] + "template": { + "item": "anvilcraft:royal_steel_upgrade_smithing_template" + } } \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/smithing/royal_grindstone.json b/fabric/src/generated/resources/data/anvilcraft/recipes/smithing/royal_grindstone.json index aa28aab4b..16438fb15 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/smithing/royal_grindstone.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/smithing/royal_grindstone.json @@ -9,5 +9,7 @@ "result": { "item": "anvilcraft:royal_grindstone" }, - "template": [] + "template": { + "item": "anvilcraft:royal_steel_upgrade_smithing_template" + } } \ No newline at end of file diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/smithing/royal_smithing_table.json b/fabric/src/generated/resources/data/anvilcraft/recipes/smithing/royal_smithing_table.json index 9516922ce..985c8c1b2 100644 --- a/fabric/src/generated/resources/data/anvilcraft/recipes/smithing/royal_smithing_table.json +++ b/fabric/src/generated/resources/data/anvilcraft/recipes/smithing/royal_smithing_table.json @@ -9,5 +9,7 @@ "result": { "item": "anvilcraft:royal_smithing_table" }, - "template": [] + "template": { + "item": "anvilcraft:royal_steel_upgrade_smithing_template" + } } \ No newline at end of file diff --git a/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json index 044123fee..f8581ff85 100644 --- a/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json +++ b/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json @@ -83,6 +83,7 @@ "item.anvilcraft.prismarine_cluster": "ɹǝʇsnןƆ ǝuıɹɐɯsıɹԀ", "item.anvilcraft.pulp": "dןnԀ", "item.anvilcraft.resin": "uısǝᴚ", + "item.anvilcraft.royal_anvil_hammer": "ɹǝɯɯɐH ןıʌuⱯ ןɐʎoᴚ", "item.anvilcraft.royal_steel_axe": "ǝxⱯ ןǝǝʇS ןɐʎoᴚ", "item.anvilcraft.royal_steel_hoe": "ǝoH ןǝǝʇS ןɐʎoᴚ", "item.anvilcraft.royal_steel_ingot": "ʇobuI ןǝǝʇS ןɐʎoᴚ", @@ -125,9 +126,9 @@ "screen.anvilcraft.royal_grindstone.title": "ʇsoɔ ɹıɐdǝɹ puɐ ǝsɹnɔ ǝʌoɯǝᴚ", "screen.anvilcraft.royal_steel_upgrade_smithing_template": "ǝʇɐןdɯǝ⟘ buıɥʇıɯS ǝpɐɹbd∩ ןǝǝʇS ןɐʎoᴚ", "screen.anvilcraft.slot.disable.tooltip": "ɹǝʇןıɟ ʇǝs oʇ sʞɔıןɔ ɯǝʇı ǝs∩", - "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.additions_slot_description": "ʇobuI ןǝǝʇS ןɐʎoᴚ ǝɥʇ ʇnԀ", - "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "ǝxɐʞɔıԀ puoɯɐıᗡ ǝxɐʞɔıԀ uoɹI ǝxɐʞɔıԀ uǝpןo⅁ ǝxɐʞɔıԀ ʇsʎɥʇǝɯⱯ", - "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.base_slot_description": "ǝxɐʞɔıd ǝɥʇ ʇnԀ", + "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.additions_slot_description": "ʞɔoןᗺ ןǝǝʇS ןɐʎoᴚ ɹo ʇobuI ןǝǝʇS ןɐʎoᴚ ǝɥʇ ʇnԀ", + "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "ǝxɐʞɔıԀ puoɯɐıᗡ 'ǝxɐʞɔıԀ uoɹI 'ǝxɐʞɔıԀ uǝpןo⅁ 'ǝxɐʞɔıԀ ʇsʎɥʇǝɯⱯ 'ɹǝɯɯɐH ןıʌuⱯ", + "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.base_slot_description": " ʇnԀ", "text.autoconfig.anvilcraft.option.anvilEfficiency": "ʎɔuǝıɔıɟɟƎ ןıʌuⱯ", "text.autoconfig.anvilcraft.option.anvilEfficiency.@Tooltip": "ǝɯıʇ ǝɯɐs ǝɥʇ ʇɐ ןıʌuɐ ǝɥʇ ʎq pǝssǝɔoɹd sɯǝʇı ɟo ɹǝqɯnu ɯnɯıxɐW", "text.autoconfig.anvilcraft.option.autoCrafterCooldown": "uʍopןooƆ ɹǝʇɟɐɹƆ oʇnⱯ", diff --git a/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json b/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json index eea36c8bc..855443516 100644 --- a/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json +++ b/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json @@ -83,6 +83,7 @@ "item.anvilcraft.prismarine_cluster": "Prismarine Cluster", "item.anvilcraft.pulp": "Pulp", "item.anvilcraft.resin": "Resin", + "item.anvilcraft.royal_anvil_hammer": "Royal Anvil Hammer", "item.anvilcraft.royal_steel_axe": "Royal Steel Axe", "item.anvilcraft.royal_steel_hoe": "Royal Steel Hoe", "item.anvilcraft.royal_steel_ingot": "Royal Steel Ingot", @@ -125,9 +126,9 @@ "screen.anvilcraft.royal_grindstone.title": "Remove curse and repair cost", "screen.anvilcraft.royal_steel_upgrade_smithing_template": "Royal Steel Upgrade Smithing Template", "screen.anvilcraft.slot.disable.tooltip": "Use item clicks to set filter", - "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.additions_slot_description": "Put the Royal Steel Ingot", - "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "Amethyst Pickaxe Golden Pickaxe Iron Pickaxe Diamond Pickaxe", - "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.base_slot_description": "Put the pickaxe", + "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.additions_slot_description": "Put the Royal Steel Ingot or Royal Steel Block", + "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.applies_to": "Anvil Hammer, Amethyst Pickaxe, Golden Pickaxe, Iron Pickaxe, Diamond Pickaxe", + "screen.anvilcraft.smithing_template.royal_steel_upgrade_smithing_template.base_slot_description": "Put ", "text.autoconfig.anvilcraft.option.anvilEfficiency": "Anvil Efficiency", "text.autoconfig.anvilcraft.option.anvilEfficiency.@Tooltip": "Maximum number of items processed by the anvil at the same time", "text.autoconfig.anvilcraft.option.autoCrafterCooldown": "Auto Crafter Cooldown", diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/smithing/royal_anvil.json b/forge/src/generated/resources/data/anvilcraft/recipes/smithing/royal_anvil.json index e5bb0a615..d846d987e 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/smithing/royal_anvil.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/smithing/royal_anvil.json @@ -9,5 +9,7 @@ "result": { "item": "anvilcraft:royal_anvil" }, - "template": [] + "template": { + "item": "anvilcraft:royal_steel_upgrade_smithing_template" + } } \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/smithing/royal_grindstone.json b/forge/src/generated/resources/data/anvilcraft/recipes/smithing/royal_grindstone.json index aa28aab4b..16438fb15 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/smithing/royal_grindstone.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/smithing/royal_grindstone.json @@ -9,5 +9,7 @@ "result": { "item": "anvilcraft:royal_grindstone" }, - "template": [] + "template": { + "item": "anvilcraft:royal_steel_upgrade_smithing_template" + } } \ No newline at end of file diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/smithing/royal_smithing_table.json b/forge/src/generated/resources/data/anvilcraft/recipes/smithing/royal_smithing_table.json index 9516922ce..985c8c1b2 100644 --- a/forge/src/generated/resources/data/anvilcraft/recipes/smithing/royal_smithing_table.json +++ b/forge/src/generated/resources/data/anvilcraft/recipes/smithing/royal_smithing_table.json @@ -9,5 +9,7 @@ "result": { "item": "anvilcraft:royal_smithing_table" }, - "template": [] + "template": { + "item": "anvilcraft:royal_steel_upgrade_smithing_template" + } } \ No newline at end of file