diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 4c9cb20c1..2c5c1a49c 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,29 +1,41 @@ -// 1.21.1 2025-06-12T21:44:28.2011777 Recipes +// 1.21.1 2025-06-12T21:51:55.0169672 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 7633a977838d6d54d1ab98623676f8bbeaf04cf8 data/superbwarfare/advancement/recipes/combat/aa_12_smithing.json +f9335435b5e429842bb25bb8f8ae0dec7f01720f data/superbwarfare/advancement/recipes/combat/ak_12_smithing.json +a6798ed0210ea393330b692e357a11220b80d862 data/superbwarfare/advancement/recipes/combat/ak_47_smithing.json +e6ecdc649c496e991845efcd92962502cadb116f data/superbwarfare/advancement/recipes/combat/aurelia_sceptre_smithing.json fa0b20500742e1c81c392ca59a1ab979f217bd07 data/superbwarfare/advancement/recipes/combat/bocek_smithing.json +3fbe21487ecdac5e4184db1c65bbb39d5e133d8a data/superbwarfare/advancement/recipes/combat/devotion_smithing.json c30037a134eee140578bfe17cb395469c84ac0f9 data/superbwarfare/advancement/recipes/combat/glock_17_smithing.json 0510902ee6cd7ffd7b693375191f8015a38ec584 data/superbwarfare/advancement/recipes/combat/glock_18_smithing.json f0d118dd2dbd82c3e01af8e46324491e96764a11 data/superbwarfare/advancement/recipes/combat/hk_416_smithing.json 49496208cf5a42a3a122863ae3078ea9710cf28b data/superbwarfare/advancement/recipes/combat/hunting_rifle_smithing.json +c16daf3284409a337c37d444144e3cf09439f625 data/superbwarfare/advancement/recipes/combat/insidious_smithing.json +98f4c7db7356ab9c1bf52831a3dc44e44858cf6a data/superbwarfare/advancement/recipes/combat/javelin_smithing.json +82b245adbc420d39bb5da29e4c4256e8b9ca5ca9 data/superbwarfare/advancement/recipes/combat/k_98_smithing.json 04cc33abf30999d1bd3727fbb0ebea05e49dee10 data/superbwarfare/advancement/recipes/combat/marlin_smithing.json a31ee42cad8f8342fe45850846cea0668d8d48f6 data/superbwarfare/advancement/recipes/combat/minigun_smithing.json 24327f129812a081f5d0e9a9862d196b92c61121 data/superbwarfare/advancement/recipes/combat/mk_14_smithing.json +2a6cd7f2f722d5ad0d18ec0a9a66c769f95c4b41 data/superbwarfare/advancement/recipes/combat/mosin_nagant_smithing.json 61837e97c4a1ec268bf3bf5fd9c7d2c5329ec068 data/superbwarfare/advancement/recipes/combat/mp_443_smithing.json a8b47e257992a552be1d6b667555ce39c815c668 data/superbwarfare/advancement/recipes/combat/mp_5_smithing.json +5f935eb47674f9ffaf1902da4eca1bea1565a318 data/superbwarfare/advancement/recipes/combat/m_1911_smithing.json a13c7a8fb414e9893660470bf8245f15f9a0c582 data/superbwarfare/advancement/recipes/combat/m_4_smithing.json 6a298b18c327cfb7d16b4ba05ff7dadb2d9748cb data/superbwarfare/advancement/recipes/combat/m_60_smithing.json 4eb0a66691a247601520449657f6de0e8573c5fe data/superbwarfare/advancement/recipes/combat/m_79_smithing.json 59764b0bbf0ffe6dabb82ee1d50fab04de2fd315 data/superbwarfare/advancement/recipes/combat/m_870_smithing.json b53c662c29183aee61f350291a4d83486dc5a257 data/superbwarfare/advancement/recipes/combat/m_98b_smithing.json a4c3e03cfd4bb162e44784ca133228eea265ab60 data/superbwarfare/advancement/recipes/combat/ntw_20_smithing.json +4d3d6cb429d98284ced7cb6734921a00160c0329 data/superbwarfare/advancement/recipes/combat/qbz_95_smithing.json fc36012496b007c0efa611b02b0eb9477390f5da data/superbwarfare/advancement/recipes/combat/rpg_smithing.json f733fe482c5bfe85fae4cd405a83421f36faacf7 data/superbwarfare/advancement/recipes/combat/rpk_smithing.json +8fe957a50404642a7f205f340726289fab881958 data/superbwarfare/advancement/recipes/combat/secondary_cataclysm_smithing.json ff27a7db005aced4c98497d54bc0fe7257910665 data/superbwarfare/advancement/recipes/combat/sentinel_smithing.json 35ac4abfdc090a303954456f6567ac7b4d43ccab data/superbwarfare/advancement/recipes/combat/sks_smithing.json 5f7c2679d73e4fa77b4a983299b5daabadabe587 data/superbwarfare/advancement/recipes/combat/svd_smithing.json +bfed72c523864da45e669c6574c241283aa6d1a0 data/superbwarfare/advancement/recipes/combat/taser_smithing.json 17a7e19e34d86b2bd1bca7633f40f45872f10611 data/superbwarfare/advancement/recipes/combat/trachelium_smithing.json 34b933b550c833112abc1c7d760e4dae4c783f94 data/superbwarfare/advancement/recipes/combat/vector_smithing.json fb31d2e09af64c6a234c0bc43123b95c529babdd data/superbwarfare/advancement/recipes/misc/aa_12_blueprint.json @@ -70,12 +82,16 @@ da78113ebbbca910a4517f589a2e3eb110542df9 data/superbwarfare/advancement/recipes/ 7b5f4164c298334f687ffd1ccba9e0cb3b1f2fbc data/superbwarfare/recipe/aa_12_blueprint.json 3ba2ed55215bd31bd922361dd909eec723ec6be5 data/superbwarfare/recipe/aa_12_smithing.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 +3ac0b666e636af199e6b1ee0e1a229613f4fbc78 data/superbwarfare/recipe/ak_47_smithing.json b5a2b05abd0da94388cbd46b73ae1446db0773b4 data/superbwarfare/recipe/annihilator_blueprint.json 92bad57a8ae8cda860761a949666d10a975daccd data/superbwarfare/recipe/aurelia_sceptre_blueprint.json +99c73c5ae3eda00a95fb33bca02574abe30112ae data/superbwarfare/recipe/aurelia_sceptre_smithing.json cba1ec494c1313b5a84895be16e90a25c0bc754c data/superbwarfare/recipe/bocek_blueprint.json 12953ac27377b7869a68cc67a3874b0e555b381a data/superbwarfare/recipe/bocek_smithing.json ae7c8b9ef2e97948f11bf753660c4ab4e94930e2 data/superbwarfare/recipe/devotion_blueprint.json +4516cd2b8d2ca38c9bfb398dee8fcc0909d95e0d data/superbwarfare/recipe/devotion_smithing.json 1ca96490a6d317f6bc71e05a2dced261b8790c0b data/superbwarfare/recipe/glock_17_blueprint.json 499cbb24af56a133da435b6e38fe8f9c26862dd2 data/superbwarfare/recipe/glock_17_smithing.json 96eef061bdfc9c777dd50669e797b284db47e6ef data/superbwarfare/recipe/glock_18_blueprint.json @@ -86,8 +102,11 @@ c058c56606592457d7fe2bb1ddef5e05abd5a732 data/superbwarfare/recipe/hpj_11_bluepr c591aecdf4b5bab7b206160c0c255470fb3d5684 data/superbwarfare/recipe/hunting_rifle_blueprint.json b725b8a8c4e4c1514df7a44610c4f03335561b01 data/superbwarfare/recipe/hunting_rifle_smithing.json aff87a5a66e7aef395b08067339685954a0f4de2 data/superbwarfare/recipe/insidious_blueprint.json +576853e322953d229f056148612517e13e9784d0 data/superbwarfare/recipe/insidious_smithing.json 1fc1080eb1328b7a91445d083a5ea4bd6e0fdcb4 data/superbwarfare/recipe/javelin_blueprint.json +90d1f438dc8cc0dc26c49a943b84819607488585 data/superbwarfare/recipe/javelin_smithing.json 9ced791c2f2eeb19bab3b7826e05c936953974cc data/superbwarfare/recipe/k_98_blueprint.json +9446bd3818f87e6f849d118a0bc21123587bdb04 data/superbwarfare/recipe/k_98_smithing.json a6935ef289d09a955b17074da622839205534fe5 data/superbwarfare/recipe/m2hb_blueprint.json 31c3dcbd4a07735b31e9f4c0919318897606290d data/superbwarfare/recipe/marlin_blueprint.json 771b135c355c88a55994c47291f949205672a277 data/superbwarfare/recipe/marlin_smithing.json @@ -98,11 +117,13 @@ d0c14cf98dae91136ed3c5c742bb999b5e556676 data/superbwarfare/recipe/mk_14_bluepri b899f64ad5e5510e9b900fa5417171f4aae67da8 data/superbwarfare/recipe/mk_42_blueprint.json 84d9ee65ab0925aaccd3096f798195db59cdaebb data/superbwarfare/recipe/mle_1934_blueprint.json 198ed671f3feaa2011c6b83813e9e6a069d4876b data/superbwarfare/recipe/mosin_nagant_blueprint.json +516f9b37b665b5e1bbcc3adb75b57797815e8481 data/superbwarfare/recipe/mosin_nagant_smithing.json 71ce44b1206bfcb4ad09d682d9107224a16256c4 data/superbwarfare/recipe/mp_443_blueprint.json 277970b96483dff6ab3632c19bb41e65826df7e7 data/superbwarfare/recipe/mp_443_smithing.json df00ef3e60cc91cb273604a3f4efe9e2913694c3 data/superbwarfare/recipe/mp_5_blueprint.json f73e1c3ccb1d4d03f463de384bae3212f27d2752 data/superbwarfare/recipe/mp_5_smithing.json 6f8d226b24413fa9771506e6db21d88231cf8f4f data/superbwarfare/recipe/m_1911_blueprint.json +0ccb3894c4b3f9f4d5e917f7e799f1c9e6aa669f data/superbwarfare/recipe/m_1911_smithing.json bbd88474774729ec85df44f5f735128e27f1a50a data/superbwarfare/recipe/m_4_blueprint.json 874905394cb3032dae8b39a1d9db516a1555b21f data/superbwarfare/recipe/m_4_smithing.json 760cbcc0009f86b15fa6f7e2158d051f8af4d388 data/superbwarfare/recipe/m_60_blueprint.json @@ -116,11 +137,13 @@ a22cb7c546460b175643385a500b2af9d24c6cd7 data/superbwarfare/recipe/m_870_bluepri 33560f69a554b45e66dd10b07e4c8f08c1647b43 data/superbwarfare/recipe/ntw_20_blueprint.json ff117c48405a73e49d29d737132d1c249b0fc3b5 data/superbwarfare/recipe/ntw_20_smithing.json f99ef54062417a7da9882662880469ec1c054d05 data/superbwarfare/recipe/qbz_95_blueprint.json +d9be0b3784bf8ce54692b1317fd0a7e18854ed27 data/superbwarfare/recipe/qbz_95_smithing.json 9c7fe800ff5834fd8a98051dfc28c2c17616df9e data/superbwarfare/recipe/rpg_blueprint.json 63ee17d3e9219cc61d3971516e4aa5b6a57924c8 data/superbwarfare/recipe/rpg_smithing.json 2d9c1b07950aba143ec78afbd4a869fa01d7a75f data/superbwarfare/recipe/rpk_blueprint.json 7d551e1d7226460f9a690ef7a2a4888d577ab3e2 data/superbwarfare/recipe/rpk_smithing.json 70744d4a6da160bab1f480635339bcf946692c4c data/superbwarfare/recipe/secondary_cataclysm_blueprint.json +d7fef75ab1114da28461ae0c50f8cee3d1b58316 data/superbwarfare/recipe/secondary_cataclysm_smithing.json 4f518b1ef8a22e3bc3f70171a8c467310de07d7c data/superbwarfare/recipe/sentinel_blueprint.json 14719ade84f72afa292d94d035642e8573878b83 data/superbwarfare/recipe/sentinel_smithing.json 0512e158416faa91b207f4f7e271dff6e2f12c49 data/superbwarfare/recipe/sks_blueprint.json @@ -128,6 +151,7 @@ ba64964139e39f3f6b359ef46792754f1f5eee29 data/superbwarfare/recipe/sks_smithing. 940339216a1dc73e8e9f090af1b5a638db81581a data/superbwarfare/recipe/svd_blueprint.json a25453be786b0f279d622dd69e4ad85d7a2dae0e data/superbwarfare/recipe/svd_smithing.json 74f766c560a92652471e00af24019caec23cf85c data/superbwarfare/recipe/taser_blueprint.json +2477188c6051ab5c64ead05c984098993b6aa26b data/superbwarfare/recipe/taser_smithing.json 70ce58e30ce229eb6abc9d89ecf9efd4ac52e9dd data/superbwarfare/recipe/trachelium_blueprint.json 92837b92e74b7f08c393616b44eaeb0298317923 data/superbwarfare/recipe/trachelium_smithing.json 3741feed041950f66fa868c1be94b8a682c9cabe data/superbwarfare/recipe/vector_blueprint.json diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/combat/ak_12_smithing.json b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/ak_12_smithing.json new file mode 100644 index 000000000..205647851 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/ak_12_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ak_12_blueprint": { + "conditions": { + "items": [ + { + "items": "superbwarfare:ak_12_blueprint" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:ak_12_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ak_12_blueprint" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:ak_12_smithing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/combat/ak_47_smithing.json b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/ak_47_smithing.json new file mode 100644 index 000000000..a912cdebd --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/ak_47_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ak_47_blueprint": { + "conditions": { + "items": [ + { + "items": "superbwarfare:ak_47_blueprint" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:ak_47_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ak_47_blueprint" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:ak_47_smithing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/combat/aurelia_sceptre_smithing.json b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/aurelia_sceptre_smithing.json new file mode 100644 index 000000000..894875611 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/aurelia_sceptre_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_aurelia_sceptre_blueprint": { + "conditions": { + "items": [ + { + "items": "superbwarfare:aurelia_sceptre_blueprint" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:aurelia_sceptre_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_aurelia_sceptre_blueprint" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:aurelia_sceptre_smithing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/combat/devotion_smithing.json b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/devotion_smithing.json new file mode 100644 index 000000000..50d3b4067 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/devotion_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_devotion_blueprint": { + "conditions": { + "items": [ + { + "items": "superbwarfare:devotion_blueprint" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:devotion_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_devotion_blueprint" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:devotion_smithing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/combat/insidious_smithing.json b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/insidious_smithing.json new file mode 100644 index 000000000..0e7d2ff5a --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/insidious_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_insidious_blueprint": { + "conditions": { + "items": [ + { + "items": "superbwarfare:insidious_blueprint" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:insidious_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_insidious_blueprint" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:insidious_smithing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/combat/javelin_smithing.json b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/javelin_smithing.json new file mode 100644 index 000000000..ae26bbfe0 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/javelin_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_javelin_blueprint": { + "conditions": { + "items": [ + { + "items": "superbwarfare:javelin_blueprint" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:javelin_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_javelin_blueprint" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:javelin_smithing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/combat/k_98_smithing.json b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/k_98_smithing.json new file mode 100644 index 000000000..f0cca0ce7 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/k_98_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_k_98_blueprint": { + "conditions": { + "items": [ + { + "items": "superbwarfare:k_98_blueprint" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:k_98_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_k_98_blueprint" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:k_98_smithing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/combat/m_1911_smithing.json b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/m_1911_smithing.json new file mode 100644 index 000000000..a87ef8b93 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/m_1911_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_m_1911_blueprint": { + "conditions": { + "items": [ + { + "items": "superbwarfare:m_1911_blueprint" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:m_1911_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_m_1911_blueprint" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:m_1911_smithing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/combat/mosin_nagant_smithing.json b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/mosin_nagant_smithing.json new file mode 100644 index 000000000..092925b49 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/mosin_nagant_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_mosin_nagant_blueprint": { + "conditions": { + "items": [ + { + "items": "superbwarfare:mosin_nagant_blueprint" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:mosin_nagant_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_mosin_nagant_blueprint" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:mosin_nagant_smithing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/combat/qbz_95_smithing.json b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/qbz_95_smithing.json new file mode 100644 index 000000000..e53e2c181 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/qbz_95_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_qbz_95_blueprint": { + "conditions": { + "items": [ + { + "items": "superbwarfare:qbz_95_blueprint" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:qbz_95_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_qbz_95_blueprint" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:qbz_95_smithing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/combat/secondary_cataclysm_smithing.json b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/secondary_cataclysm_smithing.json new file mode 100644 index 000000000..0dc7b05bd --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/secondary_cataclysm_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_secondary_cataclysm_blueprint": { + "conditions": { + "items": [ + { + "items": "superbwarfare:secondary_cataclysm_blueprint" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:secondary_cataclysm_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_secondary_cataclysm_blueprint" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:secondary_cataclysm_smithing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/advancement/recipes/combat/taser_smithing.json b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/taser_smithing.json new file mode 100644 index 000000000..4e93c0f72 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/advancement/recipes/combat/taser_smithing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_taser_blueprint": { + "conditions": { + "items": [ + { + "items": "superbwarfare:taser_blueprint" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "superbwarfare:taser_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_taser_blueprint" + ] + ], + "rewards": { + "recipes": [ + "superbwarfare:taser_smithing" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/ak_12_smithing.json b/src/generated/resources/data/superbwarfare/recipe/ak_12_smithing.json similarity index 94% rename from src/main/resources/data/superbwarfare/recipe/ak_12_smithing.json rename to src/generated/resources/data/superbwarfare/recipe/ak_12_smithing.json index 9b8349ae4..c10337f98 100644 --- a/src/main/resources/data/superbwarfare/recipe/ak_12_smithing.json +++ b/src/generated/resources/data/superbwarfare/recipe/ak_12_smithing.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "superbwarfare:ak_12_blueprint" + "addition": { + "tag": "superbwarfare:ingots/steel" }, "base": { "item": "superbwarfare:rare_material_pack" }, - "addition": { - "tag": "superbwarfare:ingots/steel" - }, "result": { + "count": 1, "id": "superbwarfare:ak_12" + }, + "template": { + "item": "superbwarfare:ak_12_blueprint" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/ak_47_smithing.json b/src/generated/resources/data/superbwarfare/recipe/ak_47_smithing.json similarity index 94% rename from src/main/resources/data/superbwarfare/recipe/ak_47_smithing.json rename to src/generated/resources/data/superbwarfare/recipe/ak_47_smithing.json index da1fa7113..c52153959 100644 --- a/src/main/resources/data/superbwarfare/recipe/ak_47_smithing.json +++ b/src/generated/resources/data/superbwarfare/recipe/ak_47_smithing.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "superbwarfare:ak_47_blueprint" + "addition": { + "tag": "minecraft:logs" }, "base": { "item": "superbwarfare:rare_material_pack" }, - "addition": { - "tag": "minecraft:logs" - }, "result": { + "count": 1, "id": "superbwarfare:ak_47" + }, + "template": { + "item": "superbwarfare:ak_47_blueprint" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/aurelia_sceptre_smithing.json b/src/generated/resources/data/superbwarfare/recipe/aurelia_sceptre_smithing.json similarity index 95% rename from src/main/resources/data/superbwarfare/recipe/aurelia_sceptre_smithing.json rename to src/generated/resources/data/superbwarfare/recipe/aurelia_sceptre_smithing.json index 46c45fa8f..9d711a8d4 100644 --- a/src/main/resources/data/superbwarfare/recipe/aurelia_sceptre_smithing.json +++ b/src/generated/resources/data/superbwarfare/recipe/aurelia_sceptre_smithing.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "superbwarfare:aurelia_sceptre_blueprint" + "addition": { + "item": "minecraft:end_crystal" }, "base": { "item": "superbwarfare:legendary_material_pack" }, - "addition": { - "item": "minecraft:end_crystal" - }, "result": { + "count": 1, "id": "superbwarfare:aurelia_sceptre" + }, + "template": { + "item": "superbwarfare:aurelia_sceptre_blueprint" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/devotion_smithing.json b/src/generated/resources/data/superbwarfare/recipe/devotion_smithing.json similarity index 94% rename from src/main/resources/data/superbwarfare/recipe/devotion_smithing.json rename to src/generated/resources/data/superbwarfare/recipe/devotion_smithing.json index 8896424a8..fd528a8ab 100644 --- a/src/main/resources/data/superbwarfare/recipe/devotion_smithing.json +++ b/src/generated/resources/data/superbwarfare/recipe/devotion_smithing.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "superbwarfare:devotion_blueprint" + "addition": { + "tag": "superbwarfare:ingots/cemented_carbide" }, "base": { "item": "superbwarfare:epic_material_pack" }, - "addition": { - "tag": "superbwarfare:ingots/cemented_carbide" - }, "result": { + "count": 1, "id": "superbwarfare:devotion" + }, + "template": { + "item": "superbwarfare:devotion_blueprint" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/insidious_smithing.json b/src/generated/resources/data/superbwarfare/recipe/insidious_smithing.json similarity index 95% rename from src/main/resources/data/superbwarfare/recipe/insidious_smithing.json rename to src/generated/resources/data/superbwarfare/recipe/insidious_smithing.json index 91f6e51e4..fb9cccded 100644 --- a/src/main/resources/data/superbwarfare/recipe/insidious_smithing.json +++ b/src/generated/resources/data/superbwarfare/recipe/insidious_smithing.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "superbwarfare:insidious_blueprint" + "addition": { + "tag": "superbwarfare:ingots/cemented_carbide" }, "base": { "item": "superbwarfare:epic_material_pack" }, - "addition": { - "tag": "superbwarfare:ingots/cemented_carbide" - }, "result": { + "count": 1, "id": "superbwarfare:insidious" + }, + "template": { + "item": "superbwarfare:insidious_blueprint" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/javalin_smithing.json b/src/generated/resources/data/superbwarfare/recipe/javelin_smithing.json similarity index 94% rename from src/main/resources/data/superbwarfare/recipe/javalin_smithing.json rename to src/generated/resources/data/superbwarfare/recipe/javelin_smithing.json index 50db6a1d8..1853410e9 100644 --- a/src/main/resources/data/superbwarfare/recipe/javalin_smithing.json +++ b/src/generated/resources/data/superbwarfare/recipe/javelin_smithing.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "superbwarfare:javelin_blueprint" + "addition": { + "item": "superbwarfare:ancient_cpu" }, "base": { "item": "superbwarfare:legendary_material_pack" }, - "addition": { - "item": "superbwarfare:ancient_cpu" - }, "result": { + "count": 1, "id": "superbwarfare:javelin" + }, + "template": { + "item": "superbwarfare:javelin_blueprint" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/k98_smithing.json b/src/generated/resources/data/superbwarfare/recipe/k_98_smithing.json similarity index 94% rename from src/main/resources/data/superbwarfare/recipe/k98_smithing.json rename to src/generated/resources/data/superbwarfare/recipe/k_98_smithing.json index fe16a164e..e57ce6d9b 100644 --- a/src/main/resources/data/superbwarfare/recipe/k98_smithing.json +++ b/src/generated/resources/data/superbwarfare/recipe/k_98_smithing.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "superbwarfare:k_98_blueprint" + "addition": { + "tag": "minecraft:logs" }, "base": { "item": "superbwarfare:rare_material_pack" }, - "addition": { - "tag": "minecraft:logs" - }, "result": { + "count": 1, "id": "superbwarfare:k_98" + }, + "template": { + "item": "superbwarfare:k_98_blueprint" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/m1911_smithing.json b/src/generated/resources/data/superbwarfare/recipe/m_1911_smithing.json similarity index 94% rename from src/main/resources/data/superbwarfare/recipe/m1911_smithing.json rename to src/generated/resources/data/superbwarfare/recipe/m_1911_smithing.json index f4b56a41b..6c6ae3bfd 100644 --- a/src/main/resources/data/superbwarfare/recipe/m1911_smithing.json +++ b/src/generated/resources/data/superbwarfare/recipe/m_1911_smithing.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "superbwarfare:m_1911_blueprint" + "addition": { + "tag": "superbwarfare:ingots/steel" }, "base": { "item": "superbwarfare:common_material_pack" }, - "addition": { - "tag": "superbwarfare:ingots/steel" - }, "result": { + "count": 1, "id": "superbwarfare:m_1911" + }, + "template": { + "item": "superbwarfare:m_1911_blueprint" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/mosin_nagant_smithing.json b/src/generated/resources/data/superbwarfare/recipe/mosin_nagant_smithing.json similarity index 94% rename from src/main/resources/data/superbwarfare/recipe/mosin_nagant_smithing.json rename to src/generated/resources/data/superbwarfare/recipe/mosin_nagant_smithing.json index c0a5c71ce..feca84b3c 100644 --- a/src/main/resources/data/superbwarfare/recipe/mosin_nagant_smithing.json +++ b/src/generated/resources/data/superbwarfare/recipe/mosin_nagant_smithing.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "superbwarfare:mosin_nagant_blueprint" + "addition": { + "tag": "minecraft:logs" }, "base": { "item": "superbwarfare:rare_material_pack" }, - "addition": { - "tag": "minecraft:logs" - }, "result": { + "count": 1, "id": "superbwarfare:mosin_nagant" + }, + "template": { + "item": "superbwarfare:mosin_nagant_blueprint" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/qbz_95_smithing.json b/src/generated/resources/data/superbwarfare/recipe/qbz_95_smithing.json similarity index 94% rename from src/main/resources/data/superbwarfare/recipe/qbz_95_smithing.json rename to src/generated/resources/data/superbwarfare/recipe/qbz_95_smithing.json index 10cc6fcd3..a5ea08c64 100644 --- a/src/main/resources/data/superbwarfare/recipe/qbz_95_smithing.json +++ b/src/generated/resources/data/superbwarfare/recipe/qbz_95_smithing.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "superbwarfare:qbz_95_blueprint" + "addition": { + "tag": "superbwarfare:ingots/steel" }, "base": { "item": "superbwarfare:rare_material_pack" }, - "addition": { - "tag": "superbwarfare:ingots/steel" - }, "result": { + "count": 1, "id": "superbwarfare:qbz_95" + }, + "template": { + "item": "superbwarfare:qbz_95_blueprint" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/secondary_cataclysm_smithing.json b/src/generated/resources/data/superbwarfare/recipe/secondary_cataclysm_smithing.json similarity index 95% rename from src/main/resources/data/superbwarfare/recipe/secondary_cataclysm_smithing.json rename to src/generated/resources/data/superbwarfare/recipe/secondary_cataclysm_smithing.json index 60548fc44..d6ddd88a7 100644 --- a/src/main/resources/data/superbwarfare/recipe/secondary_cataclysm_smithing.json +++ b/src/generated/resources/data/superbwarfare/recipe/secondary_cataclysm_smithing.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "superbwarfare:secondary_cataclysm_blueprint" + "addition": { + "item": "superbwarfare:knife" }, "base": { "item": "superbwarfare:legendary_material_pack" }, - "addition": { - "item": "superbwarfare:knife" - }, "result": { + "count": 1, "id": "superbwarfare:secondary_cataclysm" + }, + "template": { + "item": "superbwarfare:secondary_cataclysm_blueprint" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/taser_smithing.json b/src/generated/resources/data/superbwarfare/recipe/taser_smithing.json similarity index 94% rename from src/main/resources/data/superbwarfare/recipe/taser_smithing.json rename to src/generated/resources/data/superbwarfare/recipe/taser_smithing.json index f6eb9e123..85b2a78ab 100644 --- a/src/main/resources/data/superbwarfare/recipe/taser_smithing.json +++ b/src/generated/resources/data/superbwarfare/recipe/taser_smithing.json @@ -1,15 +1,16 @@ { "type": "minecraft:smithing_transform", - "template": { - "item": "superbwarfare:taser_blueprint" + "addition": { + "item": "minecraft:yellow_concrete" }, "base": { "item": "superbwarfare:common_material_pack" }, - "addition": { - "item": "minecraft:yellow_concrete" - }, "result": { + "count": 1, "id": "superbwarfare:taser" + }, + "template": { + "item": "superbwarfare:taser_blueprint" } } \ 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 e6d88ea93..ff3798684 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModRecipeProvider.java @@ -55,7 +55,19 @@ public class ModRecipeProvider extends RecipeProvider { gunSmithing(output, ModItems.MARLIN_BLUEPRINT.get(), GunRarity.COMMON, ItemTags.LOGS, ModItems.MARLIN.get()); gunSmithing(output, ModItems.M_870_BLUEPRINT.get(), GunRarity.RARE, ModTags.Items.INGOTS_STEEL, ModItems.M_870.get()); gunSmithing(output, ModItems.M_98B_BLUEPRINT.get(), GunRarity.EPIC, Items.SPYGLASS, ModItems.M_98B.get()); - + gunSmithing(output, ModItems.AK_47_BLUEPRINT.get(), GunRarity.RARE, ItemTags.LOGS, ModItems.AK_47.get()); + gunSmithing(output, ModItems.AK_12_BLUEPRINT.get(), GunRarity.RARE, ModTags.Items.INGOTS_STEEL, ModItems.AK_12.get()); + gunSmithing(output, ModItems.DEVOTION_BLUEPRINT.get(), GunRarity.EPIC, ModTags.Items.INGOTS_CEMENTED_CARBIDE, ModItems.DEVOTION.get()); + gunSmithing(output, ModItems.TASER_BLUEPRINT.get(), GunRarity.COMMON, Items.YELLOW_CONCRETE, ModItems.TASER.get()); + gunSmithing(output, ModItems.M_1911_BLUEPRINT.get(), GunRarity.COMMON, ModTags.Items.INGOTS_STEEL, ModItems.M_1911.get()); + gunSmithing(output, ModItems.QBZ_95_BLUEPRINT.get(), GunRarity.RARE, ModTags.Items.INGOTS_STEEL, ModItems.QBZ_95.get()); + gunSmithing(output, ModItems.K_98_BLUEPRINT.get(), GunRarity.RARE, ItemTags.LOGS, ModItems.K_98.get()); + gunSmithing(output, ModItems.MOSIN_NAGANT_BLUEPRINT.get(), GunRarity.RARE, ItemTags.LOGS, ModItems.MOSIN_NAGANT.get()); + gunSmithing(output, ModItems.JAVELIN_BLUEPRINT.get(), GunRarity.LEGENDARY, ModItems.ANCIENT_CPU.get(), ModItems.JAVELIN.get()); +// gunSmithing(output, ModItems.M_2_HB_BLUEPRINT.get(), GunRarity.RARE, ModTags.Items.INGOTS_STEEL, ModItems.M_2_HB.get()); + gunSmithing(output, ModItems.SECONDARY_CATACLYSM_BLUEPRINT.get(), GunRarity.LEGENDARY, ModItems.KNIFE.get(), ModItems.SECONDARY_CATACLYSM.get()); + gunSmithing(output, ModItems.INSIDIOUS_BLUEPRINT.get(), GunRarity.EPIC, ModTags.Items.INGOTS_CEMENTED_CARBIDE, ModItems.INSIDIOUS.get()); + gunSmithing(output, ModItems.AURELIA_SCEPTRE_BLUEPRINT.get(), GunRarity.LEGENDARY, Items.END_CRYSTAL, ModItems.AURELIA_SCEPTRE.get()); copyBlueprint(output, ModItems.TRACHELIUM_BLUEPRINT.get()); copyBlueprint(output, ModItems.GLOCK_17_BLUEPRINT.get());