diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 03d96cdc3..872df46cc 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.21.1 2025-06-14T11:22:09.7701308 Recipes +// 1.21.1 2025-06-14T14:38:08.3653122 Recipes 9775e550332c69f1ee2ac4a09834a35db6f6a2ed data/minecraft/recipe/ammo_box_add_ammo.json 9775e550332c69f1ee2ac4a09834a35db6f6a2ed data/minecraft/recipe/ammo_box_extract_ammo.json 2e1d1bbf32801f3d355c0d3f78ebbb1122cebd4c data/minecraft/recipe/potion_mortar_shell.json @@ -79,6 +79,10 @@ db50b385f5bd6239b720fc2519f5667ece7b8cd5 data/superbwarfare/advancement/recipes/ 1e770e3d6c899bc0fd9805be81a1900fe6f3e322 data/superbwarfare/advancement/recipes/misc/m_79_blueprint.json ab91251a4ad27c9153eec06d6a781aa59fc61785 data/superbwarfare/advancement/recipes/misc/m_870_blueprint.json dd88128230882947ff1f7e46ca413e571374cf88 data/superbwarfare/advancement/recipes/misc/m_98b_blueprint.json +140d1c9847fd1f6b1f30182be8717a8508430f7e data/superbwarfare/advancement/recipes/misc/netherite_action.json +5edd1a8ee225dbe39442c3d37ab97420ec59524c data/superbwarfare/advancement/recipes/misc/netherite_barrel.json +26a84fa86fe9debbe8a9a09904a2f4ad46957aca data/superbwarfare/advancement/recipes/misc/netherite_spring.json +5a92a015ae01117d99fa9c7e6a9b716e4f1b3472 data/superbwarfare/advancement/recipes/misc/netherite_trigger.json 46fc6cc865986b08322c48a583c5d26b148797e5 data/superbwarfare/advancement/recipes/misc/ntw_20_blueprint.json 358b34abec2942bed33a221b8897ff33daf0bbdb data/superbwarfare/advancement/recipes/misc/qbz_95_blueprint.json 1a60ccfaa5e95aaa2d75a5cf0f32dbc840d07d17 data/superbwarfare/advancement/recipes/misc/rare_material_pack.json @@ -163,6 +167,10 @@ a22cb7c546460b175643385a500b2af9d24c6cd7 data/superbwarfare/recipe/m_870_bluepri 9fed6cd8d1d6a6f2bcbf2811c1856084751ee5e4 data/superbwarfare/recipe/m_870_smithing.json 0a1c4303027bf22643302f7b325e4bffd1329ba2 data/superbwarfare/recipe/m_98b_blueprint.json 7e5143b5c465bfa269eaabcc986c9a394115bd4d data/superbwarfare/recipe/m_98b_smithing.json +9a3633b79de495923177fd790a1348c38f8050f9 data/superbwarfare/recipe/netherite_action.json +b62f7c2a7309696e4cd5f06de1b289b3e52758d3 data/superbwarfare/recipe/netherite_barrel.json +14f8a47719896d39061c02c4ef330ccc6a9a17e3 data/superbwarfare/recipe/netherite_spring.json +96dbc018274702cccb64c35a89e4217f6b8019fe data/superbwarfare/recipe/netherite_trigger.json 33560f69a554b45e66dd10b07e4c8f08c1647b43 data/superbwarfare/recipe/ntw_20_blueprint.json ff117c48405a73e49d29d737132d1c249b0fc3b5 data/superbwarfare/recipe/ntw_20_smithing.json f99ef54062417a7da9882662880469ec1c054d05 data/superbwarfare/recipe/qbz_95_blueprint.json diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/misc/netherite_action.json b/src/generated/resources/data/superbwarfare/advancement/recipes/misc/netherite_action.json new file mode 100644 index 000000000..2bbf8ce80 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/misc/netherite_action.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cemented_carbide_action": { + "conditions": { + "items": [ + { + "items": "superbwarfare:cemented_carbide_action" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_netherite_upgrade_smithing_template": { + "conditions": { + "items": [ + { + "items": "minecraft:netherite_upgrade_smithing_template" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:netherite_action" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_netherite_upgrade_smithing_template", + "has_cemented_carbide_action" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:netherite_action" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/misc/netherite_barrel.json b/src/generated/resources/data/superbwarfare/advancement/recipes/misc/netherite_barrel.json new file mode 100644 index 000000000..3a48b45cf --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/misc/netherite_barrel.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cemented_carbide_barrel": { + "conditions": { + "items": [ + { + "items": "superbwarfare:cemented_carbide_barrel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_netherite_upgrade_smithing_template": { + "conditions": { + "items": [ + { + "items": "minecraft:netherite_upgrade_smithing_template" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:netherite_barrel" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_netherite_upgrade_smithing_template", + "has_cemented_carbide_barrel" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:netherite_barrel" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/misc/netherite_spring.json b/src/generated/resources/data/superbwarfare/advancement/recipes/misc/netherite_spring.json new file mode 100644 index 000000000..08b168e0e --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/misc/netherite_spring.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cemented_carbide_spring": { + "conditions": { + "items": [ + { + "items": "superbwarfare:cemented_carbide_spring" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_netherite_upgrade_smithing_template": { + "conditions": { + "items": [ + { + "items": "minecraft:netherite_upgrade_smithing_template" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:netherite_spring" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_netherite_upgrade_smithing_template", + "has_cemented_carbide_spring" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:netherite_spring" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/misc/netherite_trigger.json b/src/generated/resources/data/superbwarfare/advancement/recipes/misc/netherite_trigger.json new file mode 100644 index 000000000..1ac131162 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/misc/netherite_trigger.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cemented_carbide_trigger": { + "conditions": { + "items": [ + { + "items": "superbwarfare:cemented_carbide_trigger" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_netherite_upgrade_smithing_template": { + "conditions": { + "items": [ + { + "items": "minecraft:netherite_upgrade_smithing_template" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:netherite_trigger" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_netherite_upgrade_smithing_template", + "has_cemented_carbide_trigger" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:netherite_trigger" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/netherite_action_crafting.json b/src/generated/resources/data/superbwarfare/recipe/netherite_action.json similarity index 95% rename from src/main/resources/data/superbwarfare/recipe/netherite_action_crafting.json rename to src/generated/resources/data/superbwarfare/recipe/netherite_action.json index d58b8cd58..7161299ca 100644 --- a/src/main/resources/data/superbwarfare/recipe/netherite_action_crafting.json +++ b/src/generated/resources/data/superbwarfare/recipe/netherite_action.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" + "addition": { + "item": "minecraft:netherite_ingot" }, "base": { "item": "superbwarfare:cemented_carbide_action" }, - "addition": { - "item": "minecraft:netherite_ingot" - }, "result": { + "count": 1, "id": "superbwarfare:netherite_action" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/netherite_barrel_smithing.json b/src/generated/resources/data/superbwarfare/recipe/netherite_barrel.json similarity index 95% rename from src/main/resources/data/superbwarfare/recipe/netherite_barrel_smithing.json rename to src/generated/resources/data/superbwarfare/recipe/netherite_barrel.json index 0b00193ab..4cce649c6 100644 --- a/src/main/resources/data/superbwarfare/recipe/netherite_barrel_smithing.json +++ b/src/generated/resources/data/superbwarfare/recipe/netherite_barrel.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" + "addition": { + "item": "minecraft:netherite_ingot" }, "base": { "item": "superbwarfare:cemented_carbide_barrel" }, - "addition": { - "item": "minecraft:netherite_ingot" - }, "result": { + "count": 1, "id": "superbwarfare:netherite_barrel" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/netherite_spring_crafting.json b/src/generated/resources/data/superbwarfare/recipe/netherite_spring.json similarity index 95% rename from src/main/resources/data/superbwarfare/recipe/netherite_spring_crafting.json rename to src/generated/resources/data/superbwarfare/recipe/netherite_spring.json index ffe6a23b9..709b326cb 100644 --- a/src/main/resources/data/superbwarfare/recipe/netherite_spring_crafting.json +++ b/src/generated/resources/data/superbwarfare/recipe/netherite_spring.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" + "addition": { + "item": "minecraft:netherite_ingot" }, "base": { "item": "superbwarfare:cemented_carbide_spring" }, - "addition": { - "item": "minecraft:netherite_ingot" - }, "result": { + "count": 1, "id": "superbwarfare:netherite_spring" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/netherite_trigger_crafting.json b/src/generated/resources/data/superbwarfare/recipe/netherite_trigger.json similarity index 95% rename from src/main/resources/data/superbwarfare/recipe/netherite_trigger_crafting.json rename to src/generated/resources/data/superbwarfare/recipe/netherite_trigger.json index e782020b5..6ec3bdb7c 100644 --- a/src/main/resources/data/superbwarfare/recipe/netherite_trigger_crafting.json +++ b/src/generated/resources/data/superbwarfare/recipe/netherite_trigger.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" + "addition": { + "item": "minecraft:netherite_ingot" }, "base": { "item": "superbwarfare:cemented_carbide_trigger" }, - "addition": { - "item": "minecraft:netherite_ingot" - }, "result": { + "count": 1, "id": "superbwarfare:netherite_trigger" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" } } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java index 65c3b5f81..43e47e1a4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java @@ -41,7 +41,7 @@ public class ModRecipeProvider extends RecipeProvider { generateMaterialRecipes(output, ModItems.IRON_MATERIALS, Items.IRON_INGOT); generateMaterialRecipes(output, ModItems.STEEL_MATERIALS, ModItems.STEEL_INGOT.get()); generateMaterialRecipes(output, ModItems.CEMENTED_CARBIDE_MATERIALS, ModItems.CEMENTED_CARBIDE_INGOT.get()); - // TODO 下界合金材料 + generateSmithingMaterialRecipe(output, ModItems.CEMENTED_CARBIDE_MATERIALS, ModItems.NETHERITE_MATERIALS, Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE, Items.NETHERITE_INGOT); // 材料包 generateMaterialPackRecipe(output, ModItems.IRON_MATERIALS, ModItems.COMMON_MATERIAL_PACK.get()); @@ -228,6 +228,52 @@ public class ModRecipeProvider extends RecipeProvider { .save(output, Mod.loc(getItemName(material.trigger().get()))); } + public static void generateSmithingMaterialRecipe(@NotNull RecipeOutput output, ModItems.Materials material, ModItems.Materials result, Item template, Item ingredient) { + SmithingTransformRecipeBuilder.smithing( + Ingredient.of(template), + Ingredient.of(material.barrel().get()), + Ingredient.of(ingredient), + RecipeCategory.MISC, + result.barrel().get() + ) + .unlocks(getHasName(template), has(template)) + .unlocks(getHasName(material.barrel().get()), has(material.barrel().get())) + .save(output, Mod.loc(getItemName(result.barrel().get()))); + + SmithingTransformRecipeBuilder.smithing( + Ingredient.of(template), + Ingredient.of(material.action().get()), + Ingredient.of(ingredient), + RecipeCategory.MISC, + result.action().get() + ) + .unlocks(getHasName(template), has(template)) + .unlocks(getHasName(material.action().get()), has(material.action().get())) + .save(output, Mod.loc(getItemName(result.action().get()))); + + SmithingTransformRecipeBuilder.smithing( + Ingredient.of(template), + Ingredient.of(material.spring().get()), + Ingredient.of(ingredient), + RecipeCategory.MISC, + result.spring().get() + ) + .unlocks(getHasName(template), has(template)) + .unlocks(getHasName(material.spring().get()), has(material.spring().get())) + .save(output, Mod.loc(getItemName(result.spring().get()))); + + SmithingTransformRecipeBuilder.smithing( + Ingredient.of(template), + Ingredient.of(material.trigger().get()), + Ingredient.of(ingredient), + RecipeCategory.MISC, + result.trigger().get() + ) + .unlocks(getHasName(template), has(template)) + .unlocks(getHasName(material.trigger().get()), has(material.trigger().get())) + .save(output, Mod.loc(getItemName(result.trigger().get()))); + } + public static void generateMaterialPackRecipe(@NotNull RecipeOutput output, ModItems.Materials material, Item pack) { ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, pack) .requires(material.barrel().get())