From 11a86f42010577918cbf9da6e4d4cc2926d0816c Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Fri, 6 Dec 2024 23:55:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=82=AE=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 --- .../models/item/annihilator_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_epic.json | 14 +++++++++ .../loot_tables/chests/blue_print_rare.json | 14 +++++++++ .../annihilator_blueprint_crafting.json | 24 ++++++++++++++ .../recipes/annihilator_crafting.json | 31 +++++++++++++++++++ 9 files changed, 93 insertions(+) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/annihilator_blueprint.json create mode 100644 src/main/resources/data/superbwarfare/recipes/annihilator_blueprint_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/annihilator_crafting.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/annihilator_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/annihilator_blueprint.json new file mode 100644 index 000000000..c698e5dfc --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/annihilator_blueprint.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/cannon_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 8c0d278a8..04a4f6dff 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -129,6 +129,7 @@ public class ModItemModelProvider extends ItemModelProvider { blueprintItem(ModItems.JAVELIN_BLUEPRINT); blueprintItem(ModItems.MK_42_BLUEPRINT); blueprintItem(ModItems.MLE_1934_BLUEPRINT); + blueprintItem(ModItems.ANNIHILATOR_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 3fb76c53c..e773dfb77 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java @@ -218,6 +218,7 @@ public class ModItems { public static final RegistryObject JAVELIN_BLUEPRINT = ITEMS.register("javelin_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); 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)); /** * Block diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index e4d72d5ca..143f9815d 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -104,6 +104,7 @@ "item.superbwarfare.javelin_blueprint": "Javelin Blueprint", "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.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 7cd705df5..314159e20 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -104,6 +104,7 @@ "item.superbwarfare.javelin_blueprint": "标枪导弹蓝图", "item.superbwarfare.mk_42_blueprint": "5''/54 Mk42蓝图", "item.superbwarfare.mle_1934_blueprint": "138.6mm50 Mle1934 R1938蓝图", + "item.superbwarfare.annihilator_blueprint": "歼灭者能量炮蓝图", "item.superbwarfare.common_material_pack": "普通材料包", "item.superbwarfare.rare_material_pack": "稀有材料包", diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_epic.json b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_epic.json index e5a79f905..03b1c5e8a 100644 --- a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_epic.json +++ b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_epic.json @@ -297,6 +297,20 @@ } } ] + }, + { + "type": "minecraft:item", + "name": "superbwarfare:annihilator_blueprint", + "weight": 5, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] } ] }, 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 896df0cbb..a6b993039 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 @@ -423,6 +423,20 @@ } } ] + }, + { + "type": "minecraft:item", + "name": "superbwarfare:annihilator_blueprint", + "weight": 2, + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 1 + } + } + ] } ] }, diff --git a/src/main/resources/data/superbwarfare/recipes/annihilator_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipes/annihilator_blueprint_crafting.json new file mode 100644 index 000000000..29dcc1466 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/annihilator_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:annihilator_blueprint" + }, + "c": { + "item": "minecraft:lapis_lazuli" + } + }, + "result": { + "item": "superbwarfare:annihilator_blueprint", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/annihilator_crafting.json b/src/main/resources/data/superbwarfare/recipes/annihilator_crafting.json new file mode 100644 index 000000000..483155592 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/annihilator_crafting.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "aaa", + "bbb", + "dcd" + ], + "key": { + "a": { + "item": "minecraft:beacon" + }, + "b": { + "item": "superbwarfare:cannon_core" + }, + "c": { + "item": "superbwarfare:annihilator_blueprint" + }, + "d": { + "item": "minecraft:netherite_block" + } + }, + "result": { + "item": "superbwarfare:container", + "nbt": { + "BlockEntityTag": { + "EntityType": "superbwarfare:annihilator" + } + } + } +} \ No newline at end of file