From 869d00fc37e64143132d04435a4a732622a7b2d6 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Wed, 11 Jun 2025 18:40:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=AD=A6=E5=99=A8=E7=A8=80?= =?UTF-8?q?=E6=9C=89=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 10 +++--- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 6 +++- .../combat/hunting_rifle_smithing.json | 32 +++++++++++++++++++ .../recipes/combat/sentinel_smithing.json | 32 +++++++++++++++++++ .../loot_table/chests/blue_print_common.json | 7 +++- .../loot_table/chests/blue_print_epic.json | 7 +--- .../loot_table/chests/blue_print_rare.json | 12 +++---- .../loot_table/containers/blueprints.json | 17 ++++++---- .../recipe/hunting_rifle_smithing.json | 13 ++++---- .../recipe/sentinel_smithing.json | 13 ++++---- .../datagen/ModCustomLootProvider.java | 17 +++++----- .../datagen/ModRecipeProvider.java | 5 ++- .../superbwarfare/init/ModItems.java | 12 +++---- .../item/gun/sniper/HuntingRifleItem.java | 2 +- .../item/gun/sniper/SentinelItem.java | 4 +-- 15 files changed, 134 insertions(+), 55 deletions(-) create mode 100644 src/generated/resources/data/superbwarfare/advancement/recipes/combat/hunting_rifle_smithing.json create mode 100644 src/generated/resources/data/superbwarfare/advancement/recipes/combat/sentinel_smithing.json rename src/{main => generated}/resources/data/superbwarfare/recipe/hunting_rifle_smithing.json (79%) rename src/{main => generated}/resources/data/superbwarfare/recipe/sentinel_smithing.json (79%) diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index b7c498138..8bc9f6177 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.21.1 2025-05-29T14:19:09.6770973 Loot Tables +// 1.21.1 2025-06-12T06:39:30.6430683 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 @@ -23,10 +23,10 @@ a0180f3c8988e3564d05bbdd0862c10305ed663e data/superbwarfare/loot_table/blocks/sm 71fc892124b5343e10688cabc2fb7c87d83cfef8 data/superbwarfare/loot_table/blocks/tungsten_block.json 5f0de0936df3f782d015d5ee22a224e54c943d5c data/superbwarfare/loot_table/blocks/vehicle_deployer.json 6e2346c664cd643bff31c0a26e463c6c8dd46e37 data/superbwarfare/loot_table/chests/ancient_cpu.json -989c3a0ca2390c1f612a13cd1c46585a1cd1e2ce data/superbwarfare/loot_table/chests/blue_print_common.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 +4c93def3327b3112288e3e58f0460b30ba14bda5 data/superbwarfare/loot_table/chests/blue_print_common.json +3ca4b370361775407d9849a356fa20b83d80e867 data/superbwarfare/loot_table/chests/blue_print_epic.json +01b038ef32772ea0c3d8f56d024a167f90ea983b data/superbwarfare/loot_table/chests/blue_print_rare.json +38efeac6836b675ff173abf8442915e5b1ee5e86 data/superbwarfare/loot_table/containers/blueprints.json be87d07ea13253e7a2237f048acc655e16e8317c data/superbwarfare/loot_table/containers/common.json 151368546abc7b65138a0a822dd53b48999d86be data/superbwarfare/loot_table/special/common/blueprints.json bdc01aa31e669b8ac6efed218533d51036c912f6 data/superbwarfare/loot_table/special/common/flags.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index f445576c3..1ad4ec9d5 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,10 +1,12 @@ -// 1.21.1 2025-06-12T06:31:28.20299 Recipes +// 1.21.1 2025-06-12T06:39:30.6450202 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 c30037a134eee140578bfe17cb395469c84ac0f9 data/superbwarfare/advancement/recipes/combat/glock_17_smithing.json 0510902ee6cd7ffd7b693375191f8015a38ec584 data/superbwarfare/advancement/recipes/combat/glock_18_smithing.json +49496208cf5a42a3a122863ae3078ea9710cf28b data/superbwarfare/advancement/recipes/combat/hunting_rifle_smithing.json 61837e97c4a1ec268bf3bf5fd9c7d2c5329ec068 data/superbwarfare/advancement/recipes/combat/mp_443_smithing.json +ff27a7db005aced4c98497d54bc0fe7257910665 data/superbwarfare/advancement/recipes/combat/sentinel_smithing.json 17a7e19e34d86b2bd1bca7633f40f45872f10611 data/superbwarfare/advancement/recipes/combat/trachelium_smithing.json fb31d2e09af64c6a234c0bc43123b95c529babdd data/superbwarfare/advancement/recipes/misc/aa_12_blueprint.json c570eb1f7d03feb4896c5f3aa04279ce23bcd76e data/superbwarfare/advancement/recipes/misc/ak_12_blueprint.json @@ -61,6 +63,7 @@ bcf5921618b46ab6b7fbd432cc90b0d2ce350c4d data/superbwarfare/recipe/glock_18_smit d456d459465bfa7338efc37a10ae8797f01111ab data/superbwarfare/recipe/hk_416_blueprint.json c058c56606592457d7fe2bb1ddef5e05abd5a732 data/superbwarfare/recipe/hpj_11_blueprint.json c591aecdf4b5bab7b206160c0c255470fb3d5684 data/superbwarfare/recipe/hunting_rifle_blueprint.json +b725b8a8c4e4c1514df7a44610c4f03335561b01 data/superbwarfare/recipe/hunting_rifle_smithing.json aff87a5a66e7aef395b08067339685954a0f4de2 data/superbwarfare/recipe/insidious_blueprint.json 1fc1080eb1328b7a91445d083a5ea4bd6e0fdcb4 data/superbwarfare/recipe/javelin_blueprint.json 9ced791c2f2eeb19bab3b7826e05c936953974cc data/superbwarfare/recipe/k_98_blueprint.json @@ -86,6 +89,7 @@ f99ef54062417a7da9882662880469ec1c054d05 data/superbwarfare/recipe/qbz_95_bluepr 2d9c1b07950aba143ec78afbd4a869fa01d7a75f data/superbwarfare/recipe/rpk_blueprint.json 70744d4a6da160bab1f480635339bcf946692c4c data/superbwarfare/recipe/secondary_cataclysm_blueprint.json 4f518b1ef8a22e3bc3f70171a8c467310de07d7c data/superbwarfare/recipe/sentinel_blueprint.json +14719ade84f72afa292d94d035642e8573878b83 data/superbwarfare/recipe/sentinel_smithing.json 0512e158416faa91b207f4f7e271dff6e2f12c49 data/superbwarfare/recipe/sks_blueprint.json 940339216a1dc73e8e9f090af1b5a638db81581a data/superbwarfare/recipe/svd_blueprint.json 74f766c560a92652471e00af24019caec23cf85c data/superbwarfare/recipe/taser_blueprint.json diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/combat/hunting_rifle_smithing.json b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/hunting_rifle_smithing.json new file mode 100644 index 000000000..df9c5d2ab --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/hunting_rifle_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hunting_rifle_blueprint": { + "conditions": { + "items": [ + { + "items": "superbwarfare:hunting_rifle_blueprint" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:hunting_rifle_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hunting_rifle_blueprint" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:hunting_rifle_smithing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/combat/sentinel_smithing.json b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/sentinel_smithing.json new file mode 100644 index 000000000..8a579eb40 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/sentinel_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_sentinel_blueprint": { + "conditions": { + "items": [ + { + "items": "superbwarfare:sentinel_blueprint" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:sentinel_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_sentinel_blueprint" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:sentinel_smithing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/loot_table/chests/blue_print_common.json b/src/generated/resources/data/superbwarfare/loot_table/chests/blue_print_common.json index fcbd04888..f6de876bc 100644 --- a/src/generated/resources/data/superbwarfare/loot_table/chests/blue_print_common.json +++ b/src/generated/resources/data/superbwarfare/loot_table/chests/blue_print_common.json @@ -99,13 +99,18 @@ "name": "superbwarfare:mp_5_blueprint", "weight": 15 }, + { + "type": "minecraft:item", + "name": "superbwarfare:hunting_rifle_blueprint", + "weight": 15 + }, { "type": "minecraft:item", "name": "superbwarfare:trachelium_blueprint" }, { "type": "minecraft:item", - "name": "superbwarfare:hunting_rifle_blueprint" + "name": "superbwarfare:sentinel_blueprint" }, { "type": "minecraft:item", 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 618fa1b88..7a29f74e4 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 @@ -11,7 +11,7 @@ }, { "type": "minecraft:item", - "name": "superbwarfare:hunting_rifle_blueprint", + "name": "superbwarfare:sentinel_blueprint", "weight": 10 }, { @@ -74,11 +74,6 @@ "name": "superbwarfare:minigun_blueprint", "weight": 20 }, - { - "type": "minecraft:item", - "name": "superbwarfare:sentinel_blueprint", - "weight": 20 - }, { "type": "minecraft:item", "name": "superbwarfare:javelin_blueprint", 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 d683af43e..a7a779af1 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 @@ -94,6 +94,11 @@ "name": "superbwarfare:m2hb_blueprint", "weight": 30 }, + { + "type": "minecraft:item", + "name": "superbwarfare:hunting_rifle_blueprint", + "weight": 30 + }, { "type": "minecraft:item", "name": "superbwarfare:trachelium_blueprint", @@ -101,7 +106,7 @@ }, { "type": "minecraft:item", - "name": "superbwarfare:hunting_rifle_blueprint", + "name": "superbwarfare:sentinel_blueprint", "weight": 10 }, { @@ -164,11 +169,6 @@ "name": "superbwarfare:minigun_blueprint", "weight": 3 }, - { - "type": "minecraft:item", - "name": "superbwarfare:sentinel_blueprint", - "weight": 3 - }, { "type": "minecraft:item", "name": "superbwarfare:javelin_blueprint", diff --git a/src/generated/resources/data/superbwarfare/loot_table/containers/blueprints.json b/src/generated/resources/data/superbwarfare/loot_table/containers/blueprints.json index f72f786c9..9073e1c3c 100644 --- a/src/generated/resources/data/superbwarfare/loot_table/containers/blueprints.json +++ b/src/generated/resources/data/superbwarfare/loot_table/containers/blueprints.json @@ -89,6 +89,11 @@ "name": "superbwarfare:rpg_blueprint", "weight": 42 }, + { + "type": "minecraft:item", + "name": "superbwarfare:hunting_rifle_blueprint", + "weight": 42 + }, { "type": "minecraft:item", "name": "superbwarfare:trachelium_blueprint", @@ -96,7 +101,7 @@ }, { "type": "minecraft:item", - "name": "superbwarfare:hunting_rifle_blueprint", + "name": "superbwarfare:sentinel_blueprint", "weight": 15 }, { @@ -159,11 +164,6 @@ "name": "superbwarfare:minigun_blueprint", "weight": 5 }, - { - "type": "minecraft:item", - "name": "superbwarfare:sentinel_blueprint", - "weight": 5 - }, { "type": "minecraft:item", "name": "superbwarfare:javelin_blueprint", @@ -173,6 +173,11 @@ "type": "minecraft:item", "name": "superbwarfare:secondary_cataclysm_blueprint", "weight": 5 + }, + { + "type": "minecraft:item", + "name": "superbwarfare:aurelia_sceptre_blueprint", + "weight": 5 } ], "rolls": 1.0 diff --git a/src/main/resources/data/superbwarfare/recipe/hunting_rifle_smithing.json b/src/generated/resources/data/superbwarfare/recipe/hunting_rifle_smithing.json similarity index 79% rename from src/main/resources/data/superbwarfare/recipe/hunting_rifle_smithing.json rename to src/generated/resources/data/superbwarfare/recipe/hunting_rifle_smithing.json index 7925c9965..1bdc72910 100644 --- a/src/main/resources/data/superbwarfare/recipe/hunting_rifle_smithing.json +++ b/src/generated/resources/data/superbwarfare/recipe/hunting_rifle_smithing.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "superbwarfare:hunting_rifle_blueprint" - }, - "base": { - "item": "superbwarfare:epic_material_pack" - }, "addition": { "tag": "minecraft:logs" }, + "base": { + "item": "superbwarfare:rare_material_pack" + }, "result": { + "count": 1, "id": "superbwarfare:hunting_rifle" + }, + "template": { + "item": "superbwarfare:hunting_rifle_blueprint" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/sentinel_smithing.json b/src/generated/resources/data/superbwarfare/recipe/sentinel_smithing.json similarity index 79% rename from src/main/resources/data/superbwarfare/recipe/sentinel_smithing.json rename to src/generated/resources/data/superbwarfare/recipe/sentinel_smithing.json index 0e9d1ec0c..d611db084 100644 --- a/src/main/resources/data/superbwarfare/recipe/sentinel_smithing.json +++ b/src/generated/resources/data/superbwarfare/recipe/sentinel_smithing.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "superbwarfare:sentinel_blueprint" - }, - "base": { - "item": "superbwarfare:legendary_material_pack" - }, "addition": { "item": "superbwarfare:cell" }, + "base": { + "item": "superbwarfare:epic_material_pack" + }, "result": { + "count": 1, "id": "superbwarfare:sentinel" + }, + "template": { + "item": "superbwarfare:sentinel_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 112a8433d..8ac9df0ca 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModCustomLootProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModCustomLootProvider.java @@ -69,9 +69,10 @@ public class ModCustomLootProvider implements LootTableSubProvider { new ItemEntry(ModItems.RPG_BLUEPRINT.get(), 15), new ItemEntry(ModItems.M_2_HB_BLUEPRINT.get(), 15), new ItemEntry(ModItems.MP_5_BLUEPRINT.get(), 15), + new ItemEntry(ModItems.HUNTING_RIFLE_BLUEPRINT.get(), 15), new ItemEntry(ModItems.TRACHELIUM_BLUEPRINT.get(), 1), - new ItemEntry(ModItems.HUNTING_RIFLE_BLUEPRINT.get(), 1), + new ItemEntry(ModItems.SENTINEL_BLUEPRINT.get(), 1), new ItemEntry(ModItems.BOCEK_BLUEPRINT.get(), 1), new ItemEntry(ModItems.RPK_BLUEPRINT.get(), 1), new ItemEntry(ModItems.VECTOR_BLUEPRINT.get(), 1), @@ -122,9 +123,10 @@ public class ModCustomLootProvider implements LootTableSubProvider { new ItemEntry(ModItems.QBZ_95_BLUEPRINT.get(), 30), new ItemEntry(ModItems.RPG_BLUEPRINT.get(), 30), new ItemEntry(ModItems.M_2_HB_BLUEPRINT.get(), 30), + new ItemEntry(ModItems.HUNTING_RIFLE_BLUEPRINT.get(), 30), new ItemEntry(ModItems.TRACHELIUM_BLUEPRINT.get(), 10), - new ItemEntry(ModItems.HUNTING_RIFLE_BLUEPRINT.get(), 10), + new ItemEntry(ModItems.SENTINEL_BLUEPRINT.get(), 10), new ItemEntry(ModItems.BOCEK_BLUEPRINT.get(), 10), new ItemEntry(ModItems.RPK_BLUEPRINT.get(), 10), new ItemEntry(ModItems.VECTOR_BLUEPRINT.get(), 10), @@ -138,7 +140,6 @@ public class ModCustomLootProvider implements LootTableSubProvider { new ItemEntry(ModItems.AA_12_BLUEPRINT.get(), 3), new ItemEntry(ModItems.NTW_20_BLUEPRINT.get(), 3), new ItemEntry(ModItems.MINIGUN_BLUEPRINT.get(), 3), - 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), @@ -170,7 +171,7 @@ public class ModCustomLootProvider implements LootTableSubProvider { output.accept(chests("blue_print_epic"), LootTable.lootTable().withPool(multiItems(1, 0, new ItemEntry(ModItems.TRACHELIUM_BLUEPRINT.get(), 10), - new ItemEntry(ModItems.HUNTING_RIFLE_BLUEPRINT.get(), 10), + new ItemEntry(ModItems.SENTINEL_BLUEPRINT.get(), 10), new ItemEntry(ModItems.BOCEK_BLUEPRINT.get(), 10), new ItemEntry(ModItems.RPK_BLUEPRINT.get(), 10), new ItemEntry(ModItems.VECTOR_BLUEPRINT.get(), 10), @@ -184,7 +185,6 @@ public class ModCustomLootProvider implements LootTableSubProvider { new ItemEntry(ModItems.AA_12_BLUEPRINT.get(), 20), new ItemEntry(ModItems.NTW_20_BLUEPRINT.get(), 20), new ItemEntry(ModItems.MINIGUN_BLUEPRINT.get(), 20), - 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), @@ -238,9 +238,10 @@ public class ModCustomLootProvider implements LootTableSubProvider { new ItemEntry(ModItems.AK_12_BLUEPRINT.get(), 42), new ItemEntry(ModItems.QBZ_95_BLUEPRINT.get(), 42), new ItemEntry(ModItems.RPG_BLUEPRINT.get(), 42), + new ItemEntry(ModItems.HUNTING_RIFLE_BLUEPRINT.get(), 42), new ItemEntry(ModItems.TRACHELIUM_BLUEPRINT.get(), 15), - new ItemEntry(ModItems.HUNTING_RIFLE_BLUEPRINT.get(), 15), + new ItemEntry(ModItems.SENTINEL_BLUEPRINT.get(), 15), new ItemEntry(ModItems.BOCEK_BLUEPRINT.get(), 15), new ItemEntry(ModItems.RPK_BLUEPRINT.get(), 15), new ItemEntry(ModItems.VECTOR_BLUEPRINT.get(), 15), @@ -254,9 +255,9 @@ public class ModCustomLootProvider implements LootTableSubProvider { new ItemEntry(ModItems.AA_12_BLUEPRINT.get(), 5), new ItemEntry(ModItems.NTW_20_BLUEPRINT.get(), 5), new ItemEntry(ModItems.MINIGUN_BLUEPRINT.get(), 5), - new ItemEntry(ModItems.SENTINEL_BLUEPRINT.get(), 5), new ItemEntry(ModItems.JAVELIN_BLUEPRINT.get(), 5), - new ItemEntry(ModItems.SECONDARY_CATACLYSM_BLUEPRINT.get(), 5) + new ItemEntry(ModItems.SECONDARY_CATACLYSM_BLUEPRINT.get(), 5), + new ItemEntry(ModItems.AURELIA_SCEPTRE_BLUEPRINT.get(), 5) ))); output.accept(containers("common"), LootTable.lootTable().withPool(multiItems(1, 0, diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java index 414a9f11a..f6e29bde0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java @@ -9,6 +9,7 @@ import com.atsuishio.superbwarfare.recipe.PotionMortarShellRecipe; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.*; +import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; @@ -34,7 +35,9 @@ public class ModRecipeProvider extends RecipeProvider { gunSmithing(output, ModItems.GLOCK_17_BLUEPRINT.get(), GunRarity.COMMON, Items.IRON_INGOT, ModItems.GLOCK_17.get()); gunSmithing(output, ModItems.MP_443_BLUEPRINT.get(), GunRarity.COMMON, Items.IRON_INGOT, ModItems.MP_443.get()); gunSmithing(output, ModItems.GLOCK_18_BLUEPRINT.get(), GunRarity.RARE, Items.GOLD_INGOT, ModItems.GLOCK_18.get()); -// gunSmithing(writer, ModItems.HUNTING_RIFLE_BLUEPRINT.get(), GunRarity.COMMON, Items.IRON_INGOT, ModItems.HUNTING_RIFLE.get()); + gunSmithing(output, ModItems.HUNTING_RIFLE_BLUEPRINT.get(), GunRarity.RARE, ItemTags.LOGS, ModItems.HUNTING_RIFLE.get()); + + gunSmithing(output, ModItems.SENTINEL_BLUEPRINT.get(), GunRarity.EPIC, ModItems.CELL.get(), ModItems.SENTINEL.get()); copyBlueprint(output, ModItems.TRACHELIUM_BLUEPRINT.get()); copyBlueprint(output, ModItems.GLOCK_17_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 4fbfa535b..3ccf07d30 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java @@ -226,13 +226,13 @@ public class ModItems { public static final DeferredHolder GLOCK_17_BLUEPRINT = ITEMS.register("glock_17_blueprint", () -> new BlueprintItem(Rarity.COMMON)); public static final DeferredHolder MP_443_BLUEPRINT = ITEMS.register("mp_443_blueprint", () -> new BlueprintItem(Rarity.COMMON)); public static final DeferredHolder GLOCK_18_BLUEPRINT = ITEMS.register("glock_18_blueprint", () -> new BlueprintItem(Rarity.RARE)); - public static final DeferredHolder HUNTING_RIFLE_BLUEPRINT = ITEMS.register("hunting_rifle_blueprint", () -> new BlueprintItem(Rarity.EPIC)); + public static final DeferredHolder HUNTING_RIFLE_BLUEPRINT = ITEMS.register("hunting_rifle_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final DeferredHolder M_79_BLUEPRINT = ITEMS.register("m_79_blueprint", () -> new BlueprintItem(Rarity.RARE)); - public static final DeferredHolder RPG_BLUEPRINT = ITEMS.register("rpg_blueprint", () -> new BlueprintItem(Rarity.EPIC)); + public static final DeferredHolder RPG_BLUEPRINT = ITEMS.register("rpg_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final DeferredHolder BOCEK_BLUEPRINT = ITEMS.register("bocek_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder M_4_BLUEPRINT = ITEMS.register("m_4_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final DeferredHolder AA_12_BLUEPRINT = ITEMS.register("aa_12_blueprint", () -> new BlueprintItem(ModEnumExtensions.getLegendary())); - public static final DeferredHolder HK_416_BLUEPRINT = ITEMS.register("hk_416_blueprint", () -> new BlueprintItem(Rarity.EPIC)); + public static final DeferredHolder HK_416_BLUEPRINT = ITEMS.register("hk_416_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final DeferredHolder RPK_BLUEPRINT = ITEMS.register("rpk_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder SKS_BLUEPRINT = ITEMS.register("sks_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final DeferredHolder NTW_20_BLUEPRINT = ITEMS.register("ntw_20_blueprint", () -> new BlueprintItem(ModEnumExtensions.getLegendary())); @@ -240,18 +240,18 @@ public class ModItems { public static final DeferredHolder VECTOR_BLUEPRINT = ITEMS.register("vector_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder MINIGUN_BLUEPRINT = ITEMS.register("minigun_blueprint", () -> new BlueprintItem(ModEnumExtensions.getLegendary())); public static final DeferredHolder MK_14_BLUEPRINT = ITEMS.register("mk_14_blueprint", () -> new BlueprintItem(Rarity.EPIC)); - public static final DeferredHolder SENTINEL_BLUEPRINT = ITEMS.register("sentinel_blueprint", () -> new BlueprintItem(ModEnumExtensions.getLegendary())); + public static final DeferredHolder SENTINEL_BLUEPRINT = ITEMS.register("sentinel_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder M_60_BLUEPRINT = ITEMS.register("m_60_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder SVD_BLUEPRINT = ITEMS.register("svd_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder MARLIN_BLUEPRINT = ITEMS.register("marlin_blueprint", () -> new BlueprintItem(Rarity.COMMON)); public static final DeferredHolder M_870_BLUEPRINT = ITEMS.register("m_870_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final DeferredHolder M_98B_BLUEPRINT = ITEMS.register("m_98b_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder AK_47_BLUEPRINT = ITEMS.register("ak_47_blueprint", () -> new BlueprintItem(Rarity.RARE)); - public static final DeferredHolder AK_12_BLUEPRINT = ITEMS.register("ak_12_blueprint", () -> new BlueprintItem(Rarity.EPIC)); + public static final DeferredHolder AK_12_BLUEPRINT = ITEMS.register("ak_12_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final DeferredHolder DEVOTION_BLUEPRINT = ITEMS.register("devotion_blueprint", () -> new BlueprintItem(Rarity.EPIC)); public static final DeferredHolder TASER_BLUEPRINT = ITEMS.register("taser_blueprint", () -> new BlueprintItem(Rarity.COMMON)); public static final DeferredHolder M_1911_BLUEPRINT = ITEMS.register("m_1911_blueprint", () -> new BlueprintItem(Rarity.COMMON)); - public static final DeferredHolder QBZ_95_BLUEPRINT = ITEMS.register("qbz_95_blueprint", () -> new BlueprintItem(Rarity.EPIC)); + public static final DeferredHolder QBZ_95_BLUEPRINT = ITEMS.register("qbz_95_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final DeferredHolder K_98_BLUEPRINT = ITEMS.register("k_98_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final DeferredHolder MOSIN_NAGANT_BLUEPRINT = ITEMS.register("mosin_nagant_blueprint", () -> new BlueprintItem(Rarity.RARE)); public static final DeferredHolder JAVELIN_BLUEPRINT = ITEMS.register("javelin_blueprint", () -> new BlueprintItem(ModEnumExtensions.getLegendary())); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java index 908493795..2e3cd737a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/HuntingRifleItem.java @@ -24,7 +24,7 @@ import java.util.function.Supplier; public class HuntingRifleItem extends GunItem { public HuntingRifleItem() { - super(new Properties().stacksTo(1).rarity(Rarity.EPIC)); + super(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java index 041464fc4..bb7e524cf 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/sniper/SentinelItem.java @@ -5,7 +5,6 @@ import com.atsuishio.superbwarfare.client.renderer.gun.SentinelItemRenderer; import com.atsuishio.superbwarfare.client.tooltip.component.SentinelImageComponent; import com.atsuishio.superbwarfare.data.gun.GunData; import com.atsuishio.superbwarfare.event.ClientEventHandler; -import com.atsuishio.superbwarfare.init.ModEnumExtensions; import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.item.EnergyStorageItem; import com.atsuishio.superbwarfare.item.gun.GunItem; @@ -19,6 +18,7 @@ import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; import net.minecraft.world.level.Level; import net.neoforged.neoforge.capabilities.Capabilities; import org.jetbrains.annotations.NotNull; @@ -33,7 +33,7 @@ import java.util.function.Supplier; public class SentinelItem extends GunItem implements EnergyStorageItem { public SentinelItem() { - super(new Properties().stacksTo(1).rarity(ModEnumExtensions.getLegendary())); + super(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC)); } @Override