From 760ef4d757fd0364b895f03795481126a46501dd Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Fri, 23 May 2025 15:48:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=B7=E6=9C=88=E6=9D=83?= =?UTF-8?q?=E6=9D=96=E9=85=8D=E6=96=B9=E8=93=9D=E5=9B=BEtag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2e07f3c482445536d45c00e6abf223465c01c841 | 4 ++-- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 6 ++--- .../b69ee8a2655365569b979911c0440daa8c470ac2 | 3 ++- .../item/aurelia_sceptre_blueprint.json | 6 +++++ .../loot_table/chests/blue_print_epic.json | 7 +++++- .../loot_table/chests/blue_print_rare.json | 9 +++++-- .../tags/item/blueprint/legendary.json | 3 ++- .../datagen/ModCustomLootProvider.java | 8 ++++--- .../datagen/ModItemModelProvider.java | 1 + .../datagen/ModItemTagProvider.java | 2 +- .../superbwarfare/init/ModItems.java | 1 + .../assets/superbwarfare/lang/en_us.json | 1 + .../assets/superbwarfare/lang/zh_cn.json | 1 + .../aurelia_sceptre_blueprint_crafting.json | 24 +++++++++++++++++++ .../recipe/aurelia_sceptre_smithing.json | 15 ++++++++++++ 15 files changed, 77 insertions(+), 14 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/aurelia_sceptre_blueprint.json create mode 100644 src/main/resources/data/superbwarfare/recipe/aurelia_sceptre_blueprint_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipe/aurelia_sceptre_smithing.json diff --git a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 index 82e814af8..4ab5e588b 100644 --- a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 +++ b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 @@ -1,4 +1,4 @@ -// 1.21.1 2025-05-21T21:06:02.227207 Tags for minecraft:item mod id superbwarfare +// 1.21.1 2025-05-23T16:26:24.1302748 Tags for minecraft:item mod id superbwarfare 44a232152f5941d0435a35483b37f8ed22fd10bf data/c/tags/item/dusts.json 0fa06c2ff83bf09797e3ddff90f62d1124e645b4 data/c/tags/item/dusts/coal_coke.json 295ddf906b7133a0558d03e9a60eea18281fe430 data/c/tags/item/dusts/iron.json @@ -30,7 +30,7 @@ af6fd64b4a685c353f243763db268f7b2304c009 data/c/tags/item/storage_blocks/lead.js b2461a0f5cf318dde060f2b111a01c77234a0681 data/superbwarfare/tags/item/blueprint/cannon.json 889e4b56462df422f57191f07229009dcf2073e3 data/superbwarfare/tags/item/blueprint/common.json 3c4adac76810982986b6cd9845192ae8416324f4 data/superbwarfare/tags/item/blueprint/epic.json -db74863ba36706ced4f45eed4cbc0bb0d87aa0f9 data/superbwarfare/tags/item/blueprint/legendary.json +702f9ef2b959fc0d546443968556ea7db0672b04 data/superbwarfare/tags/item/blueprint/legendary.json 3154110c8f6b5d1473d558b7d0d2f752396dff34 data/superbwarfare/tags/item/blueprint/rare.json bb51d8b21c5e9e23551a66933577241e65af2fac data/superbwarfare/tags/item/gun.json cd469bd18f1d19893b79c9cff9970e4db7e0e484 data/superbwarfare/tags/item/handgun.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 1d0317755..d30e17b58 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.21.1 2025-05-13T23:23:11.1552806 Loot Tables +// 1.21.1 2025-05-23T16:26:24.1332033 Loot Tables e71d9e1055ddb98520b16fafd202f9db3a696f54 data/superbwarfare/loot_table/blocks/aircraft_catapult.json 98386b2e65b2afb7cf5b0cabf6a7b0f062c1e640 data/superbwarfare/loot_table/blocks/barbed_wire.json 811e69929a14e6736015849c220100bb58d914c9 data/superbwarfare/loot_table/blocks/cemented_carbide_block.json @@ -24,8 +24,8 @@ a0180f3c8988e3564d05bbdd0862c10305ed663e data/superbwarfare/loot_table/blocks/sm 5f0de0936df3f782d015d5ee22a224e54c943d5c data/superbwarfare/loot_table/blocks/vehicle_deployer.json 6e2346c664cd643bff31c0a26e463c6c8dd46e37 data/superbwarfare/loot_table/chests/ancient_cpu.json 031ebfa016c816ebbd03dcf03f169599eed3e9d4 data/superbwarfare/loot_table/chests/blue_print_common.json -60f0cf8c558f09fd878a68e0c3a876c9484f83ac data/superbwarfare/loot_table/chests/blue_print_epic.json -dd6ba01de4126332ac0dda484ab4176c03fdad06 data/superbwarfare/loot_table/chests/blue_print_rare.json +0af7c5ebb98f2bce81cc74a07dd6f7eadc784395 data/superbwarfare/loot_table/chests/blue_print_epic.json +6b029a02d770be6751637f7f63110d08a3c7f753 data/superbwarfare/loot_table/chests/blue_print_rare.json 7e75ff103ccdbcf6be6f61413a4173115195f0a9 data/superbwarfare/loot_table/containers/blueprints.json be87d07ea13253e7a2237f048acc655e16e8317c data/superbwarfare/loot_table/containers/common.json 151368546abc7b65138a0a822dd53b48999d86be data/superbwarfare/loot_table/special/common/blueprints.json diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index 0e500d44e..cfe7d66f1 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.21.1 2025-05-22T03:07:49.6285778 Item Models: superbwarfare +// 1.21.1 2025-05-23T16:26:24.1341819 Item Models: superbwarfare 6c48f5010e7e2b8cd4d3ff85c8de45cf56f53268 assets/superbwarfare/models/item/aa_12.json fb3a995587b2c253571c3160ff02c2ad8c73ecf8 assets/superbwarfare/models/item/aa_12_base.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json @@ -18,6 +18,7 @@ a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/annihi 4b8fe8fbe5e64c3449ad539317254e4ed7188411 assets/superbwarfare/models/item/ap_head.json 0d41599d73bef0eefd40b54bb4940fe2e8e03da6 assets/superbwarfare/models/item/aurelia_sceptre.json 47b117e79990f208022980edf27898c559c715f4 assets/superbwarfare/models/item/aurelia_sceptre_base.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aurelia_sceptre_blueprint.json a207f0f01b87315d1b85fc3ea69bf52b2bd5c71a assets/superbwarfare/models/item/aurelia_sceptre_icon.json 984c08ca6f6893a15721a85e30118f9e32c65c7f assets/superbwarfare/models/item/barbed_wire.json e8f16946c6f9429989d05e9ec250a72ffc64f9e1 assets/superbwarfare/models/item/beam_test.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/aurelia_sceptre_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/aurelia_sceptre_blueprint.json new file mode 100644 index 000000000..7bbbd3bbb --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/aurelia_sceptre_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/generated/resources/data/superbwarfare/loot_table/chests/blue_print_epic.json b/src/generated/resources/data/superbwarfare/loot_table/chests/blue_print_epic.json index fdad040ec..618fa1b88 100644 --- a/src/generated/resources/data/superbwarfare/loot_table/chests/blue_print_epic.json +++ b/src/generated/resources/data/superbwarfare/loot_table/chests/blue_print_epic.json @@ -89,6 +89,11 @@ "name": "superbwarfare:secondary_cataclysm_blueprint", "weight": 15 }, + { + "type": "minecraft:item", + "name": "superbwarfare:aurelia_sceptre_blueprint", + "weight": 10 + }, { "type": "minecraft:item", "name": "superbwarfare:mk_42_blueprint", @@ -102,7 +107,7 @@ { "type": "minecraft:item", "name": "superbwarfare:hpj_11_blueprint", - "weight": 10 + "weight": 5 }, { "type": "minecraft:item", diff --git a/src/generated/resources/data/superbwarfare/loot_table/chests/blue_print_rare.json b/src/generated/resources/data/superbwarfare/loot_table/chests/blue_print_rare.json index 33730a630..d683af43e 100644 --- a/src/generated/resources/data/superbwarfare/loot_table/chests/blue_print_rare.json +++ b/src/generated/resources/data/superbwarfare/loot_table/chests/blue_print_rare.json @@ -179,6 +179,11 @@ "name": "superbwarfare:secondary_cataclysm_blueprint", "weight": 3 }, + { + "type": "minecraft:item", + "name": "superbwarfare:aurelia_sceptre_blueprint", + "weight": 2 + }, { "type": "minecraft:item", "name": "superbwarfare:mk_42_blueprint", @@ -187,12 +192,12 @@ { "type": "minecraft:item", "name": "superbwarfare:mle_1934_blueprint", - "weight": 3 + "weight": 2 }, { "type": "minecraft:item", "name": "superbwarfare:hpj_11_blueprint", - "weight": 3 + "weight": 2 }, { "type": "minecraft:item", diff --git a/src/generated/resources/data/superbwarfare/tags/item/blueprint/legendary.json b/src/generated/resources/data/superbwarfare/tags/item/blueprint/legendary.json index 6ff335dfb..76546ca53 100644 --- a/src/generated/resources/data/superbwarfare/tags/item/blueprint/legendary.json +++ b/src/generated/resources/data/superbwarfare/tags/item/blueprint/legendary.json @@ -9,6 +9,7 @@ "superbwarfare:mk_42_blueprint", "superbwarfare:mle_1934_blueprint", "superbwarfare:annihilator_blueprint", - "superbwarfare:hpj_11_blueprint" + "superbwarfare:hpj_11_blueprint", + "superbwarfare:aurelia_sceptre_blueprint" ] } \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModCustomLootProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModCustomLootProvider.java index 0f15ba81e..aee407cce 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModCustomLootProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModCustomLootProvider.java @@ -140,9 +140,10 @@ public class ModCustomLootProvider implements LootTableSubProvider { new ItemEntry(ModItems.SENTINEL_BLUEPRINT.get(), 3), new ItemEntry(ModItems.JAVELIN_BLUEPRINT.get(), 3), new ItemEntry(ModItems.SECONDARY_CATACLYSM_BLUEPRINT.get(), 3), + new ItemEntry(ModItems.AURELIA_SCEPTRE_BLUEPRINT.get(), 2), new ItemEntry(ModItems.MK_42_BLUEPRINT.get(), 3), - new ItemEntry(ModItems.MLE_1934_BLUEPRINT.get(), 3), - new ItemEntry(ModItems.HPJ_11_BLUEPRINT.get(), 3), + new ItemEntry(ModItems.MLE_1934_BLUEPRINT.get(), 2), + new ItemEntry(ModItems.HPJ_11_BLUEPRINT.get(), 2), new ItemEntry(ModItems.ANNIHILATOR_BLUEPRINT.get(), 1) )) .withPool(multiItems(2, 0, @@ -185,9 +186,10 @@ public class ModCustomLootProvider implements LootTableSubProvider { new ItemEntry(ModItems.SENTINEL_BLUEPRINT.get(), 20), new ItemEntry(ModItems.JAVELIN_BLUEPRINT.get(), 15), new ItemEntry(ModItems.SECONDARY_CATACLYSM_BLUEPRINT.get(), 15), + new ItemEntry(ModItems.AURELIA_SCEPTRE_BLUEPRINT.get(), 10), new ItemEntry(ModItems.MK_42_BLUEPRINT.get(), 10), new ItemEntry(ModItems.MLE_1934_BLUEPRINT.get(), 10), - new ItemEntry(ModItems.HPJ_11_BLUEPRINT.get(), 10), + new ItemEntry(ModItems.HPJ_11_BLUEPRINT.get(), 5), new ItemEntry(ModItems.ANNIHILATOR_BLUEPRINT.get(), 5) )) .withPool(multiItems(2, 0, diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index f11e0e9f4..92e8fb58a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -195,6 +195,7 @@ public class ModItemModelProvider extends ItemModelProvider { gunBlueprintItem(ModItems.K_98_BLUEPRINT); gunBlueprintItem(ModItems.MOSIN_NAGANT_BLUEPRINT); gunBlueprintItem(ModItems.JAVELIN_BLUEPRINT); + gunBlueprintItem(ModItems.AURELIA_SCEPTRE_BLUEPRINT); cannonBlueprintItem(ModItems.MK_42_BLUEPRINT); cannonBlueprintItem(ModItems.MLE_1934_BLUEPRINT); cannonBlueprintItem(ModItems.ANNIHILATOR_BLUEPRINT); diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java index e33da270a..d111aea5f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemTagProvider.java @@ -130,7 +130,7 @@ public class ModItemTagProvider extends ItemTagsProvider { this.tag(ModTags.Items.LEGENDARY_BLUEPRINT).add(ModItems.AA_12_BLUEPRINT.get(), ModItems.NTW_20_BLUEPRINT.get(), ModItems.MINIGUN_BLUEPRINT.get(), ModItems.SENTINEL_BLUEPRINT.get(), ModItems.JAVELIN_BLUEPRINT.get(), ModItems.SECONDARY_CATACLYSM_BLUEPRINT.get(), ModItems.MK_42_BLUEPRINT.get(), - ModItems.MLE_1934_BLUEPRINT.get(), ModItems.ANNIHILATOR_BLUEPRINT.get(), ModItems.HPJ_11_BLUEPRINT.get()); + ModItems.MLE_1934_BLUEPRINT.get(), ModItems.ANNIHILATOR_BLUEPRINT.get(), ModItems.HPJ_11_BLUEPRINT.get(), ModItems.AURELIA_SCEPTRE_BLUEPRINT.get()); this.tag(ModTags.Items.CANNON_BLUEPRINT).add(ModItems.MK_42_BLUEPRINT.get(), ModItems.MLE_1934_BLUEPRINT.get(), ModItems.ANNIHILATOR_BLUEPRINT.get(), ModItems.HPJ_11_BLUEPRINT.get()); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java index 23d7d62bb..6295a3f83 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java @@ -253,6 +253,7 @@ public class ModItems { public static final DeferredHolder M_2_HB_BLUEPRINT = ITEMS.register("m2hb_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final DeferredHolder SECONDARY_CATACLYSM_BLUEPRINT = ITEMS.register("secondary_cataclysm_blueprint", () -> new BlueprintItem(ModEnumExtensions.getLegendary())); public static final DeferredHolder INSIDIOUS_BLUEPRINT = ITEMS.register("insidious_blueprint", () -> new BlueprintItem(Rarity.EPIC)); + public static final DeferredHolder AURELIA_SCEPTRE_BLUEPRINT = ITEMS.register("aurelia_sceptre_blueprint", () -> new BlueprintItem(ModEnumExtensions.getLegendary())); public static final DeferredHolder MK_42_BLUEPRINT = ITEMS.register("mk_42_blueprint", () -> new BlueprintItem(ModEnumExtensions.getLegendary())); public static final DeferredHolder MLE_1934_BLUEPRINT = ITEMS.register("mle_1934_blueprint", () -> new BlueprintItem(ModEnumExtensions.getLegendary())); public static final DeferredHolder HPJ_11_BLUEPRINT = ITEMS.register("hpj_11_blueprint", () -> new BlueprintItem(ModEnumExtensions.getLegendary())); diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 1b636b269..a1308b73e 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -112,6 +112,7 @@ "item.superbwarfare.secondary_cataclysm_blueprint": "Secondary Cataclysm Blueprint", "item.superbwarfare.insidious_blueprint": "Insidious Blueprint", "item.superbwarfare.hpj_11_blueprint": "H/PJ-11 CIWS Blueprint", + "item.superbwarfare.aurelia_sceptre_blueprint": "Aurelia Sceptre 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 9b13d3bed..2dc053c04 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -112,6 +112,7 @@ "item.superbwarfare.secondary_cataclysm_blueprint": "二次灾变蓝图", "item.superbwarfare.insidious_blueprint": "阴险蓝图", "item.superbwarfare.hpj_11_blueprint": "H/PJ-11近防炮蓝图", + "item.superbwarfare.aurelia_sceptre_blueprint": "海月权杖蓝图", "item.superbwarfare.common_material_pack": "普通材料包", "item.superbwarfare.rare_material_pack": "稀有材料包", diff --git a/src/main/resources/data/superbwarfare/recipe/aurelia_sceptre_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/aurelia_sceptre_blueprint_crafting.json new file mode 100644 index 000000000..5e0426d79 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipe/aurelia_sceptre_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:aurelia_sceptre_blueprint" + }, + "c": { + "item": "minecraft:lapis_lazuli" + } + }, + "result": { + "id": "superbwarfare:aurelia_sceptre_blueprint", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/aurelia_sceptre_smithing.json b/src/main/resources/data/superbwarfare/recipe/aurelia_sceptre_smithing.json new file mode 100644 index 000000000..46c45fa8f --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipe/aurelia_sceptre_smithing.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smithing_transform", + "template": { + "item": "superbwarfare:aurelia_sceptre_blueprint" + }, + "base": { + "item": "superbwarfare:legendary_material_pack" + }, + "addition": { + "item": "minecraft:end_crystal" + }, + "result": { + "id": "superbwarfare:aurelia_sceptre" + } +} \ No newline at end of file