From 65a3ae5d1ca1f09d847071860453323be5b5eb67 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Wed, 18 Jun 2025 21:33:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E9=B8=9F=E9=85=8D?= =?UTF-8?q?=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 4 ++- .../transportation/ah_6_container.json | 32 +++++++++++++++++++ .../superbwarfare/recipe/ah_6_container.json} | 21 ++++++------ .../datagen/ModRecipeProvider.java | 15 +++++++++ .../en_us/entries/vehicle/ah_6.json | 2 +- 5 files changed, 62 insertions(+), 12 deletions(-) create mode 100644 src/generated/resources/data/superbwarfare/advancement/recipes/transportation/ah_6_container.json rename src/{main/resources/data/superbwarfare/recipe/ah_6_crafting.json => generated/resources/data/superbwarfare/recipe/ah_6_container.json} (80%) diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 872df46cc..f270536de 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.21.1 2025-06-14T14:38:08.3653122 Recipes +// 1.21.1 2025-06-18T21:44:25.0318261 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 @@ -99,9 +99,11 @@ a14ae75ff20bd01d2ada8fce0a7dd6ab55e37fc0 data/superbwarfare/advancement/recipes/ 2a9b21d77cad688c1fb0c924d8be9bb7ded56f0d data/superbwarfare/advancement/recipes/misc/taser_blueprint.json e414607d3519e157842ddb5163a2057b299dd487 data/superbwarfare/advancement/recipes/misc/trachelium_blueprint.json da78113ebbbca910a4517f589a2e3eb110542df9 data/superbwarfare/advancement/recipes/misc/vector_blueprint.json +9600fa3ac17ada7c26165d789353f47755ee5145 data/superbwarfare/advancement/recipes/transportation/ah_6_container.json e9bf9432e482372794a4e9dc378bf7a1564c1c00 data/superbwarfare/advancement/recipes/transportation/a_10a_container.json 7b5f4164c298334f687ffd1ccba9e0cb3b1f2fbc data/superbwarfare/recipe/aa_12_blueprint.json 3ba2ed55215bd31bd922361dd909eec723ec6be5 data/superbwarfare/recipe/aa_12_smithing.json +33e2eb835282873f73b9e6167238341b4d4e819b data/superbwarfare/recipe/ah_6_container.json ef7e3adfb75572ee4fcaf87b941636a788e0c430 data/superbwarfare/recipe/ak_12_blueprint.json abdbcb7a1f69932ffc7f0f3ef6c0ae2200e432b2 data/superbwarfare/recipe/ak_12_smithing.json 4cdf5197936a1465de76ef23b9b8d41ba3737664 data/superbwarfare/recipe/ak_47_blueprint.json diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/transportation/ah_6_container.json b/src/generated/resources/data/superbwarfare/advancement/recipes/transportation/ah_6_container.json new file mode 100644 index 000000000..326cb0499 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/transportation/ah_6_container.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_light_armament_module": { + "conditions": { + "items": [ + { + "items": "superbwarfare:light_armament_module" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:ah_6_container" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_light_armament_module" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:ah_6_container" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/ah_6_crafting.json b/src/generated/resources/data/superbwarfare/recipe/ah_6_container.json similarity index 80% rename from src/main/resources/data/superbwarfare/recipe/ah_6_crafting.json rename to src/generated/resources/data/superbwarfare/recipe/ah_6_container.json index 6cd859352..1ff771ead 100644 --- a/src/main/resources/data/superbwarfare/recipe/ah_6_crafting.json +++ b/src/generated/resources/data/superbwarfare/recipe/ah_6_container.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "category": "misc", - "pattern": [ - "abc", - "def", - "hgh" - ], "key": { "a": { "item": "superbwarfare:large_propeller" @@ -23,7 +18,7 @@ "tag": "superbwarfare:storage_blocks/steel" }, "f": { - "item": "minecraft:chest" + "tag": "c:chests" }, "g": { "item": "superbwarfare:medium_battery_pack" @@ -32,13 +27,19 @@ "item": "superbwarfare:light_armament_module" } }, + "pattern": [ + "abc", + "def", + "hgh" + ], "result": { - "id": "superbwarfare:container", "components": { "minecraft:block_entity_data": { - "id": "superbwarfare:container", - "EntityType": "superbwarfare:ah_6" + "EntityType": "superbwarfare:ah_6", + "id": "superbwarfare:container" } - } + }, + "count": 1, + "id": "superbwarfare:container" } } \ 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 43e47e1a4..55832d8db 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java @@ -19,6 +19,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; +import net.neoforged.neoforge.common.Tags; import org.jetbrains.annotations.NotNull; import java.util.concurrent.CompletableFuture; @@ -62,6 +63,20 @@ public class ModRecipeProvider extends RecipeProvider { .define('f', ModItems.MEDIUM_BATTERY_PACK.get()) .unlockedBy(getHasName(ModItems.HEAVY_ARMAMENT_MODULE.get()), has(ModItems.HEAVY_ARMAMENT_MODULE.get())) .save(output, Mod.loc(getContainerRecipeName(ModEntities.A_10A.get()))); + containerRecipe(ModEntities.AH_6.get()) + .pattern("abc") + .pattern("def") + .pattern("hgh") + .define('a', ModItems.LARGE_PROPELLER.get()) + .define('b', ModItems.LARGE_MOTOR.get()) + .define('c', ModItems.PROPELLER.get()) + .define('d', Items.COMPASS) + .define('e', ModTags.Items.STORAGE_BLOCK_STEEL) + .define('f', Tags.Items.CHESTS) + .define('g', ModItems.MEDIUM_BATTERY_PACK.get()) + .define('h', ModItems.LIGHT_ARMAMENT_MODULE.get()) + .unlockedBy(getHasName(ModItems.LIGHT_ARMAMENT_MODULE.get()), has(ModItems.LIGHT_ARMAMENT_MODULE.get())) + .save(output, Mod.loc(getContainerRecipeName(ModEntities.AH_6.get()))); // guns gunSmithing(output, ModItems.TRACHELIUM_BLUEPRINT.get(), GunRarity.EPIC, ModTags.Items.INGOTS_CEMENTED_CARBIDE, ModItems.TRACHELIUM.get()); diff --git a/src/main/resources/assets/superbwarfare/patchouli_books/superb_warfare_manual/en_us/entries/vehicle/ah_6.json b/src/main/resources/assets/superbwarfare/patchouli_books/superb_warfare_manual/en_us/entries/vehicle/ah_6.json index 0a6943623..fe790cb79 100644 --- a/src/main/resources/assets/superbwarfare/patchouli_books/superb_warfare_manual/en_us/entries/vehicle/ah_6.json +++ b/src/main/resources/assets/superbwarfare/patchouli_books/superb_warfare_manual/en_us/entries/vehicle/ah_6.json @@ -9,7 +9,7 @@ }, { "type": "patchouli:crafting", - "recipe": "superbwarfare:ah_6_crafting", + "recipe": "superbwarfare:ah_6_container", "text": "superbwarfare.page.vehicle.ah_62" }, {