From 0548f8eb4efcfdf6536818ca3182835c932f4757 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Sun, 15 Dec 2024 19:48:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=88=B9=E7=9A=84=E9=85=8D?= =?UTF-8?q?=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../b69ee8a2655365569b979911c0440daa8c470ac2 | 3 +- .../models/item/m2hb_blueprint.json | 6 +++ .../datagen/ModItemModelProvider.java | 1 + .../superbwarfare/init/ModItems.java | 1 + .../assets/superbwarfare/lang/en_us.json | 1 + .../assets/superbwarfare/lang/zh_cn.json | 1 + .../loot_tables/chests/blue_print_common.json | 14 ++++++ .../loot_tables/chests/blue_print_rare.json | 14 ++++++ .../recipes/m2hb_blueprint_crafting.json | 24 ++++++++++ .../recipes/speedboat_crafting.json | 46 +++++++++++++++++++ 10 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/m2hb_blueprint.json create mode 100644 src/main/resources/data/superbwarfare/recipes/m2hb_blueprint_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/speedboat_crafting.json diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index c51e73904..5205f1ce3 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.20.1 2024-12-15T19:19:44.8184797 Item Models: superbwarfare +// 1.20.1 2024-12-15T19:44:08.2693772 Item Models: superbwarfare 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json @@ -47,6 +47,7 @@ e04bbd61e716fc5d53c9425aba508fc3287bfd57 assets/superbwarfare/models/item/iron_p 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/k_98_blueprint.json ce9e4fd8ea92cfdbdda158776c1b6e1b482a3f2a assets/superbwarfare/models/item/lead_ingot.json f66c351b4843ad4d4e086ccfb7d4d0221227d196 assets/superbwarfare/models/item/legendary_material_pack.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m2hb_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/marlin_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/minigun_blueprint.json c206cd345f459733399e0be4692586849ef0aac2 assets/superbwarfare/models/item/missile_engine.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/m2hb_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/m2hb_blueprint.json new file mode 100644 index 000000000..7bbbd3bbb --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/m2hb_blueprint.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/gun_blueprint" + } +} \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index 4db726193..985b290c3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -131,6 +131,7 @@ public class ModItemModelProvider extends ItemModelProvider { blueprintItem(ModItems.MK_42_BLUEPRINT); blueprintItem(ModItems.MLE_1934_BLUEPRINT); blueprintItem(ModItems.ANNIHILATOR_BLUEPRINT); + blueprintItem(ModItems.M_2_HB_BLUEPRINT); // blocks evenSimplerBlockItem(ModBlocks.BARBED_WIRE); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java index 0bb3379db..9a46cf213 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java @@ -220,6 +220,7 @@ public class ModItems { public static final RegistryObject MK_42_BLUEPRINT = ITEMS.register("mk_42_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); public static final RegistryObject MLE_1934_BLUEPRINT = ITEMS.register("mle_1934_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); public static final RegistryObject ANNIHILATOR_BLUEPRINT = ITEMS.register("annihilator_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); + public static final RegistryObject M_2_HB_BLUEPRINT = ITEMS.register("m2hb_blueprint", () -> new BlueprintItem(Rarity.RARE)); /** * Block diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index dcdae02ec..54bbae409 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -105,6 +105,7 @@ "item.superbwarfare.mk_42_blueprint": "5''/54 Mk42 Blueprint", "item.superbwarfare.mle_1934_blueprint": "138.6mm50 Mle1934 R1938 Blueprint", "item.superbwarfare.annihilator_blueprint": "Annihilator Energy Gun Blueprint", + "item.superbwarfare.m2hb_blueprint": "Annihilator Energy Gun Blueprint", "item.superbwarfare.common_material_pack": "Common Material Pack", "item.superbwarfare.rare_material_pack": "Rare Material Pack", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index ded2d829f..2788af291 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -105,6 +105,7 @@ "item.superbwarfare.mk_42_blueprint": "5''/54 Mk42蓝图", "item.superbwarfare.mle_1934_blueprint": "138.6mm50 Mle1934 R1938蓝图", "item.superbwarfare.annihilator_blueprint": "歼灭者能量炮蓝图", + "item.superbwarfare.m2hb_blueprint": "M2HB重机枪蓝图", "item.superbwarfare.common_material_pack": "普通材料包", "item.superbwarfare.rare_material_pack": "稀有材料包", diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_common.json b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_common.json index 55be830b8..a604b8ca8 100644 --- a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_common.json +++ b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_common.json @@ -158,6 +158,20 @@ } ] }, + { + "type": "minecraft:item", + "name": "superbwarfare:m2hb_blueprint", + "weight": 15, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + }, { "type": "minecraft:item", "name": "superbwarfare:hunting_rifle_blueprint", diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json index a6b993039..ca87bd90c 100644 --- a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json +++ b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json @@ -102,6 +102,20 @@ } ] }, + { + "type": "minecraft:item", + "name": "superbwarfare:m2hb_blueprint", + "weight": 15, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] + }, { "type": "minecraft:item", "name": "superbwarfare:sks_blueprint", diff --git a/src/main/resources/data/superbwarfare/recipes/m2hb_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipes/m2hb_blueprint_crafting.json new file mode 100644 index 000000000..08fbccafb --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/m2hb_blueprint_crafting.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "aba", + "aca", + "aaa" + ], + "key": { + "a": { + "item": "minecraft:diamond" + }, + "b": { + "item": "superbwarfare:m2hb_blueprint" + }, + "c": { + "item": "minecraft:lapis_lazuli" + } + }, + "result": { + "item": "superbwarfare:m2hb_blueprint", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/speedboat_crafting.json b/src/main/resources/data/superbwarfare/recipes/speedboat_crafting.json new file mode 100644 index 000000000..527f79238 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/speedboat_crafting.json @@ -0,0 +1,46 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "abc", + "def", + "ghi" + ], + "key": { + "a": { + "item": "superbwarfare:m2hb_blueprint" + }, + "b": { + "item": "superbwarfare:epic_material_pack" + }, + "c": { + "tag":"forge:ingots/steel" + }, + "d": { + "item": "minecraft:comparator" + }, + "e": { + "tag": "minecraft:boats" + }, + "f": { + "item": "minecraft:chest" + }, + "g": { + "item": "superbwarfare:cell" + }, + "h": { + "item": "superbwarfare:motor" + }, + "i": { + "tag":"forge:ingots/copper" + } + }, + "result": { + "item": "superbwarfare:container", + "nbt": { + "BlockEntityTag": { + "EntityType": "superbwarfare:speedboat" + } + } + } +} \ No newline at end of file