From ab392f164859ec48250aa383e0a6b9758e9f54cf Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Wed, 2 Apr 2025 20:11:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E6=A4=8D=E5=90=88=E6=88=90=E9=85=8D?= =?UTF-8?q?=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aa_12_blueprint_crafting.json | 2 +- .../{recipes => recipe}/aa_12_smithing.json | 2 +- .../{recipes => recipe}/ah_6_crafting.json | 2 +- .../ak_12_blueprint_crafting.json | 2 +- .../{recipes => recipe}/ak_12_smithing.json | 2 +- .../ak_47_blueprint_crafting.json | 2 +- .../{recipes => recipe}/ak_47_smithing.json | 2 +- .../ammo_box_crafting.json | 4 ++-- .../ancient_cpu_copy_crafting.json | 2 +- .../annihilator_blueprint_crafting.json | 2 +- .../annihilator_crafting.json | 2 +- .../{recipes => recipe}/ap_head_crafting.json | 2 +- .../ap_shell_crafting.json | 2 +- .../armor_plate_crafting.json | 2 +- .../barbed_wire_crafting.json | 2 +- .../{recipes => recipe}/battery_crafting.json | 2 +- .../battery_crafting_2.json | 6 +++--- .../{recipes => recipe}/big_hammer.json | 2 +- .../{recipes => recipe}/bmp_2_crafting.json | 2 +- .../bocek_blueprint_crafting.json | 2 +- .../{recipes => recipe}/bocek_smithing.json | 2 +- .../{recipes => recipe}/c4_bomb_crafting.json | 2 +- .../c4_bomb_rc_crafting.json | 2 +- .../cannon_core_crafting.json | 2 +- .../{recipes => recipe}/cell_crafting.json | 2 +- .../cemented_carbide_action_crafting.json | 2 +- .../cemented_carbide_barrel_crafting.json | 2 +- .../cemented_carbide_block_crafting.json | 2 +- ..._from_cemented_carbide_block_crafting.json | 2 +- .../cemented_carbide_ingot_blasting.json | 4 +++- .../cemented_carbide_spring_crafting.json | 2 +- .../cemented_carbide_trigger_crafting.json | 2 +- .../charging_station_crafting.json | 4 ++-- .../claymore_crafting.json | 2 +- .../coal_iron_powder_crafting.json | 6 +++--- .../coal_powder_crafting.json | 2 +- .../blasting/crushed_raw_lead_blasting.json | 4 +++- .../blasting/crushed_raw_silver_blasting.json | 4 +++- .../compat/create/crushing/iron_powder.json | 0 .../create/crushing/tungsten_powder.json | 0 .../create/mixing/high_energy_explosives.json | 0 .../copper_plate_crafting.json | 2 +- .../{recipes => recipe}/crowbar_crafting.json | 2 +- .../{recipes => recipe}/defuser_crafting.json | 2 +- .../detonator_crafting.json | 2 +- .../devotion_blueprint_crafting.json | 2 +- .../devotion_smithing.json | 2 +- .../{recipes => recipe}/dog_tag_crafting.json | 2 +- .../dragon_teeth_crafting.json | 2 +- .../{recipes => recipe}/drone_crafting.json | 2 +- .../empty_perk_crafting.json | 2 +- .../firing_parameters_crafting.json | 2 +- .../{recipes => recipe}/fumo_25_crafting.json | 2 +- .../{recipes => recipe}/fusee_crafting.json | 2 +- .../ge_helmet_m_35_crafting.json | 4 ++-- .../{recipes => recipe}/glock17_smithing.json | 2 +- .../glock18_blueprint_crafting.json | 2 +- .../{recipes => recipe}/glock18_smithing.json | 2 +- .../glock_17_blueprint_crafting.json | 2 +- .../{recipes => recipe}/grain_crafting.json | 4 ++-- .../{recipes => recipe}/granade_40mm.json | 2 +- .../handgun_ammo_crafting.json | 4 ++-- .../hang_grenade_crafting.json | 2 +- .../{recipes => recipe}/he_head_crafting.json | 2 +- .../he_shell_crafting.json | 2 +- .../heavy_ammo_crafting.json | 4 ++-- .../heavy_armament_module_crafting.json | 2 +- .../high_energy_explosives_crafting.json | 4 ++-- .../hk_416_blueprint_crafting.json | 2 +- .../{recipes => recipe}/hk_416_smithing.json | 2 +- .../homemade_shotgun_crafting.json | 2 +- .../hunting_rifle_blueprint_crafting.json | 2 +- .../hunting_rifle_smithing.json | 2 +- .../insidious_blueprint_crafting.json | 2 +- .../insidious_smithing.json | 2 +- .../iron_action_crafting.json | 2 +- .../iron_barrel_crafting.json | 2 +- .../iron_ingot_blasting_from_powder.json | 4 +++- .../iron_ingot_smelting_from_powder.json | 4 +++- .../iron_powder_crafting.json | 2 +- .../iron_spring_crafting.json | 2 +- .../iron_trigger_crafting.json | 2 +- .../{recipes => recipe}/javalin_smithing.json | 2 +- .../javelin_blueprint_crafting.json | 2 +- .../javelin_missile_crafting.json | 2 +- ...javelin_missile_to_wire_guide_missile.json | 2 +- .../jump_pad_crafting.json | 2 +- .../k98_blueprint_crafting.json | 2 +- .../{recipes => recipe}/k98_smithing.json | 2 +- .../{recipes => recipe}/knife_crafting.json | 4 ++-- .../large_battery_pack_crafting.json | 2 +- .../large_motor_crafting.json | 2 +- .../large_propeller_crafting.json | 2 +- .../laser_tower_crafting.json | 2 +- .../{recipes => recipe}/lav_150_crafting.json | 2 +- .../lead_block_crafting.json | 4 ++-- .../lead_ingot_blasting.json | 4 +++- .../lead_ingot_blasting_from_ore.json | 4 +++- .../lead_ingot_blasting_from_powder.json | 20 +++++++++++++++++++ .../lead_ingot_crafting.json | 2 +- .../lead_ingot_smelting.json | 4 +++- .../lead_ingot_smelting_from_ore.json | 4 +++- .../light_armament_module_crafting.json | 2 +- .../lunge_mine_crafting.json | 2 +- .../m1911_blueprint_crafting.json | 2 +- .../{recipes => recipe}/m1911_smithing.json | 2 +- .../m2hb_blueprint_crafting.json | 2 +- .../m4_blueprint_crafting.json | 2 +- .../{recipes => recipe}/m4_smithing.json | 2 +- .../m60_blueprint_crafting.json | 2 +- .../{recipes => recipe}/m60_smithing.json | 2 +- .../m79_blueprint_crafting.json | 2 +- .../{recipes => recipe}/m79_smithing.json | 2 +- .../m870_blueprint_crafting.json | 2 +- .../{recipes => recipe}/m870_smithing.json | 2 +- .../{recipes => recipe}/m89b_smithing.json | 2 +- .../m98b_blueprint_crafting.json | 2 +- .../marlin_blueprint_crafting.json | 2 +- .../{recipes => recipe}/marlin_smithing.json | 2 +- .../material_pack_common_crafting.json | 2 +- .../material_pack_epic_crafting.json | 2 +- .../material_pack_legendary_crafting.json | 2 +- .../material_pack_rare_crafting.json | 2 +- .../medium_armament_module_crafting.json | 2 +- .../medium_battery_pack_crafting.json | 2 +- .../minigun_blueprint_crafting.json | 2 +- .../{recipes => recipe}/minigun_smithing.json | 2 +- .../missile_engine_crafting.json | 2 +- .../mk_14_blueprint_crafting.json | 2 +- .../{recipes => recipe}/mk_14_smithing.json | 2 +- .../mk_42_blueprint_crafting.json | 2 +- .../{recipes => recipe}/mk_42_smithing.json | 2 +- .../mle_1934_blueprint_crafting.json | 2 +- .../mle_1934_smithing.json | 2 +- .../{recipes => recipe}/monitor_clear.json | 2 +- .../{recipes => recipe}/monitor_crafting.json | 4 ++-- .../mortar_barrel_crafting.json | 2 +- .../mortar_base_plate_crafting.json | 2 +- .../mortar_bipod_crafting.json | 2 +- .../{recipes => recipe}/mortar_crafting.json | 2 +- .../mortar_shell_crafting.json | 2 +- .../mosin_nagant_blueprint_crafting.json | 2 +- .../mosin_nagant_smithing.json | 2 +- .../{recipes => recipe}/motor_crafting.json | 2 +- .../{recipes => recipe}/mp443_smithing.json | 2 +- .../mp_443_blueprint_crafting.json | 2 +- .../netherite_action_crafting.json | 2 +- .../netherite_barrel_smithing.json | 2 +- .../netherite_spring_crafting.json | 2 +- .../netherite_trigger_crafting.json | 2 +- .../ntw_20_blueprint_crafting.json | 2 +- .../{recipes => recipe}/ntw_20_smithing.json | 2 +- .../perk/ap_bullet_perk_crafting.json | 6 +++--- .../perk/blade_bullet_perk_crafting.json | 2 +- .../perk/butterfly_bullet_perk_crafting.json | 2 +- .../curse_flame_bullet_perk_crafting.json | 2 +- .../perk/he_bullet_perk_crafting.json | 2 +- .../perk/incendiary_bullet_perk_crafting.json | 2 +- .../perk/intelligent_chip_perk_crafting.json | 2 +- .../perk/jhp_bullet_perk_crafting.json | 6 +++--- .../perk/longer_wire_perk_crafting.json | 2 +- .../perk/micro_missile_perk_crafting.json | 2 +- .../perk/poisonous_bullet_perk_crafting.json | 4 ++-- .../powerful_attraction_perk_crafting.json | 2 +- .../perk/regeneration_perk_crafting.json | 2 +- .../perk/silver_bullet_perk_crafting.json | 6 +++--- .../perk/turbo_charger_perk_crafting.json | 2 +- .../perk/volt_overload_perk_crafting.json | 2 +- .../{recipes => recipe}/primer_crafting.json | 4 ++-- .../prism_tank_crafting.json | 2 +- .../propeller_crafting.json | 2 +- .../qbz95_blueprint_crafting.json | 2 +- .../{recipes => recipe}/qbz_95_smithing.json | 2 +- .../raw_cemented_carbide_powder_crafting.json | 8 ++++---- .../reforging_table_crafting.json | 2 +- .../rgo_grenade_crafting.json | 2 +- .../rifle_ammo_crafting.json | 4 ++-- .../rocket_70_crafting.json | 2 +- .../{recipes => recipe}/rocket_crafting.json | 2 +- .../rpg_blueprint_crafting.json | 2 +- .../{recipes => recipe}/rpg_smithing.json | 2 +- .../rpk_blueprint_crafting.json | 2 +- .../{recipes => recipe}/rpk_smithing.json | 2 +- .../ru_chest_6b43_crafting.json | 4 ++-- .../ru_helmet_6b47_crafting.json | 4 ++-- .../{recipes => recipe}/sandbag_crafting.json | 2 +- ...econdary_cataclysm_blueprint_crafting.json | 2 +- .../secondary_cataclysm_smithing.json | 2 +- .../{recipes => recipe}/seeker_crafting.json | 2 +- .../sentinel_blueprint_crafting.json | 2 +- .../sentinel_smithing.json | 2 +- .../shortcut_pack_crafting.json | 2 +- .../shotgun_ammo_crafting.json | 6 +++--- .../silver_block_crafting.json | 4 ++-- .../silver_ingot_blasting.json | 4 +++- .../silver_ingot_blasting_from_ore.json | 4 +++- .../silver_ingot_blasting_from_powder.json | 20 +++++++++++++++++++ .../silver_ingot_crafting.json | 2 +- .../silver_ingot_smelting.json | 4 +++- .../silver_ingot_smelting_from_ore.json | 4 +++- .../sks_blueprint_crafting.json | 2 +- .../{recipes => recipe}/sks_smithing.json | 2 +- .../small_battery_pack_crafting.json | 2 +- .../small_shell_crafting.json | 4 ++-- .../sniper_ammo_crafting.json | 6 +++--- .../speedboat_crafting.json | 2 +- .../steel_action_crafting.json | 2 +- .../steel_barrel_crafting.json | 2 +- .../steel_block_crafting.json | 4 ++-- .../steel_ingot_blasting.json | 4 +++- .../steel_ingot_crafting.json | 2 +- .../steel_spring_crafting.json | 2 +- .../steel_trigger_crafting.json | 2 +- .../svd_blueprint_crafting.json | 2 +- .../{recipes => recipe}/svd_smithing.json | 2 +- .../{recipes => recipe}/target_crafting.json | 2 +- .../taser_blueprint_crafting.json | 2 +- .../taser_electrode_crafting.json | 2 +- .../{recipes => recipe}/taser_smithing.json | 2 +- .../{recipes => recipe}/tom_6_crafting.json | 2 +- .../trachelium_blueprint_crafting.json | 2 +- .../trachelium_smithing.json | 2 +- .../{recipes => recipe}/track_crafting.json | 2 +- .../transcript_crafting.json | 2 +- .../tungsten_block_crafting.json | 4 ++-- .../tungsten_ingot_blasting.json | 4 +++- .../tungsten_ingot_blasting_from_ore.json | 4 +++- .../tungsten_ingot_blasting_from_powder.json | 4 +++- .../tungsten_ingot_crafting.json | 2 +- .../tungsten_powder_crafting.json | 4 ++-- .../tungsten_rod_crafting.json | 4 ++-- .../us_chest_iotv_crafting.json | 2 +- .../us_helmet_pastg_crafting.json | 2 +- .../vector_blueprint_crafting.json | 2 +- .../{recipes => recipe}/vector_smithing.json | 2 +- .../wheel_chair_crafting.json | 2 +- .../{recipes => recipe}/wheel_crafting.json | 4 ++-- ...wire_guide_missile_to_javelin_missile.json | 2 +- .../{recipes => recipe}/xy_100_crafting.json | 2 +- .../lead_ingot_blasting_from_powder.json | 18 ----------------- .../recipes/lead_powder_blasting.json | 9 --------- .../silver_ingot_blasting_from_powder.json | 18 ----------------- 242 files changed, 347 insertions(+), 318 deletions(-) rename src/main/resources/data/superbwarfare/{recipes => recipe}/aa_12_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/aa_12_smithing.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/ah_6_crafting.json (94%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/ak_12_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/ak_12_smithing.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/ak_47_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/ak_47_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/ammo_box_crafting.json (76%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/ancient_cpu_copy_crafting.json (89%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/annihilator_blueprint_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/annihilator_crafting.json (93%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/ap_head_crafting.json (91%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/ap_shell_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/armor_plate_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/barbed_wire_crafting.json (85%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/battery_crafting.json (84%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/battery_crafting_2.json (74%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/big_hammer.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/bmp_2_crafting.json (94%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/bocek_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/bocek_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/c4_bomb_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/c4_bomb_rc_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/cannon_core_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/cell_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/cemented_carbide_action_crafting.json (84%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/cemented_carbide_barrel_crafting.json (84%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/cemented_carbide_block_crafting.json (82%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/cemented_carbide_from_cemented_carbide_block_crafting.json (78%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/cemented_carbide_ingot_blasting.json (72%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/cemented_carbide_spring_crafting.json (84%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/cemented_carbide_trigger_crafting.json (86%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/charging_station_crafting.json (81%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/claymore_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/coal_iron_powder_crafting.json (56%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/coal_powder_crafting.json (84%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/compat/create/blasting/crushed_raw_lead_blasting.json (82%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/compat/create/blasting/crushed_raw_silver_blasting.json (81%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/compat/create/crushing/iron_powder.json (100%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/compat/create/crushing/tungsten_powder.json (100%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/compat/create/mixing/high_energy_explosives.json (100%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/copper_plate_crafting.json (84%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/crowbar_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/defuser_crafting.json (89%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/detonator_crafting.json (89%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/devotion_blueprint_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/devotion_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/dog_tag_crafting.json (86%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/dragon_teeth_crafting.json (86%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/drone_crafting.json (92%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/empty_perk_crafting.json (89%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/firing_parameters_crafting.json (86%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/fumo_25_crafting.json (92%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/fusee_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/ge_helmet_m_35_crafting.json (79%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/glock17_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/glock18_blueprint_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/glock18_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/glock_17_blueprint_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/grain_crafting.json (80%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/granade_40mm.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/handgun_ammo_crafting.json (81%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/hang_grenade_crafting.json (89%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/he_head_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/he_shell_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/heavy_ammo_crafting.json (82%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/heavy_armament_module_crafting.json (89%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/high_energy_explosives_crafting.json (78%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/hk_416_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/hk_416_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/homemade_shotgun_crafting.json (89%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/hunting_rifle_blueprint_crafting.json (86%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/hunting_rifle_smithing.json (85%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/insidious_blueprint_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/insidious_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/iron_action_crafting.json (83%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/iron_barrel_crafting.json (82%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/iron_ingot_blasting_from_powder.json (76%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/iron_ingot_smelting_from_powder.json (76%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/iron_powder_crafting.json (84%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/iron_spring_crafting.json (83%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/iron_trigger_crafting.json (86%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/javalin_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/javelin_blueprint_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/javelin_missile_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/javelin_missile_to_wire_guide_missile.json (79%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/jump_pad_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/k98_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/k98_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/knife_crafting.json (76%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/large_battery_pack_crafting.json (82%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/large_motor_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/large_propeller_crafting.json (86%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/laser_tower_crafting.json (92%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/lav_150_crafting.json (94%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/lead_block_crafting.json (77%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/lead_ingot_blasting.json (74%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/lead_ingot_blasting_from_ore.json (81%) create mode 100644 src/main/resources/data/superbwarfare/recipe/lead_ingot_blasting_from_powder.json rename src/main/resources/data/superbwarfare/{recipes => recipe}/lead_ingot_crafting.json (81%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/lead_ingot_smelting.json (74%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/lead_ingot_smelting_from_ore.json (81%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/light_armament_module_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/lunge_mine_crafting.json (89%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/m1911_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/m1911_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/m2hb_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/m4_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/m4_smithing.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/m60_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/m60_smithing.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/m79_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/m79_smithing.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/m870_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/m870_smithing.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/m89b_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/m98b_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/marlin_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/marlin_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/material_pack_common_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/material_pack_epic_crafting.json (89%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/material_pack_legendary_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/material_pack_rare_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/medium_armament_module_crafting.json (89%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/medium_battery_pack_crafting.json (82%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/minigun_blueprint_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/minigun_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/missile_engine_crafting.json (89%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/mk_14_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/mk_14_smithing.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/mk_42_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/mk_42_smithing.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/mle_1934_blueprint_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/mle_1934_smithing.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/monitor_clear.json (82%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/monitor_crafting.json (85%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/mortar_barrel_crafting.json (86%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/mortar_base_plate_crafting.json (85%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/mortar_bipod_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/mortar_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/mortar_shell_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/mosin_nagant_blueprint_crafting.json (86%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/mosin_nagant_smithing.json (85%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/motor_crafting.json (91%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/mp443_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/mp_443_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/netherite_action_crafting.json (85%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/netherite_barrel_smithing.json (85%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/netherite_spring_crafting.json (85%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/netherite_trigger_crafting.json (85%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/ntw_20_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/ntw_20_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/ap_bullet_perk_crafting.json (67%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/blade_bullet_perk_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/butterfly_bullet_perk_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/curse_flame_bullet_perk_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/he_bullet_perk_crafting.json (89%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/incendiary_bullet_perk_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/intelligent_chip_perk_crafting.json (86%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/jhp_bullet_perk_crafting.json (68%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/longer_wire_perk_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/micro_missile_perk_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/poisonous_bullet_perk_crafting.json (76%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/powerful_attraction_perk_crafting.json (89%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/regeneration_perk_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/silver_bullet_perk_crafting.json (67%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/turbo_charger_perk_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/perk/volt_overload_perk_crafting.json (91%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/primer_crafting.json (75%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/prism_tank_crafting.json (94%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/propeller_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/qbz95_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/qbz_95_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/raw_cemented_carbide_powder_crafting.json (57%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/reforging_table_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/rgo_grenade_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/rifle_ammo_crafting.json (82%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/rocket_70_crafting.json (91%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/rocket_crafting.json (91%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/rpg_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/rpg_smithing.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/rpk_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/rpk_smithing.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/ru_chest_6b43_crafting.json (81%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/ru_helmet_6b47_crafting.json (80%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/sandbag_crafting.json (86%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/secondary_cataclysm_blueprint_crafting.json (85%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/secondary_cataclysm_smithing.json (84%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/seeker_crafting.json (92%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/sentinel_blueprint_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/sentinel_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/shortcut_pack_crafting.json (84%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/shotgun_ammo_crafting.json (73%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/silver_block_crafting.json (76%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/silver_ingot_blasting.json (73%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/silver_ingot_blasting_from_ore.json (80%) create mode 100644 src/main/resources/data/superbwarfare/recipe/silver_ingot_blasting_from_powder.json rename src/main/resources/data/superbwarfare/{recipes => recipe}/silver_ingot_crafting.json (80%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/silver_ingot_smelting.json (73%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/silver_ingot_smelting_from_ore.json (80%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/sks_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/sks_smithing.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/small_battery_pack_crafting.json (81%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/small_shell_crafting.json (84%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/sniper_ammo_crafting.json (73%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/speedboat_crafting.json (95%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/steel_action_crafting.json (86%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/steel_barrel_crafting.json (86%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/steel_block_crafting.json (76%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/steel_ingot_blasting.json (74%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/steel_ingot_crafting.json (81%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/steel_spring_crafting.json (86%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/steel_trigger_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/svd_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/svd_smithing.json (89%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/target_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/taser_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/taser_electrode_crafting.json (86%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/taser_smithing.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/tom_6_crafting.json (91%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/trachelium_blueprint_crafting.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/trachelium_smithing.json (87%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/track_crafting.json (90%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/transcript_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/tungsten_block_crafting.json (75%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/tungsten_ingot_blasting.json (72%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/tungsten_ingot_blasting_from_ore.json (80%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/tungsten_ingot_blasting_from_powder.json (73%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/tungsten_ingot_crafting.json (80%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/tungsten_powder_crafting.json (69%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/tungsten_rod_crafting.json (67%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/us_chest_iotv_crafting.json (89%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/us_helmet_pastg_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/vector_blueprint_crafting.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/vector_smithing.json (88%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/wheel_chair_crafting.json (92%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/wheel_crafting.json (78%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/wire_guide_missile_to_javelin_missile.json (80%) rename src/main/resources/data/superbwarfare/{recipes => recipe}/xy_100_crafting.json (94%) delete mode 100644 src/main/resources/data/superbwarfare/recipes/lead_ingot_blasting_from_powder.json delete mode 100644 src/main/resources/data/superbwarfare/recipes/lead_powder_blasting.json delete mode 100644 src/main/resources/data/superbwarfare/recipes/silver_ingot_blasting_from_powder.json diff --git a/src/main/resources/data/superbwarfare/recipes/aa_12_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/aa_12_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/aa_12_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/aa_12_blueprint_crafting.json index 87bbd1613..4adf4a9bb 100644 --- a/src/main/resources/data/superbwarfare/recipes/aa_12_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/aa_12_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:aa_12_blueprint", + "id": "superbwarfare:aa_12_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/aa_12_smithing.json b/src/main/resources/data/superbwarfare/recipe/aa_12_smithing.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/aa_12_smithing.json rename to src/main/resources/data/superbwarfare/recipe/aa_12_smithing.json index 1f33607fe..e21828c9f 100644 --- a/src/main/resources/data/superbwarfare/recipes/aa_12_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/aa_12_smithing.json @@ -10,6 +10,6 @@ "item": "minecraft:netherite_ingot" }, "result": { - "item": "superbwarfare:aa_12" + "id": "superbwarfare:aa_12" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/ah_6_crafting.json b/src/main/resources/data/superbwarfare/recipe/ah_6_crafting.json similarity index 94% rename from src/main/resources/data/superbwarfare/recipes/ah_6_crafting.json rename to src/main/resources/data/superbwarfare/recipe/ah_6_crafting.json index 404c31d43..ceaab2d90 100644 --- a/src/main/resources/data/superbwarfare/recipes/ah_6_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/ah_6_crafting.json @@ -33,7 +33,7 @@ } }, "result": { - "item": "superbwarfare:container", + "id": "superbwarfare:container", "nbt": { "BlockEntityTag": { "EntityType": "superbwarfare:ah_6" diff --git a/src/main/resources/data/superbwarfare/recipes/ak_12_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/ak_12_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/ak_12_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/ak_12_blueprint_crafting.json index d6e862790..9d2b0c57e 100644 --- a/src/main/resources/data/superbwarfare/recipes/ak_12_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/ak_12_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:ak_12_blueprint", + "id": "superbwarfare:ak_12_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/ak_12_smithing.json b/src/main/resources/data/superbwarfare/recipe/ak_12_smithing.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/ak_12_smithing.json rename to src/main/resources/data/superbwarfare/recipe/ak_12_smithing.json index 8e5e66025..9b8349ae4 100644 --- a/src/main/resources/data/superbwarfare/recipes/ak_12_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/ak_12_smithing.json @@ -10,6 +10,6 @@ "tag": "superbwarfare:ingots/steel" }, "result": { - "item": "superbwarfare:ak_12" + "id": "superbwarfare:ak_12" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/ak_47_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/ak_47_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/ak_47_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/ak_47_blueprint_crafting.json index 4c59d4690..97be3947f 100644 --- a/src/main/resources/data/superbwarfare/recipes/ak_47_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/ak_47_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:ak_47_blueprint", + "id": "superbwarfare:ak_47_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/ak_47_smithing.json b/src/main/resources/data/superbwarfare/recipe/ak_47_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/ak_47_smithing.json rename to src/main/resources/data/superbwarfare/recipe/ak_47_smithing.json index 8b25eaed1..da1fa7113 100644 --- a/src/main/resources/data/superbwarfare/recipes/ak_47_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/ak_47_smithing.json @@ -10,6 +10,6 @@ "tag": "minecraft:logs" }, "result": { - "item": "superbwarfare:ak_47" + "id": "superbwarfare:ak_47" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/ammo_box_crafting.json b/src/main/resources/data/superbwarfare/recipe/ammo_box_crafting.json similarity index 76% rename from src/main/resources/data/superbwarfare/recipes/ammo_box_crafting.json rename to src/main/resources/data/superbwarfare/recipe/ammo_box_crafting.json index 29f1c8565..8eb5098dd 100644 --- a/src/main/resources/data/superbwarfare/recipes/ammo_box_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/ammo_box_crafting.json @@ -10,11 +10,11 @@ "item": "minecraft:iron_ingot" }, "b": { - "tag": "forge:dyes/green" + "tag": "c:dyes/green" } }, "result": { - "item": "superbwarfare:ammo_box", + "id": "superbwarfare:ammo_box", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/ancient_cpu_copy_crafting.json b/src/main/resources/data/superbwarfare/recipe/ancient_cpu_copy_crafting.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/ancient_cpu_copy_crafting.json rename to src/main/resources/data/superbwarfare/recipe/ancient_cpu_copy_crafting.json index a1f030a8a..901c50993 100644 --- a/src/main/resources/data/superbwarfare/recipes/ancient_cpu_copy_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/ancient_cpu_copy_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:ancient_cpu", + "id": "superbwarfare:ancient_cpu", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/annihilator_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/annihilator_blueprint_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/annihilator_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/annihilator_blueprint_crafting.json index 29dcc1466..86f28ce4d 100644 --- a/src/main/resources/data/superbwarfare/recipes/annihilator_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/annihilator_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:annihilator_blueprint", + "id": "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/recipe/annihilator_crafting.json similarity index 93% rename from src/main/resources/data/superbwarfare/recipes/annihilator_crafting.json rename to src/main/resources/data/superbwarfare/recipe/annihilator_crafting.json index b3a1b6557..4d9bf7bb9 100644 --- a/src/main/resources/data/superbwarfare/recipes/annihilator_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/annihilator_crafting.json @@ -24,7 +24,7 @@ } }, "result": { - "item": "superbwarfare:container", + "id": "superbwarfare:container", "nbt": { "BlockEntityTag": { "EntityType": "superbwarfare:annihilator" diff --git a/src/main/resources/data/superbwarfare/recipes/ap_head_crafting.json b/src/main/resources/data/superbwarfare/recipe/ap_head_crafting.json similarity index 91% rename from src/main/resources/data/superbwarfare/recipes/ap_head_crafting.json rename to src/main/resources/data/superbwarfare/recipe/ap_head_crafting.json index ab28cd208..4adbd9273 100644 --- a/src/main/resources/data/superbwarfare/recipes/ap_head_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/ap_head_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:ap_head", + "id": "superbwarfare:ap_head", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/ap_shell_crafting.json b/src/main/resources/data/superbwarfare/recipe/ap_shell_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/ap_shell_crafting.json rename to src/main/resources/data/superbwarfare/recipe/ap_shell_crafting.json index 487b710c8..6b44a2268 100644 --- a/src/main/resources/data/superbwarfare/recipes/ap_shell_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/ap_shell_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:ap_5_inches", + "id": "superbwarfare:ap_5_inches", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/armor_plate_crafting.json b/src/main/resources/data/superbwarfare/recipe/armor_plate_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/armor_plate_crafting.json rename to src/main/resources/data/superbwarfare/recipe/armor_plate_crafting.json index 633110de3..762e58a1e 100644 --- a/src/main/resources/data/superbwarfare/recipes/armor_plate_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/armor_plate_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:armor_plate", + "id": "superbwarfare:armor_plate", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/barbed_wire_crafting.json b/src/main/resources/data/superbwarfare/recipe/barbed_wire_crafting.json similarity index 85% rename from src/main/resources/data/superbwarfare/recipes/barbed_wire_crafting.json rename to src/main/resources/data/superbwarfare/recipe/barbed_wire_crafting.json index cdc5a5618..a193530ed 100644 --- a/src/main/resources/data/superbwarfare/recipes/barbed_wire_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/barbed_wire_crafting.json @@ -13,7 +13,7 @@ } }, "result": { - "item": "superbwarfare:barbed_wire", + "id": "superbwarfare:barbed_wire", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/battery_crafting.json b/src/main/resources/data/superbwarfare/recipe/battery_crafting.json similarity index 84% rename from src/main/resources/data/superbwarfare/recipes/battery_crafting.json rename to src/main/resources/data/superbwarfare/recipe/battery_crafting.json index 9642d4395..6730ebfda 100644 --- a/src/main/resources/data/superbwarfare/recipes/battery_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/battery_crafting.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "superbwarfare:battery", + "id": "superbwarfare:battery", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/battery_crafting_2.json b/src/main/resources/data/superbwarfare/recipe/battery_crafting_2.json similarity index 74% rename from src/main/resources/data/superbwarfare/recipes/battery_crafting_2.json rename to src/main/resources/data/superbwarfare/recipe/battery_crafting_2.json index d02f1e7ec..e11365e66 100644 --- a/src/main/resources/data/superbwarfare/recipes/battery_crafting_2.json +++ b/src/main/resources/data/superbwarfare/recipe/battery_crafting_2.json @@ -8,10 +8,10 @@ ], "key": { "b": { - "tag": "forge:plates/copper" + "tag": "c:plates/copper" }, "c": { - "tag": "forge:glass_panes" + "tag": "c:glass_panes" }, "d": { "item": "minecraft:redstone" @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:battery", + "id": "superbwarfare:battery", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/big_hammer.json b/src/main/resources/data/superbwarfare/recipe/big_hammer.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/big_hammer.json rename to src/main/resources/data/superbwarfare/recipe/big_hammer.json index eb8a50b85..7c8ec8c8d 100644 --- a/src/main/resources/data/superbwarfare/recipes/big_hammer.json +++ b/src/main/resources/data/superbwarfare/recipe/big_hammer.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:hammer", + "id": "superbwarfare:hammer", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/bmp_2_crafting.json b/src/main/resources/data/superbwarfare/recipe/bmp_2_crafting.json similarity index 94% rename from src/main/resources/data/superbwarfare/recipes/bmp_2_crafting.json rename to src/main/resources/data/superbwarfare/recipe/bmp_2_crafting.json index 9f9c4597e..20444c438 100644 --- a/src/main/resources/data/superbwarfare/recipes/bmp_2_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/bmp_2_crafting.json @@ -27,7 +27,7 @@ } }, "result": { - "item": "superbwarfare:container", + "id": "superbwarfare:container", "nbt": { "BlockEntityTag": { "EntityType": "superbwarfare:bmp_2" diff --git a/src/main/resources/data/superbwarfare/recipes/bocek_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/bocek_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/bocek_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/bocek_blueprint_crafting.json index 4fa286886..73a057826 100644 --- a/src/main/resources/data/superbwarfare/recipes/bocek_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/bocek_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:bocek_blueprint", + "id": "superbwarfare:bocek_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/bocek_smithing.json b/src/main/resources/data/superbwarfare/recipe/bocek_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/bocek_smithing.json rename to src/main/resources/data/superbwarfare/recipe/bocek_smithing.json index ce1af4428..4d05441a8 100644 --- a/src/main/resources/data/superbwarfare/recipes/bocek_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/bocek_smithing.json @@ -10,6 +10,6 @@ "item": "minecraft:bow" }, "result": { - "item": "superbwarfare:bocek" + "id": "superbwarfare:bocek" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/c4_bomb_crafting.json b/src/main/resources/data/superbwarfare/recipe/c4_bomb_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/c4_bomb_crafting.json rename to src/main/resources/data/superbwarfare/recipe/c4_bomb_crafting.json index 747409fdf..57e34f930 100644 --- a/src/main/resources/data/superbwarfare/recipes/c4_bomb_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/c4_bomb_crafting.json @@ -15,7 +15,7 @@ } }, "result": { - "item": "superbwarfare:c4_bomb", + "id": "superbwarfare:c4_bomb", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/c4_bomb_rc_crafting.json b/src/main/resources/data/superbwarfare/recipe/c4_bomb_rc_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/c4_bomb_rc_crafting.json rename to src/main/resources/data/superbwarfare/recipe/c4_bomb_rc_crafting.json index 1276171fb..2b1f8ccc0 100644 --- a/src/main/resources/data/superbwarfare/recipes/c4_bomb_rc_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/c4_bomb_rc_crafting.json @@ -15,7 +15,7 @@ } }, "result": { - "item": "superbwarfare:c4_bomb", + "id": "superbwarfare:c4_bomb", "count": 2, "nbt": { "Control": true diff --git a/src/main/resources/data/superbwarfare/recipes/cannon_core_crafting.json b/src/main/resources/data/superbwarfare/recipe/cannon_core_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/cannon_core_crafting.json rename to src/main/resources/data/superbwarfare/recipe/cannon_core_crafting.json index 81c04a5aa..59ca31f8e 100644 --- a/src/main/resources/data/superbwarfare/recipes/cannon_core_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/cannon_core_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:cannon_core", + "id": "superbwarfare:cannon_core", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/cell_crafting.json b/src/main/resources/data/superbwarfare/recipe/cell_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/cell_crafting.json rename to src/main/resources/data/superbwarfare/recipe/cell_crafting.json index 34ffcafa9..1f3f1f797 100644 --- a/src/main/resources/data/superbwarfare/recipes/cell_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/cell_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:cell", + "id": "superbwarfare:cell", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_action_crafting.json b/src/main/resources/data/superbwarfare/recipe/cemented_carbide_action_crafting.json similarity index 84% rename from src/main/resources/data/superbwarfare/recipes/cemented_carbide_action_crafting.json rename to src/main/resources/data/superbwarfare/recipe/cemented_carbide_action_crafting.json index db6aa7651..177dbd80f 100644 --- a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_action_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/cemented_carbide_action_crafting.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "superbwarfare:cemented_carbide_action", + "id": "superbwarfare:cemented_carbide_action", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_barrel_crafting.json b/src/main/resources/data/superbwarfare/recipe/cemented_carbide_barrel_crafting.json similarity index 84% rename from src/main/resources/data/superbwarfare/recipes/cemented_carbide_barrel_crafting.json rename to src/main/resources/data/superbwarfare/recipe/cemented_carbide_barrel_crafting.json index da446a21c..bbc82aab8 100644 --- a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_barrel_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/cemented_carbide_barrel_crafting.json @@ -13,7 +13,7 @@ } }, "result": { - "item": "superbwarfare:cemented_carbide_barrel", + "id": "superbwarfare:cemented_carbide_barrel", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_block_crafting.json b/src/main/resources/data/superbwarfare/recipe/cemented_carbide_block_crafting.json similarity index 82% rename from src/main/resources/data/superbwarfare/recipes/cemented_carbide_block_crafting.json rename to src/main/resources/data/superbwarfare/recipe/cemented_carbide_block_crafting.json index eac622ec3..d35efa8ed 100644 --- a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_block_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/cemented_carbide_block_crafting.json @@ -12,7 +12,7 @@ } }, "result": { - "item": "superbwarfare:cemented_carbide_block", + "id": "superbwarfare:cemented_carbide_block", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_from_cemented_carbide_block_crafting.json b/src/main/resources/data/superbwarfare/recipe/cemented_carbide_from_cemented_carbide_block_crafting.json similarity index 78% rename from src/main/resources/data/superbwarfare/recipes/cemented_carbide_from_cemented_carbide_block_crafting.json rename to src/main/resources/data/superbwarfare/recipe/cemented_carbide_from_cemented_carbide_block_crafting.json index 4f13f79f2..9b73a54fc 100644 --- a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_from_cemented_carbide_block_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/cemented_carbide_from_cemented_carbide_block_crafting.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "superbwarfare:cemented_carbide_ingot", + "id": "superbwarfare:cemented_carbide_ingot", "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_ingot_blasting.json b/src/main/resources/data/superbwarfare/recipe/cemented_carbide_ingot_blasting.json similarity index 72% rename from src/main/resources/data/superbwarfare/recipes/cemented_carbide_ingot_blasting.json rename to src/main/resources/data/superbwarfare/recipe/cemented_carbide_ingot_blasting.json index 0e43deef0..91967cae4 100644 --- a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_ingot_blasting.json +++ b/src/main/resources/data/superbwarfare/recipe/cemented_carbide_ingot_blasting.json @@ -6,5 +6,7 @@ "ingredient": { "item": "superbwarfare:raw_cemented_carbide_powder" }, - "result": "superbwarfare:cemented_carbide_ingot" + "result": { + "id": "superbwarfare:cemented_carbide_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_spring_crafting.json b/src/main/resources/data/superbwarfare/recipe/cemented_carbide_spring_crafting.json similarity index 84% rename from src/main/resources/data/superbwarfare/recipes/cemented_carbide_spring_crafting.json rename to src/main/resources/data/superbwarfare/recipe/cemented_carbide_spring_crafting.json index 7dbc94525..0fe2c92fa 100644 --- a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_spring_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/cemented_carbide_spring_crafting.json @@ -15,7 +15,7 @@ } }, "result": { - "item": "superbwarfare:cemented_carbide_spring", + "id": "superbwarfare:cemented_carbide_spring", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_trigger_crafting.json b/src/main/resources/data/superbwarfare/recipe/cemented_carbide_trigger_crafting.json similarity index 86% rename from src/main/resources/data/superbwarfare/recipes/cemented_carbide_trigger_crafting.json rename to src/main/resources/data/superbwarfare/recipe/cemented_carbide_trigger_crafting.json index bc09e9b75..fe970f9a0 100644 --- a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_trigger_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/cemented_carbide_trigger_crafting.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "superbwarfare:cemented_carbide_trigger", + "id": "superbwarfare:cemented_carbide_trigger", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/charging_station_crafting.json b/src/main/resources/data/superbwarfare/recipe/charging_station_crafting.json similarity index 81% rename from src/main/resources/data/superbwarfare/recipes/charging_station_crafting.json rename to src/main/resources/data/superbwarfare/recipe/charging_station_crafting.json index 007ab288d..3402d0507 100644 --- a/src/main/resources/data/superbwarfare/recipes/charging_station_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/charging_station_crafting.json @@ -8,7 +8,7 @@ ], "key": { "a": { - "tag": "forge:ingots/copper" + "tag": "c:ingots/copper" }, "b": { "item": "minecraft:iron_ingot" @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:charging_station", + "id": "superbwarfare:charging_station", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/claymore_crafting.json b/src/main/resources/data/superbwarfare/recipe/claymore_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/claymore_crafting.json rename to src/main/resources/data/superbwarfare/recipe/claymore_crafting.json index 88bdbc212..d42118f42 100644 --- a/src/main/resources/data/superbwarfare/recipes/claymore_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/claymore_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:claymore_mine", + "id": "superbwarfare:claymore_mine", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/coal_iron_powder_crafting.json b/src/main/resources/data/superbwarfare/recipe/coal_iron_powder_crafting.json similarity index 56% rename from src/main/resources/data/superbwarfare/recipes/coal_iron_powder_crafting.json rename to src/main/resources/data/superbwarfare/recipe/coal_iron_powder_crafting.json index 0226c5177..365dde961 100644 --- a/src/main/resources/data/superbwarfare/recipes/coal_iron_powder_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/coal_iron_powder_crafting.json @@ -3,14 +3,14 @@ "category": "misc", "ingredients": [ { - "tag": "forge:dusts/iron" + "tag": "c:dusts/iron" }, { - "tag": "forge:dusts/coal_coke" + "tag": "c:dusts/coal_coke" } ], "result": { - "item": "superbwarfare:coal_iron_powder", + "id": "superbwarfare:coal_iron_powder", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/coal_powder_crafting.json b/src/main/resources/data/superbwarfare/recipe/coal_powder_crafting.json similarity index 84% rename from src/main/resources/data/superbwarfare/recipes/coal_powder_crafting.json rename to src/main/resources/data/superbwarfare/recipe/coal_powder_crafting.json index 519ce0752..39765542e 100644 --- a/src/main/resources/data/superbwarfare/recipes/coal_powder_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/coal_powder_crafting.json @@ -10,7 +10,7 @@ } ], "result": { - "item": "superbwarfare:coal_powder", + "id": "superbwarfare:coal_powder", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/compat/create/blasting/crushed_raw_lead_blasting.json b/src/main/resources/data/superbwarfare/recipe/compat/create/blasting/crushed_raw_lead_blasting.json similarity index 82% rename from src/main/resources/data/superbwarfare/recipes/compat/create/blasting/crushed_raw_lead_blasting.json rename to src/main/resources/data/superbwarfare/recipe/compat/create/blasting/crushed_raw_lead_blasting.json index 158dfbfeb..ff3237a83 100644 --- a/src/main/resources/data/superbwarfare/recipes/compat/create/blasting/crushed_raw_lead_blasting.json +++ b/src/main/resources/data/superbwarfare/recipe/compat/create/blasting/crushed_raw_lead_blasting.json @@ -6,7 +6,9 @@ "ingredient": { "item": "create:crushed_raw_lead" }, - "result": "superbwarfare:lead_ingot", + "result": { + "id": "superbwarfare:lead_ingot" + }, "conditions": [ { "type": "neoforge:mod_loaded", diff --git a/src/main/resources/data/superbwarfare/recipes/compat/create/blasting/crushed_raw_silver_blasting.json b/src/main/resources/data/superbwarfare/recipe/compat/create/blasting/crushed_raw_silver_blasting.json similarity index 81% rename from src/main/resources/data/superbwarfare/recipes/compat/create/blasting/crushed_raw_silver_blasting.json rename to src/main/resources/data/superbwarfare/recipe/compat/create/blasting/crushed_raw_silver_blasting.json index e98661a0a..9fe464086 100644 --- a/src/main/resources/data/superbwarfare/recipes/compat/create/blasting/crushed_raw_silver_blasting.json +++ b/src/main/resources/data/superbwarfare/recipe/compat/create/blasting/crushed_raw_silver_blasting.json @@ -6,7 +6,9 @@ "ingredient": { "item": "create:crushed_raw_silver" }, - "result": "superbwarfare:silver_ingot", + "result": { + "id": "superbwarfare:silver_ingot" + }, "conditions": [ { "type": "neoforge:mod_loaded", diff --git a/src/main/resources/data/superbwarfare/recipes/compat/create/crushing/iron_powder.json b/src/main/resources/data/superbwarfare/recipe/compat/create/crushing/iron_powder.json similarity index 100% rename from src/main/resources/data/superbwarfare/recipes/compat/create/crushing/iron_powder.json rename to src/main/resources/data/superbwarfare/recipe/compat/create/crushing/iron_powder.json diff --git a/src/main/resources/data/superbwarfare/recipes/compat/create/crushing/tungsten_powder.json b/src/main/resources/data/superbwarfare/recipe/compat/create/crushing/tungsten_powder.json similarity index 100% rename from src/main/resources/data/superbwarfare/recipes/compat/create/crushing/tungsten_powder.json rename to src/main/resources/data/superbwarfare/recipe/compat/create/crushing/tungsten_powder.json diff --git a/src/main/resources/data/superbwarfare/recipes/compat/create/mixing/high_energy_explosives.json b/src/main/resources/data/superbwarfare/recipe/compat/create/mixing/high_energy_explosives.json similarity index 100% rename from src/main/resources/data/superbwarfare/recipes/compat/create/mixing/high_energy_explosives.json rename to src/main/resources/data/superbwarfare/recipe/compat/create/mixing/high_energy_explosives.json diff --git a/src/main/resources/data/superbwarfare/recipes/copper_plate_crafting.json b/src/main/resources/data/superbwarfare/recipe/copper_plate_crafting.json similarity index 84% rename from src/main/resources/data/superbwarfare/recipes/copper_plate_crafting.json rename to src/main/resources/data/superbwarfare/recipe/copper_plate_crafting.json index 12108ae25..8c4dbc7df 100644 --- a/src/main/resources/data/superbwarfare/recipes/copper_plate_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/copper_plate_crafting.json @@ -10,7 +10,7 @@ } ], "result": { - "item": "superbwarfare:copper_plate", + "id": "superbwarfare:copper_plate", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/crowbar_crafting.json b/src/main/resources/data/superbwarfare/recipe/crowbar_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/crowbar_crafting.json rename to src/main/resources/data/superbwarfare/recipe/crowbar_crafting.json index 39fbcff95..05af75900 100644 --- a/src/main/resources/data/superbwarfare/recipes/crowbar_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/crowbar_crafting.json @@ -15,7 +15,7 @@ } }, "result": { - "item": "superbwarfare:crowbar", + "id": "superbwarfare:crowbar", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/defuser_crafting.json b/src/main/resources/data/superbwarfare/recipe/defuser_crafting.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/defuser_crafting.json rename to src/main/resources/data/superbwarfare/recipe/defuser_crafting.json index 9232fd491..9edfad8b8 100644 --- a/src/main/resources/data/superbwarfare/recipes/defuser_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/defuser_crafting.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "superbwarfare:defuser", + "id": "superbwarfare:defuser", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/detonator_crafting.json b/src/main/resources/data/superbwarfare/recipe/detonator_crafting.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/detonator_crafting.json rename to src/main/resources/data/superbwarfare/recipe/detonator_crafting.json index 4b4e23db2..eaad4a1a7 100644 --- a/src/main/resources/data/superbwarfare/recipes/detonator_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/detonator_crafting.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "superbwarfare:detonator", + "id": "superbwarfare:detonator", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/devotion_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/devotion_blueprint_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/devotion_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/devotion_blueprint_crafting.json index 5033f1c60..fb08fc147 100644 --- a/src/main/resources/data/superbwarfare/recipes/devotion_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/devotion_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:devotion_blueprint", + "id": "superbwarfare:devotion_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/devotion_smithing.json b/src/main/resources/data/superbwarfare/recipe/devotion_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/devotion_smithing.json rename to src/main/resources/data/superbwarfare/recipe/devotion_smithing.json index 39c22ea4b..8896424a8 100644 --- a/src/main/resources/data/superbwarfare/recipes/devotion_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/devotion_smithing.json @@ -10,6 +10,6 @@ "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { - "item": "superbwarfare:devotion" + "id": "superbwarfare:devotion" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/dog_tag_crafting.json b/src/main/resources/data/superbwarfare/recipe/dog_tag_crafting.json similarity index 86% rename from src/main/resources/data/superbwarfare/recipes/dog_tag_crafting.json rename to src/main/resources/data/superbwarfare/recipe/dog_tag_crafting.json index 0842d35e7..31cdd32eb 100644 --- a/src/main/resources/data/superbwarfare/recipes/dog_tag_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/dog_tag_crafting.json @@ -13,7 +13,7 @@ } }, "result": { - "item": "superbwarfare:dog_tag", + "id": "superbwarfare:dog_tag", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/dragon_teeth_crafting.json b/src/main/resources/data/superbwarfare/recipe/dragon_teeth_crafting.json similarity index 86% rename from src/main/resources/data/superbwarfare/recipes/dragon_teeth_crafting.json rename to src/main/resources/data/superbwarfare/recipe/dragon_teeth_crafting.json index 952759bc9..4942dca85 100644 --- a/src/main/resources/data/superbwarfare/recipes/dragon_teeth_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/dragon_teeth_crafting.json @@ -15,7 +15,7 @@ } }, "result": { - "item": "superbwarfare:dragon_teeth", + "id": "superbwarfare:dragon_teeth", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/drone_crafting.json b/src/main/resources/data/superbwarfare/recipe/drone_crafting.json similarity index 92% rename from src/main/resources/data/superbwarfare/recipes/drone_crafting.json rename to src/main/resources/data/superbwarfare/recipe/drone_crafting.json index 948a2d899..9a48a326d 100644 --- a/src/main/resources/data/superbwarfare/recipes/drone_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/drone_crafting.json @@ -24,7 +24,7 @@ } }, "result": { - "item": "superbwarfare:drone", + "id": "superbwarfare:drone", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/empty_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/empty_perk_crafting.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/empty_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/empty_perk_crafting.json index e968aeeac..95635493e 100644 --- a/src/main/resources/data/superbwarfare/recipes/empty_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/empty_perk_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:empty_perk", + "id": "superbwarfare:empty_perk", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/firing_parameters_crafting.json b/src/main/resources/data/superbwarfare/recipe/firing_parameters_crafting.json similarity index 86% rename from src/main/resources/data/superbwarfare/recipes/firing_parameters_crafting.json rename to src/main/resources/data/superbwarfare/recipe/firing_parameters_crafting.json index c154abf3c..087ad7d25 100644 --- a/src/main/resources/data/superbwarfare/recipes/firing_parameters_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/firing_parameters_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:firing_parameters", + "id": "superbwarfare:firing_parameters", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/fumo_25_crafting.json b/src/main/resources/data/superbwarfare/recipe/fumo_25_crafting.json similarity index 92% rename from src/main/resources/data/superbwarfare/recipes/fumo_25_crafting.json rename to src/main/resources/data/superbwarfare/recipe/fumo_25_crafting.json index 54886bfc1..ffefacc36 100644 --- a/src/main/resources/data/superbwarfare/recipes/fumo_25_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/fumo_25_crafting.json @@ -24,7 +24,7 @@ } }, "result": { - "item": "superbwarfare:fumo_25", + "id": "superbwarfare:fumo_25", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/fusee_crafting.json b/src/main/resources/data/superbwarfare/recipe/fusee_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/fusee_crafting.json rename to src/main/resources/data/superbwarfare/recipe/fusee_crafting.json index 11d94814b..00a358d5e 100644 --- a/src/main/resources/data/superbwarfare/recipes/fusee_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/fusee_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:fusee", + "id": "superbwarfare:fusee", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/ge_helmet_m_35_crafting.json b/src/main/resources/data/superbwarfare/recipe/ge_helmet_m_35_crafting.json similarity index 79% rename from src/main/resources/data/superbwarfare/recipes/ge_helmet_m_35_crafting.json rename to src/main/resources/data/superbwarfare/recipe/ge_helmet_m_35_crafting.json index 5b091665b..8b00ec0d1 100644 --- a/src/main/resources/data/superbwarfare/recipes/ge_helmet_m_35_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/ge_helmet_m_35_crafting.json @@ -10,14 +10,14 @@ "tag": "superbwarfare:ingots/steel" }, "b": { - "tag": "forge:dyes/black" + "tag": "c:dyes/black" }, "c": { "item": "superbwarfare:steel_ingot" } }, "result": { - "item": "superbwarfare:ge_helmet_m_35", + "id": "superbwarfare:ge_helmet_m_35", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/glock17_smithing.json b/src/main/resources/data/superbwarfare/recipe/glock17_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/glock17_smithing.json rename to src/main/resources/data/superbwarfare/recipe/glock17_smithing.json index 26e3e79d5..e3ffe6024 100644 --- a/src/main/resources/data/superbwarfare/recipes/glock17_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/glock17_smithing.json @@ -10,6 +10,6 @@ "item": "minecraft:iron_ingot" }, "result": { - "item": "superbwarfare:glock_17" + "id": "superbwarfare:glock_17" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/glock18_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/glock18_blueprint_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/glock18_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/glock18_blueprint_crafting.json index cfc4c75a0..e851b9365 100644 --- a/src/main/resources/data/superbwarfare/recipes/glock18_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/glock18_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:glock_18_blueprint", + "id": "superbwarfare:glock_18_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/glock18_smithing.json b/src/main/resources/data/superbwarfare/recipe/glock18_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/glock18_smithing.json rename to src/main/resources/data/superbwarfare/recipe/glock18_smithing.json index 3e8231fd1..38ea67225 100644 --- a/src/main/resources/data/superbwarfare/recipes/glock18_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/glock18_smithing.json @@ -10,6 +10,6 @@ "item": "minecraft:gold_ingot" }, "result": { - "item": "superbwarfare:glock_18" + "id": "superbwarfare:glock_18" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/glock_17_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/glock_17_blueprint_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/glock_17_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/glock_17_blueprint_crafting.json index b69a463eb..941af327f 100644 --- a/src/main/resources/data/superbwarfare/recipes/glock_17_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/glock_17_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:glock_17_blueprint", + "id": "superbwarfare:glock_17_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/grain_crafting.json b/src/main/resources/data/superbwarfare/recipe/grain_crafting.json similarity index 80% rename from src/main/resources/data/superbwarfare/recipes/grain_crafting.json rename to src/main/resources/data/superbwarfare/recipe/grain_crafting.json index f4edbdad6..702150ed7 100644 --- a/src/main/resources/data/superbwarfare/recipes/grain_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/grain_crafting.json @@ -8,7 +8,7 @@ ], "key": { "a": { - "tag": "forge:plates/copper" + "tag": "c:plates/copper" }, "b": { "item": "minecraft:gunpowder" @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:grain", + "id": "superbwarfare:grain", "count": 8 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/granade_40mm.json b/src/main/resources/data/superbwarfare/recipe/granade_40mm.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/granade_40mm.json rename to src/main/resources/data/superbwarfare/recipe/granade_40mm.json index 6a9c2703b..15992c73b 100644 --- a/src/main/resources/data/superbwarfare/recipes/granade_40mm.json +++ b/src/main/resources/data/superbwarfare/recipe/granade_40mm.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:grenade_40mm", + "id": "superbwarfare:grenade_40mm", "count": 6 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/handgun_ammo_crafting.json b/src/main/resources/data/superbwarfare/recipe/handgun_ammo_crafting.json similarity index 81% rename from src/main/resources/data/superbwarfare/recipes/handgun_ammo_crafting.json rename to src/main/resources/data/superbwarfare/recipe/handgun_ammo_crafting.json index 4e4cbef85..81453df0c 100644 --- a/src/main/resources/data/superbwarfare/recipes/handgun_ammo_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/handgun_ammo_crafting.json @@ -11,7 +11,7 @@ "item": "minecraft:copper_ingot" }, "b": { - "tag": "forge:plates/copper" + "tag": "c:plates/copper" }, "c": { "item": "minecraft:gunpowder" @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:handgun_ammo", + "id": "superbwarfare:handgun_ammo", "count": 64 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/hang_grenade_crafting.json b/src/main/resources/data/superbwarfare/recipe/hang_grenade_crafting.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/hang_grenade_crafting.json rename to src/main/resources/data/superbwarfare/recipe/hang_grenade_crafting.json index 65e7e45e9..664f0542a 100644 --- a/src/main/resources/data/superbwarfare/recipes/hang_grenade_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/hang_grenade_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:hand_grenade", + "id": "superbwarfare:hand_grenade", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/he_head_crafting.json b/src/main/resources/data/superbwarfare/recipe/he_head_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/he_head_crafting.json rename to src/main/resources/data/superbwarfare/recipe/he_head_crafting.json index 758b69e36..a02c52e69 100644 --- a/src/main/resources/data/superbwarfare/recipes/he_head_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/he_head_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:he_head", + "id": "superbwarfare:he_head", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/he_shell_crafting.json b/src/main/resources/data/superbwarfare/recipe/he_shell_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/he_shell_crafting.json rename to src/main/resources/data/superbwarfare/recipe/he_shell_crafting.json index c5f1ec5a5..68873479f 100644 --- a/src/main/resources/data/superbwarfare/recipes/he_shell_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/he_shell_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:he_5_inches", + "id": "superbwarfare:he_5_inches", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/heavy_ammo_crafting.json b/src/main/resources/data/superbwarfare/recipe/heavy_ammo_crafting.json similarity index 82% rename from src/main/resources/data/superbwarfare/recipes/heavy_ammo_crafting.json rename to src/main/resources/data/superbwarfare/recipe/heavy_ammo_crafting.json index 94d24b4b9..6301eab6d 100644 --- a/src/main/resources/data/superbwarfare/recipes/heavy_ammo_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/heavy_ammo_crafting.json @@ -11,7 +11,7 @@ "tag": "superbwarfare:ingots/steel" }, "b": { - "tag": "forge:ingots/copper" + "tag": "c:ingots/copper" }, "c": { "item": "minecraft:gunpowder" @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:heavy_ammo", + "id": "superbwarfare:heavy_ammo", "count": 12 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/heavy_armament_module_crafting.json b/src/main/resources/data/superbwarfare/recipe/heavy_armament_module_crafting.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/heavy_armament_module_crafting.json rename to src/main/resources/data/superbwarfare/recipe/heavy_armament_module_crafting.json index 07062600d..b44365a53 100644 --- a/src/main/resources/data/superbwarfare/recipes/heavy_armament_module_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/heavy_armament_module_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:heavy_armament_module", + "id": "superbwarfare:heavy_armament_module", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/high_energy_explosives_crafting.json b/src/main/resources/data/superbwarfare/recipe/high_energy_explosives_crafting.json similarity index 78% rename from src/main/resources/data/superbwarfare/recipes/high_energy_explosives_crafting.json rename to src/main/resources/data/superbwarfare/recipe/high_energy_explosives_crafting.json index 5c8b55c14..d40550413 100644 --- a/src/main/resources/data/superbwarfare/recipes/high_energy_explosives_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/high_energy_explosives_crafting.json @@ -14,11 +14,11 @@ "item": "minecraft:sugar" }, "c": { - "tag": "forge:sand" + "tag": "c:sands" } }, "result": { - "item": "superbwarfare:high_energy_explosives", + "id": "superbwarfare:high_energy_explosives", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/hk_416_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/hk_416_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/hk_416_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/hk_416_blueprint_crafting.json index 42f1e2c06..8beb647f8 100644 --- a/src/main/resources/data/superbwarfare/recipes/hk_416_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/hk_416_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:hk_416_blueprint", + "id": "superbwarfare:hk_416_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/hk_416_smithing.json b/src/main/resources/data/superbwarfare/recipe/hk_416_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/hk_416_smithing.json rename to src/main/resources/data/superbwarfare/recipe/hk_416_smithing.json index 8f50aa9c1..3b72e9d48 100644 --- a/src/main/resources/data/superbwarfare/recipes/hk_416_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/hk_416_smithing.json @@ -10,6 +10,6 @@ "tag": "superbwarfare:ingots/steel" }, "result": { - "item": "superbwarfare:hk_416" + "id": "superbwarfare:hk_416" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/homemade_shotgun_crafting.json b/src/main/resources/data/superbwarfare/recipe/homemade_shotgun_crafting.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/homemade_shotgun_crafting.json rename to src/main/resources/data/superbwarfare/recipe/homemade_shotgun_crafting.json index 45eab5679..83fd1d202 100644 --- a/src/main/resources/data/superbwarfare/recipes/homemade_shotgun_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/homemade_shotgun_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:homemade_shotgun", + "id": "superbwarfare:homemade_shotgun", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/hunting_rifle_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/hunting_rifle_blueprint_crafting.json similarity index 86% rename from src/main/resources/data/superbwarfare/recipes/hunting_rifle_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/hunting_rifle_blueprint_crafting.json index d2fe6fa44..e8f1fd13f 100644 --- a/src/main/resources/data/superbwarfare/recipes/hunting_rifle_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/hunting_rifle_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:hunting_rifle_blueprint", + "id": "superbwarfare:hunting_rifle_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/hunting_rifle_smithing.json b/src/main/resources/data/superbwarfare/recipe/hunting_rifle_smithing.json similarity index 85% rename from src/main/resources/data/superbwarfare/recipes/hunting_rifle_smithing.json rename to src/main/resources/data/superbwarfare/recipe/hunting_rifle_smithing.json index 6d2534a65..7925c9965 100644 --- a/src/main/resources/data/superbwarfare/recipes/hunting_rifle_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/hunting_rifle_smithing.json @@ -10,6 +10,6 @@ "tag": "minecraft:logs" }, "result": { - "item": "superbwarfare:hunting_rifle" + "id": "superbwarfare:hunting_rifle" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/insidious_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/insidious_blueprint_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/insidious_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/insidious_blueprint_crafting.json index 0149f52f6..e3bf8dbd3 100644 --- a/src/main/resources/data/superbwarfare/recipes/insidious_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/insidious_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:insidious_blueprint", + "id": "superbwarfare:insidious_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/insidious_smithing.json b/src/main/resources/data/superbwarfare/recipe/insidious_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/insidious_smithing.json rename to src/main/resources/data/superbwarfare/recipe/insidious_smithing.json index 18cf2296b..91f6e51e4 100644 --- a/src/main/resources/data/superbwarfare/recipes/insidious_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/insidious_smithing.json @@ -10,6 +10,6 @@ "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { - "item": "superbwarfare:insidious" + "id": "superbwarfare:insidious" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/iron_action_crafting.json b/src/main/resources/data/superbwarfare/recipe/iron_action_crafting.json similarity index 83% rename from src/main/resources/data/superbwarfare/recipes/iron_action_crafting.json rename to src/main/resources/data/superbwarfare/recipe/iron_action_crafting.json index 1513a3627..15dd9f940 100644 --- a/src/main/resources/data/superbwarfare/recipes/iron_action_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/iron_action_crafting.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "superbwarfare:iron_action", + "id": "superbwarfare:iron_action", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/iron_barrel_crafting.json b/src/main/resources/data/superbwarfare/recipe/iron_barrel_crafting.json similarity index 82% rename from src/main/resources/data/superbwarfare/recipes/iron_barrel_crafting.json rename to src/main/resources/data/superbwarfare/recipe/iron_barrel_crafting.json index fed8a26e2..5f165688f 100644 --- a/src/main/resources/data/superbwarfare/recipes/iron_barrel_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/iron_barrel_crafting.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "superbwarfare:iron_barrel", + "id": "superbwarfare:iron_barrel", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/iron_ingot_blasting_from_powder.json b/src/main/resources/data/superbwarfare/recipe/iron_ingot_blasting_from_powder.json similarity index 76% rename from src/main/resources/data/superbwarfare/recipes/iron_ingot_blasting_from_powder.json rename to src/main/resources/data/superbwarfare/recipe/iron_ingot_blasting_from_powder.json index 6e47962e2..9ee608df1 100644 --- a/src/main/resources/data/superbwarfare/recipes/iron_ingot_blasting_from_powder.json +++ b/src/main/resources/data/superbwarfare/recipe/iron_ingot_blasting_from_powder.json @@ -6,5 +6,7 @@ "ingredient": { "item": "superbwarfare:iron_powder" }, - "result": "minecraft:iron_ingot" + "result": { + "id": "minecraft:iron_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/iron_ingot_smelting_from_powder.json b/src/main/resources/data/superbwarfare/recipe/iron_ingot_smelting_from_powder.json similarity index 76% rename from src/main/resources/data/superbwarfare/recipes/iron_ingot_smelting_from_powder.json rename to src/main/resources/data/superbwarfare/recipe/iron_ingot_smelting_from_powder.json index 3cde3e6b7..661198114 100644 --- a/src/main/resources/data/superbwarfare/recipes/iron_ingot_smelting_from_powder.json +++ b/src/main/resources/data/superbwarfare/recipe/iron_ingot_smelting_from_powder.json @@ -6,5 +6,7 @@ "ingredient": { "item": "superbwarfare:iron_powder" }, - "result": "minecraft:iron_ingot" + "result": { + "id": "minecraft:iron_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/iron_powder_crafting.json b/src/main/resources/data/superbwarfare/recipe/iron_powder_crafting.json similarity index 84% rename from src/main/resources/data/superbwarfare/recipes/iron_powder_crafting.json rename to src/main/resources/data/superbwarfare/recipe/iron_powder_crafting.json index 3c644b42e..75cf7d806 100644 --- a/src/main/resources/data/superbwarfare/recipes/iron_powder_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/iron_powder_crafting.json @@ -10,7 +10,7 @@ } ], "result": { - "item": "superbwarfare:iron_powder", + "id": "superbwarfare:iron_powder", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/iron_spring_crafting.json b/src/main/resources/data/superbwarfare/recipe/iron_spring_crafting.json similarity index 83% rename from src/main/resources/data/superbwarfare/recipes/iron_spring_crafting.json rename to src/main/resources/data/superbwarfare/recipe/iron_spring_crafting.json index 03965024c..b78db13da 100644 --- a/src/main/resources/data/superbwarfare/recipes/iron_spring_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/iron_spring_crafting.json @@ -12,7 +12,7 @@ } }, "result": { - "item": "superbwarfare:iron_spring", + "id": "superbwarfare:iron_spring", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/iron_trigger_crafting.json b/src/main/resources/data/superbwarfare/recipe/iron_trigger_crafting.json similarity index 86% rename from src/main/resources/data/superbwarfare/recipes/iron_trigger_crafting.json rename to src/main/resources/data/superbwarfare/recipe/iron_trigger_crafting.json index eb6b99176..04a4c7fea 100644 --- a/src/main/resources/data/superbwarfare/recipes/iron_trigger_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/iron_trigger_crafting.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "superbwarfare:iron_trigger", + "id": "superbwarfare:iron_trigger", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/javalin_smithing.json b/src/main/resources/data/superbwarfare/recipe/javalin_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/javalin_smithing.json rename to src/main/resources/data/superbwarfare/recipe/javalin_smithing.json index 65622af24..50db6a1d8 100644 --- a/src/main/resources/data/superbwarfare/recipes/javalin_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/javalin_smithing.json @@ -10,6 +10,6 @@ "item": "superbwarfare:ancient_cpu" }, "result": { - "item": "superbwarfare:javelin" + "id": "superbwarfare:javelin" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/javelin_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/javelin_blueprint_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/javelin_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/javelin_blueprint_crafting.json index d78f8e28f..44a51c537 100644 --- a/src/main/resources/data/superbwarfare/recipes/javelin_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/javelin_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:javelin_blueprint", + "id": "superbwarfare:javelin_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/javelin_missile_crafting.json b/src/main/resources/data/superbwarfare/recipe/javelin_missile_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/javelin_missile_crafting.json rename to src/main/resources/data/superbwarfare/recipe/javelin_missile_crafting.json index 1396424a4..832b7c873 100644 --- a/src/main/resources/data/superbwarfare/recipes/javelin_missile_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/javelin_missile_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:javelin_missile", + "id": "superbwarfare:javelin_missile", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/javelin_missile_to_wire_guide_missile.json b/src/main/resources/data/superbwarfare/recipe/javelin_missile_to_wire_guide_missile.json similarity index 79% rename from src/main/resources/data/superbwarfare/recipes/javelin_missile_to_wire_guide_missile.json rename to src/main/resources/data/superbwarfare/recipe/javelin_missile_to_wire_guide_missile.json index 4715ec933..4def25b59 100644 --- a/src/main/resources/data/superbwarfare/recipes/javelin_missile_to_wire_guide_missile.json +++ b/src/main/resources/data/superbwarfare/recipe/javelin_missile_to_wire_guide_missile.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "superbwarfare:wire_guide_missile", + "id": "superbwarfare:wire_guide_missile", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/jump_pad_crafting.json b/src/main/resources/data/superbwarfare/recipe/jump_pad_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/jump_pad_crafting.json rename to src/main/resources/data/superbwarfare/recipe/jump_pad_crafting.json index dfb156025..deeae7947 100644 --- a/src/main/resources/data/superbwarfare/recipes/jump_pad_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/jump_pad_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:jump_pad", + "id": "superbwarfare:jump_pad", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/k98_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/k98_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/k98_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/k98_blueprint_crafting.json index 599956342..8e2b673a5 100644 --- a/src/main/resources/data/superbwarfare/recipes/k98_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/k98_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:k_98_blueprint", + "id": "superbwarfare:k_98_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/k98_smithing.json b/src/main/resources/data/superbwarfare/recipe/k98_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/k98_smithing.json rename to src/main/resources/data/superbwarfare/recipe/k98_smithing.json index 17a943b6d..fe16a164e 100644 --- a/src/main/resources/data/superbwarfare/recipes/k98_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/k98_smithing.json @@ -10,6 +10,6 @@ "tag": "minecraft:logs" }, "result": { - "item": "superbwarfare:k_98" + "id": "superbwarfare:k_98" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/knife_crafting.json b/src/main/resources/data/superbwarfare/recipe/knife_crafting.json similarity index 76% rename from src/main/resources/data/superbwarfare/recipes/knife_crafting.json rename to src/main/resources/data/superbwarfare/recipe/knife_crafting.json index cfa24cc7c..3aa441b40 100644 --- a/src/main/resources/data/superbwarfare/recipes/knife_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/knife_crafting.json @@ -7,14 +7,14 @@ ], "key": { "a": { - "tag": "forge:ingots/steel" + "tag": "c:ingots/steel" }, "b": { "item": "minecraft:stick" } }, "result": { - "item": "superbwarfare:knife", + "id": "superbwarfare:knife", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/large_battery_pack_crafting.json b/src/main/resources/data/superbwarfare/recipe/large_battery_pack_crafting.json similarity index 82% rename from src/main/resources/data/superbwarfare/recipes/large_battery_pack_crafting.json rename to src/main/resources/data/superbwarfare/recipe/large_battery_pack_crafting.json index d144751a5..0f2470b88 100644 --- a/src/main/resources/data/superbwarfare/recipes/large_battery_pack_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/large_battery_pack_crafting.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "superbwarfare:large_battery_pack", + "id": "superbwarfare:large_battery_pack", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/large_motor_crafting.json b/src/main/resources/data/superbwarfare/recipe/large_motor_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/large_motor_crafting.json rename to src/main/resources/data/superbwarfare/recipe/large_motor_crafting.json index 21e3d812e..a45322865 100644 --- a/src/main/resources/data/superbwarfare/recipes/large_motor_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/large_motor_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:large_motor", + "id": "superbwarfare:large_motor", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/large_propeller_crafting.json b/src/main/resources/data/superbwarfare/recipe/large_propeller_crafting.json similarity index 86% rename from src/main/resources/data/superbwarfare/recipes/large_propeller_crafting.json rename to src/main/resources/data/superbwarfare/recipe/large_propeller_crafting.json index e5c300adb..20d23a2a1 100644 --- a/src/main/resources/data/superbwarfare/recipes/large_propeller_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/large_propeller_crafting.json @@ -15,7 +15,7 @@ } }, "result": { - "item": "superbwarfare:large_propeller", + "id": "superbwarfare:large_propeller", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/laser_tower_crafting.json b/src/main/resources/data/superbwarfare/recipe/laser_tower_crafting.json similarity index 92% rename from src/main/resources/data/superbwarfare/recipes/laser_tower_crafting.json rename to src/main/resources/data/superbwarfare/recipe/laser_tower_crafting.json index b7db6ff05..925366baf 100644 --- a/src/main/resources/data/superbwarfare/recipes/laser_tower_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/laser_tower_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:container", + "id": "superbwarfare:container", "nbt": { "BlockEntityTag": { "EntityType": "superbwarfare:laser_tower" diff --git a/src/main/resources/data/superbwarfare/recipes/lav_150_crafting.json b/src/main/resources/data/superbwarfare/recipe/lav_150_crafting.json similarity index 94% rename from src/main/resources/data/superbwarfare/recipes/lav_150_crafting.json rename to src/main/resources/data/superbwarfare/recipe/lav_150_crafting.json index 12c500c22..505ede3c0 100644 --- a/src/main/resources/data/superbwarfare/recipes/lav_150_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/lav_150_crafting.json @@ -27,7 +27,7 @@ } }, "result": { - "item": "superbwarfare:container", + "id": "superbwarfare:container", "nbt": { "BlockEntityTag": { "EntityType": "superbwarfare:lav_150" diff --git a/src/main/resources/data/superbwarfare/recipes/lead_block_crafting.json b/src/main/resources/data/superbwarfare/recipe/lead_block_crafting.json similarity index 77% rename from src/main/resources/data/superbwarfare/recipes/lead_block_crafting.json rename to src/main/resources/data/superbwarfare/recipe/lead_block_crafting.json index b1c04ef31..80b2d9321 100644 --- a/src/main/resources/data/superbwarfare/recipes/lead_block_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/lead_block_crafting.json @@ -11,11 +11,11 @@ "item": "superbwarfare:lead_ingot" }, "b": { - "tag":"forge:ingots/lead" + "tag": "c:ingots/lead" } }, "result": { - "item": "superbwarfare:lead_block", + "id": "superbwarfare:lead_block", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/lead_ingot_blasting.json b/src/main/resources/data/superbwarfare/recipe/lead_ingot_blasting.json similarity index 74% rename from src/main/resources/data/superbwarfare/recipes/lead_ingot_blasting.json rename to src/main/resources/data/superbwarfare/recipe/lead_ingot_blasting.json index 7b5e4776b..bae7bacc4 100644 --- a/src/main/resources/data/superbwarfare/recipes/lead_ingot_blasting.json +++ b/src/main/resources/data/superbwarfare/recipe/lead_ingot_blasting.json @@ -6,5 +6,7 @@ "ingredient": { "item": "superbwarfare:galena" }, - "result": "superbwarfare:lead_ingot" + "result": { + "id": "superbwarfare:lead_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/lead_ingot_blasting_from_ore.json b/src/main/resources/data/superbwarfare/recipe/lead_ingot_blasting_from_ore.json similarity index 81% rename from src/main/resources/data/superbwarfare/recipes/lead_ingot_blasting_from_ore.json rename to src/main/resources/data/superbwarfare/recipe/lead_ingot_blasting_from_ore.json index 218e268a3..37c12cf17 100644 --- a/src/main/resources/data/superbwarfare/recipes/lead_ingot_blasting_from_ore.json +++ b/src/main/resources/data/superbwarfare/recipe/lead_ingot_blasting_from_ore.json @@ -11,5 +11,7 @@ "item": "superbwarfare:deepslate_galena_ore" } ], - "result": "superbwarfare:lead_ingot" + "result": { + "id": "superbwarfare:lead_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/lead_ingot_blasting_from_powder.json b/src/main/resources/data/superbwarfare/recipe/lead_ingot_blasting_from_powder.json new file mode 100644 index 000000000..7c43bf87c --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipe/lead_ingot_blasting_from_powder.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:blasting", + "cookingtime": 100, + "experience": 0.3, + "ingredient": { + "tag": "c:dusts/lead" + }, + "result": { + "id": "superbwarfare:lead_ingot" + }, + "conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:dusts/lead" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/lead_ingot_crafting.json b/src/main/resources/data/superbwarfare/recipe/lead_ingot_crafting.json similarity index 81% rename from src/main/resources/data/superbwarfare/recipes/lead_ingot_crafting.json rename to src/main/resources/data/superbwarfare/recipe/lead_ingot_crafting.json index 0888bbd84..724b4640c 100644 --- a/src/main/resources/data/superbwarfare/recipes/lead_ingot_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/lead_ingot_crafting.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "superbwarfare:lead_ingot", + "id": "superbwarfare:lead_ingot", "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/lead_ingot_smelting.json b/src/main/resources/data/superbwarfare/recipe/lead_ingot_smelting.json similarity index 74% rename from src/main/resources/data/superbwarfare/recipes/lead_ingot_smelting.json rename to src/main/resources/data/superbwarfare/recipe/lead_ingot_smelting.json index 71435dbf9..68d2288c8 100644 --- a/src/main/resources/data/superbwarfare/recipes/lead_ingot_smelting.json +++ b/src/main/resources/data/superbwarfare/recipe/lead_ingot_smelting.json @@ -6,5 +6,7 @@ "ingredient": { "item": "superbwarfare:galena" }, - "result": "superbwarfare:lead_ingot" + "result": { + "id": "superbwarfare:lead_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/lead_ingot_smelting_from_ore.json b/src/main/resources/data/superbwarfare/recipe/lead_ingot_smelting_from_ore.json similarity index 81% rename from src/main/resources/data/superbwarfare/recipes/lead_ingot_smelting_from_ore.json rename to src/main/resources/data/superbwarfare/recipe/lead_ingot_smelting_from_ore.json index 761449311..8f68c4b9a 100644 --- a/src/main/resources/data/superbwarfare/recipes/lead_ingot_smelting_from_ore.json +++ b/src/main/resources/data/superbwarfare/recipe/lead_ingot_smelting_from_ore.json @@ -11,5 +11,7 @@ "item": "superbwarfare:deepslate_galena_ore" } ], - "result": "superbwarfare:lead_ingot" + "result": { + "id": "superbwarfare:lead_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/light_armament_module_crafting.json b/src/main/resources/data/superbwarfare/recipe/light_armament_module_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/light_armament_module_crafting.json rename to src/main/resources/data/superbwarfare/recipe/light_armament_module_crafting.json index 00e854e77..103f74a9a 100644 --- a/src/main/resources/data/superbwarfare/recipes/light_armament_module_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/light_armament_module_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:light_armament_module", + "id": "superbwarfare:light_armament_module", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/lunge_mine_crafting.json b/src/main/resources/data/superbwarfare/recipe/lunge_mine_crafting.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/lunge_mine_crafting.json rename to src/main/resources/data/superbwarfare/recipe/lunge_mine_crafting.json index 3b6aa7e0d..08d327b50 100644 --- a/src/main/resources/data/superbwarfare/recipes/lunge_mine_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/lunge_mine_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:lunge_mine", + "id": "superbwarfare:lunge_mine", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/m1911_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/m1911_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/m1911_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/m1911_blueprint_crafting.json index 13bf1b400..3e3a5905d 100644 --- a/src/main/resources/data/superbwarfare/recipes/m1911_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/m1911_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:m_1911_blueprint", + "id": "superbwarfare:m_1911_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/m1911_smithing.json b/src/main/resources/data/superbwarfare/recipe/m1911_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/m1911_smithing.json rename to src/main/resources/data/superbwarfare/recipe/m1911_smithing.json index b638b7d1f..f4b56a41b 100644 --- a/src/main/resources/data/superbwarfare/recipes/m1911_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/m1911_smithing.json @@ -10,6 +10,6 @@ "tag": "superbwarfare:ingots/steel" }, "result": { - "item": "superbwarfare:m_1911" + "id": "superbwarfare:m_1911" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/m2hb_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/m2hb_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/m2hb_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/m2hb_blueprint_crafting.json index 08fbccafb..d509a7a68 100644 --- a/src/main/resources/data/superbwarfare/recipes/m2hb_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/m2hb_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:m2hb_blueprint", + "id": "superbwarfare:m2hb_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/m4_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/m4_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/m4_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/m4_blueprint_crafting.json index e85c9d7ec..369c44e99 100644 --- a/src/main/resources/data/superbwarfare/recipes/m4_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/m4_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:m_4_blueprint", + "id": "superbwarfare:m_4_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/m4_smithing.json b/src/main/resources/data/superbwarfare/recipe/m4_smithing.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/m4_smithing.json rename to src/main/resources/data/superbwarfare/recipe/m4_smithing.json index b8d82c675..9b3313026 100644 --- a/src/main/resources/data/superbwarfare/recipes/m4_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/m4_smithing.json @@ -10,6 +10,6 @@ "tag": "superbwarfare:ingots/steel" }, "result": { - "item": "superbwarfare:m_4" + "id": "superbwarfare:m_4" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/m60_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/m60_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/m60_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/m60_blueprint_crafting.json index 468d39646..fcbfdf7b1 100644 --- a/src/main/resources/data/superbwarfare/recipes/m60_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/m60_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:m_60_blueprint", + "id": "superbwarfare:m_60_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/m60_smithing.json b/src/main/resources/data/superbwarfare/recipe/m60_smithing.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/m60_smithing.json rename to src/main/resources/data/superbwarfare/recipe/m60_smithing.json index e801f19a1..ff3e8d3a1 100644 --- a/src/main/resources/data/superbwarfare/recipes/m60_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/m60_smithing.json @@ -10,6 +10,6 @@ "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { - "item": "superbwarfare:m_60" + "id": "superbwarfare:m_60" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/m79_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/m79_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/m79_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/m79_blueprint_crafting.json index 2356f9c6f..d56c8b42b 100644 --- a/src/main/resources/data/superbwarfare/recipes/m79_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/m79_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:m_79_blueprint", + "id": "superbwarfare:m_79_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/m79_smithing.json b/src/main/resources/data/superbwarfare/recipe/m79_smithing.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/m79_smithing.json rename to src/main/resources/data/superbwarfare/recipe/m79_smithing.json index 400f5cba1..09e9e9b4d 100644 --- a/src/main/resources/data/superbwarfare/recipes/m79_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/m79_smithing.json @@ -10,6 +10,6 @@ "item": "minecraft:dispenser" }, "result": { - "item": "superbwarfare:m_79" + "id": "superbwarfare:m_79" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/m870_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/m870_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/m870_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/m870_blueprint_crafting.json index 26f127d74..519f83a7a 100644 --- a/src/main/resources/data/superbwarfare/recipes/m870_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/m870_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:m_870_blueprint", + "id": "superbwarfare:m_870_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/m870_smithing.json b/src/main/resources/data/superbwarfare/recipe/m870_smithing.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/m870_smithing.json rename to src/main/resources/data/superbwarfare/recipe/m870_smithing.json index 582dc649d..43706fcd1 100644 --- a/src/main/resources/data/superbwarfare/recipes/m870_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/m870_smithing.json @@ -10,6 +10,6 @@ "tag": "superbwarfare:ingots/steel" }, "result": { - "item": "superbwarfare:m_870" + "id": "superbwarfare:m_870" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/m89b_smithing.json b/src/main/resources/data/superbwarfare/recipe/m89b_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/m89b_smithing.json rename to src/main/resources/data/superbwarfare/recipe/m89b_smithing.json index 10a6bd841..1357268e8 100644 --- a/src/main/resources/data/superbwarfare/recipes/m89b_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/m89b_smithing.json @@ -10,6 +10,6 @@ "item": "minecraft:spyglass" }, "result": { - "item": "superbwarfare:m_98b" + "id": "superbwarfare:m_98b" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/m98b_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/m98b_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/m98b_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/m98b_blueprint_crafting.json index bb16e0157..5e6d878cc 100644 --- a/src/main/resources/data/superbwarfare/recipes/m98b_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/m98b_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:m_98b_blueprint", + "id": "superbwarfare:m_98b_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/marlin_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/marlin_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/marlin_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/marlin_blueprint_crafting.json index 75bdc3f5c..509ec03d6 100644 --- a/src/main/resources/data/superbwarfare/recipes/marlin_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/marlin_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:marlin_blueprint", + "id": "superbwarfare:marlin_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/marlin_smithing.json b/src/main/resources/data/superbwarfare/recipe/marlin_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/marlin_smithing.json rename to src/main/resources/data/superbwarfare/recipe/marlin_smithing.json index 5cda9ec51..71a8350bc 100644 --- a/src/main/resources/data/superbwarfare/recipes/marlin_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/marlin_smithing.json @@ -10,6 +10,6 @@ "tag": "minecraft:logs" }, "result": { - "item": "superbwarfare:marlin" + "id": "superbwarfare:marlin" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/material_pack_common_crafting.json b/src/main/resources/data/superbwarfare/recipe/material_pack_common_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/material_pack_common_crafting.json rename to src/main/resources/data/superbwarfare/recipe/material_pack_common_crafting.json index 50d48c2ec..040e254bf 100644 --- a/src/main/resources/data/superbwarfare/recipes/material_pack_common_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/material_pack_common_crafting.json @@ -16,7 +16,7 @@ } ], "result": { - "item": "superbwarfare:common_material_pack", + "id": "superbwarfare:common_material_pack", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/material_pack_epic_crafting.json b/src/main/resources/data/superbwarfare/recipe/material_pack_epic_crafting.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/material_pack_epic_crafting.json rename to src/main/resources/data/superbwarfare/recipe/material_pack_epic_crafting.json index dcade2641..1fac34228 100644 --- a/src/main/resources/data/superbwarfare/recipes/material_pack_epic_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/material_pack_epic_crafting.json @@ -16,7 +16,7 @@ } ], "result": { - "item": "superbwarfare:epic_material_pack", + "id": "superbwarfare:epic_material_pack", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/material_pack_legendary_crafting.json b/src/main/resources/data/superbwarfare/recipe/material_pack_legendary_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/material_pack_legendary_crafting.json rename to src/main/resources/data/superbwarfare/recipe/material_pack_legendary_crafting.json index 9d077f719..4ae620254 100644 --- a/src/main/resources/data/superbwarfare/recipes/material_pack_legendary_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/material_pack_legendary_crafting.json @@ -16,7 +16,7 @@ } ], "result": { - "item": "superbwarfare:legendary_material_pack", + "id": "superbwarfare:legendary_material_pack", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/material_pack_rare_crafting.json b/src/main/resources/data/superbwarfare/recipe/material_pack_rare_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/material_pack_rare_crafting.json rename to src/main/resources/data/superbwarfare/recipe/material_pack_rare_crafting.json index 92b3e7f47..4fd4ae405 100644 --- a/src/main/resources/data/superbwarfare/recipes/material_pack_rare_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/material_pack_rare_crafting.json @@ -16,7 +16,7 @@ } ], "result": { - "item": "superbwarfare:rare_material_pack", + "id": "superbwarfare:rare_material_pack", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/medium_armament_module_crafting.json b/src/main/resources/data/superbwarfare/recipe/medium_armament_module_crafting.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/medium_armament_module_crafting.json rename to src/main/resources/data/superbwarfare/recipe/medium_armament_module_crafting.json index 209cb086d..0a216c81b 100644 --- a/src/main/resources/data/superbwarfare/recipes/medium_armament_module_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/medium_armament_module_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:medium_armament_module", + "id": "superbwarfare:medium_armament_module", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/medium_battery_pack_crafting.json b/src/main/resources/data/superbwarfare/recipe/medium_battery_pack_crafting.json similarity index 82% rename from src/main/resources/data/superbwarfare/recipes/medium_battery_pack_crafting.json rename to src/main/resources/data/superbwarfare/recipe/medium_battery_pack_crafting.json index 215940d8e..d14e2a583 100644 --- a/src/main/resources/data/superbwarfare/recipes/medium_battery_pack_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/medium_battery_pack_crafting.json @@ -12,7 +12,7 @@ } }, "result": { - "item": "superbwarfare:medium_battery_pack", + "id": "superbwarfare:medium_battery_pack", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/minigun_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/minigun_blueprint_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/minigun_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/minigun_blueprint_crafting.json index 48acd6e8d..c208a82c4 100644 --- a/src/main/resources/data/superbwarfare/recipes/minigun_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/minigun_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:minigun_blueprint", + "id": "superbwarfare:minigun_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/minigun_smithing.json b/src/main/resources/data/superbwarfare/recipe/minigun_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/minigun_smithing.json rename to src/main/resources/data/superbwarfare/recipe/minigun_smithing.json index f8e05b70f..85b98e102 100644 --- a/src/main/resources/data/superbwarfare/recipes/minigun_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/minigun_smithing.json @@ -10,6 +10,6 @@ "item": "superbwarfare:motor" }, "result": { - "item": "superbwarfare:minigun" + "id": "superbwarfare:minigun" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/missile_engine_crafting.json b/src/main/resources/data/superbwarfare/recipe/missile_engine_crafting.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/missile_engine_crafting.json rename to src/main/resources/data/superbwarfare/recipe/missile_engine_crafting.json index d7eea19c9..306579fa6 100644 --- a/src/main/resources/data/superbwarfare/recipes/missile_engine_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/missile_engine_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:missile_engine", + "id": "superbwarfare:missile_engine", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/mk_14_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/mk_14_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/mk_14_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/mk_14_blueprint_crafting.json index 69a3a2448..faf3c0223 100644 --- a/src/main/resources/data/superbwarfare/recipes/mk_14_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/mk_14_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:mk_14_blueprint", + "id": "superbwarfare:mk_14_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/mk_14_smithing.json b/src/main/resources/data/superbwarfare/recipe/mk_14_smithing.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/mk_14_smithing.json rename to src/main/resources/data/superbwarfare/recipe/mk_14_smithing.json index a41e17722..bf4bbf310 100644 --- a/src/main/resources/data/superbwarfare/recipes/mk_14_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/mk_14_smithing.json @@ -10,6 +10,6 @@ "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { - "item": "superbwarfare:mk_14" + "id": "superbwarfare:mk_14" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/mk_42_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/mk_42_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/mk_42_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/mk_42_blueprint_crafting.json index 728b9d2dc..6e7875409 100644 --- a/src/main/resources/data/superbwarfare/recipes/mk_42_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/mk_42_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:mk_42_blueprint", + "id": "superbwarfare:mk_42_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/mk_42_smithing.json b/src/main/resources/data/superbwarfare/recipe/mk_42_smithing.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/mk_42_smithing.json rename to src/main/resources/data/superbwarfare/recipe/mk_42_smithing.json index c4937bf17..9467102ba 100644 --- a/src/main/resources/data/superbwarfare/recipes/mk_42_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/mk_42_smithing.json @@ -10,7 +10,7 @@ "tag": "superbwarfare:storage_blocks/steel" }, "result": { - "item": "superbwarfare:container", + "id": "superbwarfare:container", "nbt": { "BlockEntityTag": { "EntityType": "superbwarfare:mk_42" diff --git a/src/main/resources/data/superbwarfare/recipes/mle_1934_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/mle_1934_blueprint_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/mle_1934_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/mle_1934_blueprint_crafting.json index aa7b246d2..f21aed03d 100644 --- a/src/main/resources/data/superbwarfare/recipes/mle_1934_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/mle_1934_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:mle_1934_blueprint", + "id": "superbwarfare:mle_1934_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/mle_1934_smithing.json b/src/main/resources/data/superbwarfare/recipe/mle_1934_smithing.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/mle_1934_smithing.json rename to src/main/resources/data/superbwarfare/recipe/mle_1934_smithing.json index 86b4f9afa..2d74b497f 100644 --- a/src/main/resources/data/superbwarfare/recipes/mle_1934_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/mle_1934_smithing.json @@ -10,7 +10,7 @@ "tag": "superbwarfare:storage_blocks/steel" }, "result": { - "item": "superbwarfare:container", + "id": "superbwarfare:container", "nbt": { "BlockEntityTag": { "EntityType": "superbwarfare:mle_1934" diff --git a/src/main/resources/data/superbwarfare/recipes/monitor_clear.json b/src/main/resources/data/superbwarfare/recipe/monitor_clear.json similarity index 82% rename from src/main/resources/data/superbwarfare/recipes/monitor_clear.json rename to src/main/resources/data/superbwarfare/recipe/monitor_clear.json index c22ca7122..9dc6f1704 100644 --- a/src/main/resources/data/superbwarfare/recipes/monitor_clear.json +++ b/src/main/resources/data/superbwarfare/recipe/monitor_clear.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "superbwarfare:monitor", + "id": "superbwarfare:monitor", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/monitor_crafting.json b/src/main/resources/data/superbwarfare/recipe/monitor_crafting.json similarity index 85% rename from src/main/resources/data/superbwarfare/recipes/monitor_crafting.json rename to src/main/resources/data/superbwarfare/recipe/monitor_crafting.json index 1a900469b..d38009380 100644 --- a/src/main/resources/data/superbwarfare/recipes/monitor_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/monitor_crafting.json @@ -20,11 +20,11 @@ "item": "minecraft:amethyst_shard" }, "e": { - "tag": "forge:glass_panes" + "tag": "c:glass_panes" } }, "result": { - "item": "superbwarfare:monitor", + "id": "superbwarfare:monitor", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/mortar_barrel_crafting.json b/src/main/resources/data/superbwarfare/recipe/mortar_barrel_crafting.json similarity index 86% rename from src/main/resources/data/superbwarfare/recipes/mortar_barrel_crafting.json rename to src/main/resources/data/superbwarfare/recipe/mortar_barrel_crafting.json index de11af218..c68033010 100644 --- a/src/main/resources/data/superbwarfare/recipes/mortar_barrel_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/mortar_barrel_crafting.json @@ -15,7 +15,7 @@ } }, "result": { - "item": "superbwarfare:mortar_barrel", + "id": "superbwarfare:mortar_barrel", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/mortar_base_plate_crafting.json b/src/main/resources/data/superbwarfare/recipe/mortar_base_plate_crafting.json similarity index 85% rename from src/main/resources/data/superbwarfare/recipes/mortar_base_plate_crafting.json rename to src/main/resources/data/superbwarfare/recipe/mortar_base_plate_crafting.json index 04cd8253a..a21f00295 100644 --- a/src/main/resources/data/superbwarfare/recipes/mortar_base_plate_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/mortar_base_plate_crafting.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "superbwarfare:mortar_base_plate", + "id": "superbwarfare:mortar_base_plate", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/mortar_bipod_crafting.json b/src/main/resources/data/superbwarfare/recipe/mortar_bipod_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/mortar_bipod_crafting.json rename to src/main/resources/data/superbwarfare/recipe/mortar_bipod_crafting.json index 08c2a3926..caa516fc6 100644 --- a/src/main/resources/data/superbwarfare/recipes/mortar_bipod_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/mortar_bipod_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:mortar_bipod", + "id": "superbwarfare:mortar_bipod", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/mortar_crafting.json b/src/main/resources/data/superbwarfare/recipe/mortar_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/mortar_crafting.json rename to src/main/resources/data/superbwarfare/recipe/mortar_crafting.json index 1b17a9073..0e8d652a3 100644 --- a/src/main/resources/data/superbwarfare/recipes/mortar_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/mortar_crafting.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "superbwarfare:mortar_deployer", + "id": "superbwarfare:mortar_deployer", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/mortar_shell_crafting.json b/src/main/resources/data/superbwarfare/recipe/mortar_shell_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/mortar_shell_crafting.json rename to src/main/resources/data/superbwarfare/recipe/mortar_shell_crafting.json index f8c3dccdf..c40a44ee6 100644 --- a/src/main/resources/data/superbwarfare/recipes/mortar_shell_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/mortar_shell_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:mortar_shell", + "id": "superbwarfare:mortar_shell", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/mosin_nagant_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/mosin_nagant_blueprint_crafting.json similarity index 86% rename from src/main/resources/data/superbwarfare/recipes/mosin_nagant_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/mosin_nagant_blueprint_crafting.json index 5622045b6..060b29488 100644 --- a/src/main/resources/data/superbwarfare/recipes/mosin_nagant_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/mosin_nagant_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:mosin_nagant_blueprint", + "id": "superbwarfare:mosin_nagant_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/mosin_nagant_smithing.json b/src/main/resources/data/superbwarfare/recipe/mosin_nagant_smithing.json similarity index 85% rename from src/main/resources/data/superbwarfare/recipes/mosin_nagant_smithing.json rename to src/main/resources/data/superbwarfare/recipe/mosin_nagant_smithing.json index 72f5df301..c0a5c71ce 100644 --- a/src/main/resources/data/superbwarfare/recipes/mosin_nagant_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/mosin_nagant_smithing.json @@ -10,6 +10,6 @@ "tag": "minecraft:logs" }, "result": { - "item": "superbwarfare:mosin_nagant" + "id": "superbwarfare:mosin_nagant" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/motor_crafting.json b/src/main/resources/data/superbwarfare/recipe/motor_crafting.json similarity index 91% rename from src/main/resources/data/superbwarfare/recipes/motor_crafting.json rename to src/main/resources/data/superbwarfare/recipe/motor_crafting.json index 4d7c926ba..4824150b6 100644 --- a/src/main/resources/data/superbwarfare/recipes/motor_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/motor_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:motor", + "id": "superbwarfare:motor", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/mp443_smithing.json b/src/main/resources/data/superbwarfare/recipe/mp443_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/mp443_smithing.json rename to src/main/resources/data/superbwarfare/recipe/mp443_smithing.json index b1e78c70b..c7f80687d 100644 --- a/src/main/resources/data/superbwarfare/recipes/mp443_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/mp443_smithing.json @@ -10,6 +10,6 @@ "item": "minecraft:iron_ingot" }, "result": { - "item": "superbwarfare:mp_443" + "id": "superbwarfare:mp_443" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/mp_443_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/mp_443_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/mp_443_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/mp_443_blueprint_crafting.json index c86c33fc3..9bb7f2a1e 100644 --- a/src/main/resources/data/superbwarfare/recipes/mp_443_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/mp_443_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:mp_443_blueprint", + "id": "superbwarfare:mp_443_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/netherite_action_crafting.json b/src/main/resources/data/superbwarfare/recipe/netherite_action_crafting.json similarity index 85% rename from src/main/resources/data/superbwarfare/recipes/netherite_action_crafting.json rename to src/main/resources/data/superbwarfare/recipe/netherite_action_crafting.json index 7728fe585..d58b8cd58 100644 --- a/src/main/resources/data/superbwarfare/recipes/netherite_action_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/netherite_action_crafting.json @@ -10,6 +10,6 @@ "item": "minecraft:netherite_ingot" }, "result": { - "item": "superbwarfare:netherite_action" + "id": "superbwarfare:netherite_action" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/netherite_barrel_smithing.json b/src/main/resources/data/superbwarfare/recipe/netherite_barrel_smithing.json similarity index 85% rename from src/main/resources/data/superbwarfare/recipes/netherite_barrel_smithing.json rename to src/main/resources/data/superbwarfare/recipe/netherite_barrel_smithing.json index 841784286..0b00193ab 100644 --- a/src/main/resources/data/superbwarfare/recipes/netherite_barrel_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/netherite_barrel_smithing.json @@ -10,6 +10,6 @@ "item": "minecraft:netherite_ingot" }, "result": { - "item": "superbwarfare:netherite_barrel" + "id": "superbwarfare:netherite_barrel" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/netherite_spring_crafting.json b/src/main/resources/data/superbwarfare/recipe/netherite_spring_crafting.json similarity index 85% rename from src/main/resources/data/superbwarfare/recipes/netherite_spring_crafting.json rename to src/main/resources/data/superbwarfare/recipe/netherite_spring_crafting.json index 8608e41f5..ffe6a23b9 100644 --- a/src/main/resources/data/superbwarfare/recipes/netherite_spring_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/netherite_spring_crafting.json @@ -10,6 +10,6 @@ "item": "minecraft:netherite_ingot" }, "result": { - "item": "superbwarfare:netherite_spring" + "id": "superbwarfare:netherite_spring" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/netherite_trigger_crafting.json b/src/main/resources/data/superbwarfare/recipe/netherite_trigger_crafting.json similarity index 85% rename from src/main/resources/data/superbwarfare/recipes/netherite_trigger_crafting.json rename to src/main/resources/data/superbwarfare/recipe/netherite_trigger_crafting.json index 972122825..e782020b5 100644 --- a/src/main/resources/data/superbwarfare/recipes/netherite_trigger_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/netherite_trigger_crafting.json @@ -10,6 +10,6 @@ "item": "minecraft:netherite_ingot" }, "result": { - "item": "superbwarfare:netherite_trigger" + "id": "superbwarfare:netherite_trigger" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/ntw_20_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/ntw_20_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/ntw_20_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/ntw_20_blueprint_crafting.json index 4f7f2bcf4..a66ebf176 100644 --- a/src/main/resources/data/superbwarfare/recipes/ntw_20_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/ntw_20_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:ntw_20_blueprint", + "id": "superbwarfare:ntw_20_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/ntw_20_smithing.json b/src/main/resources/data/superbwarfare/recipe/ntw_20_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/ntw_20_smithing.json rename to src/main/resources/data/superbwarfare/recipe/ntw_20_smithing.json index 31f57ad89..12726150a 100644 --- a/src/main/resources/data/superbwarfare/recipes/ntw_20_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/ntw_20_smithing.json @@ -10,6 +10,6 @@ "item": "minecraft:spyglass" }, "result": { - "item": "superbwarfare:ntw_20" + "id": "superbwarfare:ntw_20" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/ap_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/ap_bullet_perk_crafting.json similarity index 67% rename from src/main/resources/data/superbwarfare/recipes/perk/ap_bullet_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/ap_bullet_perk_crafting.json index 7e57d3ed1..d7d174102 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/ap_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/ap_bullet_perk_crafting.json @@ -11,14 +11,14 @@ "item": "superbwarfare:empty_perk" }, "b": { - "tag": "neoforge:storage_blocks/tungsten" + "tag": "c:storage_blocks/tungsten" }, "c": { - "tag": "neoforge:ingots/tungsten" + "tag": "c:ingots/tungsten" } }, "result": { - "item": "superbwarfare:ap_bullet", + "id": "superbwarfare:ap_bullet", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/blade_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/blade_bullet_perk_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/perk/blade_bullet_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/blade_bullet_perk_crafting.json index e322b954c..0ea39eac3 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/blade_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/blade_bullet_perk_crafting.json @@ -16,7 +16,7 @@ } ], "result": { - "item": "superbwarfare:blade_bullet", + "id": "superbwarfare:blade_bullet", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/butterfly_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/butterfly_bullet_perk_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/perk/butterfly_bullet_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/butterfly_bullet_perk_crafting.json index c0e1e5c9b..4e916e692 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/butterfly_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/butterfly_bullet_perk_crafting.json @@ -16,7 +16,7 @@ } ], "result": { - "item": "superbwarfare:butterfly_bullet", + "id": "superbwarfare:butterfly_bullet", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/curse_flame_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/curse_flame_bullet_perk_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/perk/curse_flame_bullet_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/curse_flame_bullet_perk_crafting.json index 3e89c2cb4..6778c903c 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/curse_flame_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/curse_flame_bullet_perk_crafting.json @@ -16,7 +16,7 @@ } ], "result": { - "item": "superbwarfare:curse_flame_bullet", + "id": "superbwarfare:curse_flame_bullet", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/he_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/he_bullet_perk_crafting.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/perk/he_bullet_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/he_bullet_perk_crafting.json index c09aacc0d..22fadba97 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/he_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/he_bullet_perk_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:he_bullet", + "id": "superbwarfare:he_bullet", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/incendiary_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/incendiary_bullet_perk_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/perk/incendiary_bullet_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/incendiary_bullet_perk_crafting.json index b69452ebd..d74c87ce9 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/incendiary_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/incendiary_bullet_perk_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:incendiary_bullet", + "id": "superbwarfare:incendiary_bullet", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/intelligent_chip_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/intelligent_chip_perk_crafting.json similarity index 86% rename from src/main/resources/data/superbwarfare/recipes/perk/intelligent_chip_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/intelligent_chip_perk_crafting.json index 39eaaa2aa..b03bc05e0 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/intelligent_chip_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/intelligent_chip_perk_crafting.json @@ -15,7 +15,7 @@ } }, "result": { - "item": "superbwarfare:intelligent_chip", + "id": "superbwarfare:intelligent_chip", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/jhp_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/jhp_bullet_perk_crafting.json similarity index 68% rename from src/main/resources/data/superbwarfare/recipes/perk/jhp_bullet_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/jhp_bullet_perk_crafting.json index e19f8dd10..b59fb8211 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/jhp_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/jhp_bullet_perk_crafting.json @@ -11,14 +11,14 @@ "item": "superbwarfare:empty_perk" }, "b": { - "tag": "neoforge:storage_blocks/copper" + "tag": "c:storage_blocks/copper" }, "c": { - "tag": "neoforge:ingots/copper" + "tag": "c:ingots/copper" } }, "result": { - "item": "superbwarfare:jhp_bullet", + "id": "superbwarfare:jhp_bullet", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/longer_wire_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/longer_wire_perk_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/perk/longer_wire_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/longer_wire_perk_crafting.json index a9493248c..bd08bd489 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/longer_wire_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/longer_wire_perk_crafting.json @@ -15,7 +15,7 @@ } }, "result": { - "item": "superbwarfare:longer_wire", + "id": "superbwarfare:longer_wire", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/micro_missile_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/micro_missile_perk_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/perk/micro_missile_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/micro_missile_perk_crafting.json index 283fde90e..e00321b45 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/micro_missile_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/micro_missile_perk_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:micro_missile", + "id": "superbwarfare:micro_missile", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/poisonous_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/poisonous_bullet_perk_crafting.json similarity index 76% rename from src/main/resources/data/superbwarfare/recipes/perk/poisonous_bullet_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/poisonous_bullet_perk_crafting.json index e7f99e9c4..285cc6449 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/poisonous_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/poisonous_bullet_perk_crafting.json @@ -11,14 +11,14 @@ "item": "superbwarfare:empty_perk" }, "b": { - "tag": "neoforge:storage_blocks/lead" + "tag": "c:storage_blocks/lead" }, "c": { "item":"minecraft:spider_eye" } }, "result": { - "item": "superbwarfare:poisonous_bullet", + "id": "superbwarfare:poisonous_bullet", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/powerful_attraction_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/powerful_attraction_perk_crafting.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/perk/powerful_attraction_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/powerful_attraction_perk_crafting.json index dda957b54..d5a8d27ba 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/powerful_attraction_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/powerful_attraction_perk_crafting.json @@ -24,7 +24,7 @@ } }, "result": { - "item": "superbwarfare:powerful_attraction", + "id": "superbwarfare:powerful_attraction", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/regeneration_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/regeneration_perk_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/perk/regeneration_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/regeneration_perk_crafting.json index a0f48921b..eb8e8171c 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/regeneration_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/regeneration_perk_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:regeneration", + "id": "superbwarfare:regeneration", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/silver_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/silver_bullet_perk_crafting.json similarity index 67% rename from src/main/resources/data/superbwarfare/recipes/perk/silver_bullet_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/silver_bullet_perk_crafting.json index 26d411cf2..24d550fe6 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/silver_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/silver_bullet_perk_crafting.json @@ -11,14 +11,14 @@ "item": "superbwarfare:empty_perk" }, "b": { - "tag":"neoforge:storage_blocks/silver" + "tag":"c:storage_blocks/silver" }, "c": { - "tag":"neoforge:ingots/silver" + "tag":"c:ingots/silver" } }, "result": { - "item": "superbwarfare:silver_bullet", + "id": "superbwarfare:silver_bullet", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/turbo_charger_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/turbo_charger_perk_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/perk/turbo_charger_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/turbo_charger_perk_crafting.json index e4c74a3ae..ed14082a2 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/turbo_charger_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/turbo_charger_perk_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:turbo_charger", + "id": "superbwarfare:turbo_charger", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/perk/volt_overload_perk_crafting.json b/src/main/resources/data/superbwarfare/recipe/perk/volt_overload_perk_crafting.json similarity index 91% rename from src/main/resources/data/superbwarfare/recipes/perk/volt_overload_perk_crafting.json rename to src/main/resources/data/superbwarfare/recipe/perk/volt_overload_perk_crafting.json index 9ee79a5cd..ac033e5b0 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/volt_overload_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/perk/volt_overload_perk_crafting.json @@ -24,7 +24,7 @@ } }, "result": { - "item": "superbwarfare:volt_overload", + "id": "superbwarfare:volt_overload", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/primer_crafting.json b/src/main/resources/data/superbwarfare/recipe/primer_crafting.json similarity index 75% rename from src/main/resources/data/superbwarfare/recipes/primer_crafting.json rename to src/main/resources/data/superbwarfare/recipe/primer_crafting.json index b1a298973..2127a4fce 100644 --- a/src/main/resources/data/superbwarfare/recipes/primer_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/primer_crafting.json @@ -7,14 +7,14 @@ ], "key": { "a": { - "tag": "forge:plates/copper" + "tag": "c:plates/copper" }, "b": { "item": "minecraft:flint" } }, "result": { - "item": "superbwarfare:primer", + "id": "superbwarfare:primer", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/prism_tank_crafting.json b/src/main/resources/data/superbwarfare/recipe/prism_tank_crafting.json similarity index 94% rename from src/main/resources/data/superbwarfare/recipes/prism_tank_crafting.json rename to src/main/resources/data/superbwarfare/recipe/prism_tank_crafting.json index fab44bd11..fd2b709a0 100644 --- a/src/main/resources/data/superbwarfare/recipes/prism_tank_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/prism_tank_crafting.json @@ -27,7 +27,7 @@ } }, "result": { - "item": "superbwarfare:container", + "id": "superbwarfare:container", "nbt": { "BlockEntityTag": { "EntityType": "superbwarfare:prism_tank" diff --git a/src/main/resources/data/superbwarfare/recipes/propeller_crafting.json b/src/main/resources/data/superbwarfare/recipe/propeller_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/propeller_crafting.json rename to src/main/resources/data/superbwarfare/recipe/propeller_crafting.json index 6919c9947..b483505d7 100644 --- a/src/main/resources/data/superbwarfare/recipes/propeller_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/propeller_crafting.json @@ -15,7 +15,7 @@ } }, "result": { - "item": "superbwarfare:propeller", + "id": "superbwarfare:propeller", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/qbz95_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/qbz95_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/qbz95_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/qbz95_blueprint_crafting.json index a4194ba13..00afc65a1 100644 --- a/src/main/resources/data/superbwarfare/recipes/qbz95_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/qbz95_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:qbz_95_blueprint", + "id": "superbwarfare:qbz_95_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/qbz_95_smithing.json b/src/main/resources/data/superbwarfare/recipe/qbz_95_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/qbz_95_smithing.json rename to src/main/resources/data/superbwarfare/recipe/qbz_95_smithing.json index 8a6b9bf25..10cc6fcd3 100644 --- a/src/main/resources/data/superbwarfare/recipes/qbz_95_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/qbz_95_smithing.json @@ -10,6 +10,6 @@ "tag": "superbwarfare:ingots/steel" }, "result": { - "item": "superbwarfare:qbz_95" + "id": "superbwarfare:qbz_95" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/raw_cemented_carbide_powder_crafting.json b/src/main/resources/data/superbwarfare/recipe/raw_cemented_carbide_powder_crafting.json similarity index 57% rename from src/main/resources/data/superbwarfare/recipes/raw_cemented_carbide_powder_crafting.json rename to src/main/resources/data/superbwarfare/recipe/raw_cemented_carbide_powder_crafting.json index 435b48542..992e990bd 100644 --- a/src/main/resources/data/superbwarfare/recipes/raw_cemented_carbide_powder_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/raw_cemented_carbide_powder_crafting.json @@ -8,17 +8,17 @@ ], "key": { "a": { - "tag": "forge:dusts/tungsten" + "tag": "c:dusts/tungsten" }, "b": { - "tag": "forge:dusts/iron" + "tag": "c:dusts/iron" }, "c": { - "tag": "forge:dusts/coal_coke" + "tag": "c:dusts/coal_coke" } }, "result": { - "item": "superbwarfare:raw_cemented_carbide_powder", + "id": "superbwarfare:raw_cemented_carbide_powder", "count": 8 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/reforging_table_crafting.json b/src/main/resources/data/superbwarfare/recipe/reforging_table_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/reforging_table_crafting.json rename to src/main/resources/data/superbwarfare/recipe/reforging_table_crafting.json index a33925267..49f17279b 100644 --- a/src/main/resources/data/superbwarfare/recipes/reforging_table_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/reforging_table_crafting.json @@ -24,7 +24,7 @@ } }, "result": { - "item": "superbwarfare:reforging_table", + "id": "superbwarfare:reforging_table", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/rgo_grenade_crafting.json b/src/main/resources/data/superbwarfare/recipe/rgo_grenade_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/rgo_grenade_crafting.json rename to src/main/resources/data/superbwarfare/recipe/rgo_grenade_crafting.json index 8e19c2a5c..5541d28ae 100644 --- a/src/main/resources/data/superbwarfare/recipes/rgo_grenade_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/rgo_grenade_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:rgo_grenade", + "id": "superbwarfare:rgo_grenade", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/rifle_ammo_crafting.json b/src/main/resources/data/superbwarfare/recipe/rifle_ammo_crafting.json similarity index 82% rename from src/main/resources/data/superbwarfare/recipes/rifle_ammo_crafting.json rename to src/main/resources/data/superbwarfare/recipe/rifle_ammo_crafting.json index 033fd4813..d2ae8cb83 100644 --- a/src/main/resources/data/superbwarfare/recipes/rifle_ammo_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/rifle_ammo_crafting.json @@ -11,7 +11,7 @@ "tag": "superbwarfare:ingots/steel" }, "b": { - "tag": "forge:plates/copper" + "tag": "c:plates/copper" }, "c": { "item": "minecraft:gunpowder" @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:rifle_ammo", + "id": "superbwarfare:rifle_ammo", "count": 48 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/rocket_70_crafting.json b/src/main/resources/data/superbwarfare/recipe/rocket_70_crafting.json similarity index 91% rename from src/main/resources/data/superbwarfare/recipes/rocket_70_crafting.json rename to src/main/resources/data/superbwarfare/recipe/rocket_70_crafting.json index 0e7a82ae2..8ec7bfa7c 100644 --- a/src/main/resources/data/superbwarfare/recipes/rocket_70_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/rocket_70_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:rocket_70", + "id": "superbwarfare:rocket_70", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/rocket_crafting.json b/src/main/resources/data/superbwarfare/recipe/rocket_crafting.json similarity index 91% rename from src/main/resources/data/superbwarfare/recipes/rocket_crafting.json rename to src/main/resources/data/superbwarfare/recipe/rocket_crafting.json index 532b08cc5..1a92789f7 100644 --- a/src/main/resources/data/superbwarfare/recipes/rocket_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/rocket_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:rocket", + "id": "superbwarfare:rocket", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/rpg_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/rpg_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/rpg_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/rpg_blueprint_crafting.json index e31da3a17..450f43960 100644 --- a/src/main/resources/data/superbwarfare/recipes/rpg_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/rpg_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:rpg_blueprint", + "id": "superbwarfare:rpg_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/rpg_smithing.json b/src/main/resources/data/superbwarfare/recipe/rpg_smithing.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/rpg_smithing.json rename to src/main/resources/data/superbwarfare/recipe/rpg_smithing.json index c3e1eae1c..af636a5e3 100644 --- a/src/main/resources/data/superbwarfare/recipes/rpg_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/rpg_smithing.json @@ -10,6 +10,6 @@ "item": "minecraft:dispenser" }, "result": { - "item": "superbwarfare:rpg" + "id": "superbwarfare:rpg" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/rpk_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/rpk_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/rpk_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/rpk_blueprint_crafting.json index 0d374e38d..30856d840 100644 --- a/src/main/resources/data/superbwarfare/recipes/rpk_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/rpk_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:rpk_blueprint", + "id": "superbwarfare:rpk_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/rpk_smithing.json b/src/main/resources/data/superbwarfare/recipe/rpk_smithing.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/rpk_smithing.json rename to src/main/resources/data/superbwarfare/recipe/rpk_smithing.json index 85b7c1ca3..a9e8e0696 100644 --- a/src/main/resources/data/superbwarfare/recipes/rpk_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/rpk_smithing.json @@ -10,6 +10,6 @@ "tag": "minecraft:logs" }, "result": { - "item": "superbwarfare:rpk" + "id": "superbwarfare:rpk" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/ru_chest_6b43_crafting.json b/src/main/resources/data/superbwarfare/recipe/ru_chest_6b43_crafting.json similarity index 81% rename from src/main/resources/data/superbwarfare/recipes/ru_chest_6b43_crafting.json rename to src/main/resources/data/superbwarfare/recipe/ru_chest_6b43_crafting.json index e262cf5a3..9e8954580 100644 --- a/src/main/resources/data/superbwarfare/recipes/ru_chest_6b43_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/ru_chest_6b43_crafting.json @@ -11,14 +11,14 @@ "tag": "superbwarfare:ingots/cemented_carbide" }, "b": { - "tag": "forge:dyes/green" + "tag": "c:dyes/green" }, "c": { "item": "superbwarfare:cemented_carbide_ingot" } }, "result": { - "item": "superbwarfare:ru_chest_6b43", + "id": "superbwarfare:ru_chest_6b43", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/ru_helmet_6b47_crafting.json b/src/main/resources/data/superbwarfare/recipe/ru_helmet_6b47_crafting.json similarity index 80% rename from src/main/resources/data/superbwarfare/recipes/ru_helmet_6b47_crafting.json rename to src/main/resources/data/superbwarfare/recipe/ru_helmet_6b47_crafting.json index fa625b7c2..e44d0d378 100644 --- a/src/main/resources/data/superbwarfare/recipes/ru_helmet_6b47_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/ru_helmet_6b47_crafting.json @@ -10,14 +10,14 @@ "tag": "superbwarfare:ingots/cemented_carbide" }, "b": { - "tag": "forge:dyes/green" + "tag": "c:dyes/green" }, "c": { "item": "superbwarfare:cemented_carbide_ingot" } }, "result": { - "item": "superbwarfare:ru_helmet_6b47", + "id": "superbwarfare:ru_helmet_6b47", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/sandbag_crafting.json b/src/main/resources/data/superbwarfare/recipe/sandbag_crafting.json similarity index 86% rename from src/main/resources/data/superbwarfare/recipes/sandbag_crafting.json rename to src/main/resources/data/superbwarfare/recipe/sandbag_crafting.json index 08ebfd86c..10bcc937a 100644 --- a/src/main/resources/data/superbwarfare/recipes/sandbag_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/sandbag_crafting.json @@ -13,7 +13,7 @@ } }, "result": { - "item": "superbwarfare:sandbag", + "id": "superbwarfare:sandbag", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/secondary_cataclysm_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/secondary_cataclysm_blueprint_crafting.json similarity index 85% rename from src/main/resources/data/superbwarfare/recipes/secondary_cataclysm_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/secondary_cataclysm_blueprint_crafting.json index f34a8e9f4..08c3751fc 100644 --- a/src/main/resources/data/superbwarfare/recipes/secondary_cataclysm_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/secondary_cataclysm_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:secondary_cataclysm_blueprint", + "id": "superbwarfare:secondary_cataclysm_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/secondary_cataclysm_smithing.json b/src/main/resources/data/superbwarfare/recipe/secondary_cataclysm_smithing.json similarity index 84% rename from src/main/resources/data/superbwarfare/recipes/secondary_cataclysm_smithing.json rename to src/main/resources/data/superbwarfare/recipe/secondary_cataclysm_smithing.json index 94715e7a5..60548fc44 100644 --- a/src/main/resources/data/superbwarfare/recipes/secondary_cataclysm_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/secondary_cataclysm_smithing.json @@ -10,6 +10,6 @@ "item": "superbwarfare:knife" }, "result": { - "item": "superbwarfare:secondary_cataclysm" + "id": "superbwarfare:secondary_cataclysm" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/seeker_crafting.json b/src/main/resources/data/superbwarfare/recipe/seeker_crafting.json similarity index 92% rename from src/main/resources/data/superbwarfare/recipes/seeker_crafting.json rename to src/main/resources/data/superbwarfare/recipe/seeker_crafting.json index 3937612d4..6598dbaa7 100644 --- a/src/main/resources/data/superbwarfare/recipes/seeker_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/seeker_crafting.json @@ -24,7 +24,7 @@ } }, "result": { - "item": "superbwarfare:seeker", + "id": "superbwarfare:seeker", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/sentinel_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/sentinel_blueprint_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/sentinel_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/sentinel_blueprint_crafting.json index 5bfe951e9..26ca0be2f 100644 --- a/src/main/resources/data/superbwarfare/recipes/sentinel_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/sentinel_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:sentinel_blueprint", + "id": "superbwarfare:sentinel_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/sentinel_smithing.json b/src/main/resources/data/superbwarfare/recipe/sentinel_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/sentinel_smithing.json rename to src/main/resources/data/superbwarfare/recipe/sentinel_smithing.json index f253ead71..0e9d1ec0c 100644 --- a/src/main/resources/data/superbwarfare/recipes/sentinel_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/sentinel_smithing.json @@ -10,6 +10,6 @@ "item": "superbwarfare:cell" }, "result": { - "item": "superbwarfare:sentinel" + "id": "superbwarfare:sentinel" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/shortcut_pack_crafting.json b/src/main/resources/data/superbwarfare/recipe/shortcut_pack_crafting.json similarity index 84% rename from src/main/resources/data/superbwarfare/recipes/shortcut_pack_crafting.json rename to src/main/resources/data/superbwarfare/recipe/shortcut_pack_crafting.json index cd05a27f7..05b08d78b 100644 --- a/src/main/resources/data/superbwarfare/recipes/shortcut_pack_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/shortcut_pack_crafting.json @@ -10,7 +10,7 @@ } ], "result": { - "item": "superbwarfare:shortcut_pack", + "id": "superbwarfare:shortcut_pack", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/shotgun_ammo_crafting.json b/src/main/resources/data/superbwarfare/recipe/shotgun_ammo_crafting.json similarity index 73% rename from src/main/resources/data/superbwarfare/recipes/shotgun_ammo_crafting.json rename to src/main/resources/data/superbwarfare/recipe/shotgun_ammo_crafting.json index 255babb4c..16bce5665 100644 --- a/src/main/resources/data/superbwarfare/recipes/shotgun_ammo_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/shotgun_ammo_crafting.json @@ -8,10 +8,10 @@ ], "key": { "a": { - "tag": "forge:ingots/lead" + "tag": "c:ingots/lead" }, "b": { - "tag": "forge:plates/copper" + "tag": "c:plates/copper" }, "c": { "item": "minecraft:gunpowder" @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:shotgun_ammo", + "id": "superbwarfare:shotgun_ammo", "count": 24 } } diff --git a/src/main/resources/data/superbwarfare/recipes/silver_block_crafting.json b/src/main/resources/data/superbwarfare/recipe/silver_block_crafting.json similarity index 76% rename from src/main/resources/data/superbwarfare/recipes/silver_block_crafting.json rename to src/main/resources/data/superbwarfare/recipe/silver_block_crafting.json index 51cd9eba1..4a405930c 100644 --- a/src/main/resources/data/superbwarfare/recipes/silver_block_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/silver_block_crafting.json @@ -11,11 +11,11 @@ "item": "superbwarfare:silver_ingot" }, "b": { - "tag":"forge:ingots/silver" + "tag": "c:ingots/silver" } }, "result": { - "item": "superbwarfare:silver_block", + "id": "superbwarfare:silver_block", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/silver_ingot_blasting.json b/src/main/resources/data/superbwarfare/recipe/silver_ingot_blasting.json similarity index 73% rename from src/main/resources/data/superbwarfare/recipes/silver_ingot_blasting.json rename to src/main/resources/data/superbwarfare/recipe/silver_ingot_blasting.json index c9bb5b7ce..709ccf66c 100644 --- a/src/main/resources/data/superbwarfare/recipes/silver_ingot_blasting.json +++ b/src/main/resources/data/superbwarfare/recipe/silver_ingot_blasting.json @@ -6,5 +6,7 @@ "ingredient": { "item": "superbwarfare:raw_silver" }, - "result": "superbwarfare:silver_ingot" + "result": { + "id": "superbwarfare:silver_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/silver_ingot_blasting_from_ore.json b/src/main/resources/data/superbwarfare/recipe/silver_ingot_blasting_from_ore.json similarity index 80% rename from src/main/resources/data/superbwarfare/recipes/silver_ingot_blasting_from_ore.json rename to src/main/resources/data/superbwarfare/recipe/silver_ingot_blasting_from_ore.json index c00f486d7..cbb117327 100644 --- a/src/main/resources/data/superbwarfare/recipes/silver_ingot_blasting_from_ore.json +++ b/src/main/resources/data/superbwarfare/recipe/silver_ingot_blasting_from_ore.json @@ -11,5 +11,7 @@ "item": "superbwarfare:deepslate_silver_ore" } ], - "result": "superbwarfare:silver_ingot" + "result": { + "id": "superbwarfare:silver_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipe/silver_ingot_blasting_from_powder.json b/src/main/resources/data/superbwarfare/recipe/silver_ingot_blasting_from_powder.json new file mode 100644 index 000000000..ae283e1eb --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipe/silver_ingot_blasting_from_powder.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:blasting", + "cookingtime": 100, + "experience": 0.3, + "ingredient": { + "tag": "c:dusts/silver" + }, + "result": { + "id": "superbwarfare:silver_ingot" + }, + "conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:dusts/silver" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/silver_ingot_crafting.json b/src/main/resources/data/superbwarfare/recipe/silver_ingot_crafting.json similarity index 80% rename from src/main/resources/data/superbwarfare/recipes/silver_ingot_crafting.json rename to src/main/resources/data/superbwarfare/recipe/silver_ingot_crafting.json index 2c9dba694..90a6d9f0d 100644 --- a/src/main/resources/data/superbwarfare/recipes/silver_ingot_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/silver_ingot_crafting.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "superbwarfare:silver_ingot", + "id": "superbwarfare:silver_ingot", "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/silver_ingot_smelting.json b/src/main/resources/data/superbwarfare/recipe/silver_ingot_smelting.json similarity index 73% rename from src/main/resources/data/superbwarfare/recipes/silver_ingot_smelting.json rename to src/main/resources/data/superbwarfare/recipe/silver_ingot_smelting.json index d54932e21..8fcaec6ce 100644 --- a/src/main/resources/data/superbwarfare/recipes/silver_ingot_smelting.json +++ b/src/main/resources/data/superbwarfare/recipe/silver_ingot_smelting.json @@ -6,5 +6,7 @@ "ingredient": { "item": "superbwarfare:raw_silver" }, - "result": "superbwarfare:silver_ingot" + "result": { + "id": "superbwarfare:silver_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/silver_ingot_smelting_from_ore.json b/src/main/resources/data/superbwarfare/recipe/silver_ingot_smelting_from_ore.json similarity index 80% rename from src/main/resources/data/superbwarfare/recipes/silver_ingot_smelting_from_ore.json rename to src/main/resources/data/superbwarfare/recipe/silver_ingot_smelting_from_ore.json index 65abfcf5a..781271a2f 100644 --- a/src/main/resources/data/superbwarfare/recipes/silver_ingot_smelting_from_ore.json +++ b/src/main/resources/data/superbwarfare/recipe/silver_ingot_smelting_from_ore.json @@ -11,5 +11,7 @@ "item": "superbwarfare:deepslate_silver_ore" } ], - "result": "superbwarfare:silver_ingot" + "result": { + "id": "superbwarfare:silver_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/sks_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/sks_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/sks_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/sks_blueprint_crafting.json index de5765186..d7bd12f61 100644 --- a/src/main/resources/data/superbwarfare/recipes/sks_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/sks_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:sks_blueprint", + "id": "superbwarfare:sks_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/sks_smithing.json b/src/main/resources/data/superbwarfare/recipe/sks_smithing.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/sks_smithing.json rename to src/main/resources/data/superbwarfare/recipe/sks_smithing.json index 559a1fecc..8a0ac3400 100644 --- a/src/main/resources/data/superbwarfare/recipes/sks_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/sks_smithing.json @@ -10,6 +10,6 @@ "tag": "minecraft:logs" }, "result": { - "item": "superbwarfare:sks" + "id": "superbwarfare:sks" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/small_battery_pack_crafting.json b/src/main/resources/data/superbwarfare/recipe/small_battery_pack_crafting.json similarity index 81% rename from src/main/resources/data/superbwarfare/recipes/small_battery_pack_crafting.json rename to src/main/resources/data/superbwarfare/recipe/small_battery_pack_crafting.json index 6f2b960c3..deeed859e 100644 --- a/src/main/resources/data/superbwarfare/recipes/small_battery_pack_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/small_battery_pack_crafting.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "superbwarfare:small_battery_pack", + "id": "superbwarfare:small_battery_pack", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/small_shell_crafting.json b/src/main/resources/data/superbwarfare/recipe/small_shell_crafting.json similarity index 84% rename from src/main/resources/data/superbwarfare/recipes/small_shell_crafting.json rename to src/main/resources/data/superbwarfare/recipe/small_shell_crafting.json index 7efe312b1..661f0461a 100644 --- a/src/main/resources/data/superbwarfare/recipes/small_shell_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/small_shell_crafting.json @@ -11,7 +11,7 @@ "tag": "superbwarfare:ingots/steel" }, "b": { - "tag": "forge:ingots/copper" + "tag": "c:ingots/copper" }, "c": { "item": "minecraft:gunpowder" @@ -24,7 +24,7 @@ } }, "result": { - "item": "superbwarfare:small_shell", + "id": "superbwarfare:small_shell", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/sniper_ammo_crafting.json b/src/main/resources/data/superbwarfare/recipe/sniper_ammo_crafting.json similarity index 73% rename from src/main/resources/data/superbwarfare/recipes/sniper_ammo_crafting.json rename to src/main/resources/data/superbwarfare/recipe/sniper_ammo_crafting.json index 8238926fc..c0894da25 100644 --- a/src/main/resources/data/superbwarfare/recipes/sniper_ammo_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/sniper_ammo_crafting.json @@ -8,10 +8,10 @@ ], "key": { "a": { - "tag": "forge:ingots/tungsten" + "tag": "c:ingots/tungsten" }, "b": { - "tag": "forge:plates/copper" + "tag": "c:plates/copper" }, "c": { "item": "minecraft:gunpowder" @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:sniper_ammo", + "id": "superbwarfare:sniper_ammo", "count": 16 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/speedboat_crafting.json b/src/main/resources/data/superbwarfare/recipe/speedboat_crafting.json similarity index 95% rename from src/main/resources/data/superbwarfare/recipes/speedboat_crafting.json rename to src/main/resources/data/superbwarfare/recipe/speedboat_crafting.json index cd0f8f8e8..cdc23e439 100644 --- a/src/main/resources/data/superbwarfare/recipes/speedboat_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/speedboat_crafting.json @@ -36,7 +36,7 @@ } }, "result": { - "item": "superbwarfare:container", + "id": "superbwarfare:container", "nbt": { "BlockEntityTag": { "EntityType": "superbwarfare:speedboat" diff --git a/src/main/resources/data/superbwarfare/recipes/steel_action_crafting.json b/src/main/resources/data/superbwarfare/recipe/steel_action_crafting.json similarity index 86% rename from src/main/resources/data/superbwarfare/recipes/steel_action_crafting.json rename to src/main/resources/data/superbwarfare/recipe/steel_action_crafting.json index c41f42e5c..41f3c2044 100644 --- a/src/main/resources/data/superbwarfare/recipes/steel_action_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/steel_action_crafting.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "superbwarfare:steel_action", + "id": "superbwarfare:steel_action", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/steel_barrel_crafting.json b/src/main/resources/data/superbwarfare/recipe/steel_barrel_crafting.json similarity index 86% rename from src/main/resources/data/superbwarfare/recipes/steel_barrel_crafting.json rename to src/main/resources/data/superbwarfare/recipe/steel_barrel_crafting.json index 289b482a7..1b6fd7342 100644 --- a/src/main/resources/data/superbwarfare/recipes/steel_barrel_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/steel_barrel_crafting.json @@ -13,7 +13,7 @@ } }, "result": { - "item": "superbwarfare:steel_barrel", + "id": "superbwarfare:steel_barrel", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/steel_block_crafting.json b/src/main/resources/data/superbwarfare/recipe/steel_block_crafting.json similarity index 76% rename from src/main/resources/data/superbwarfare/recipes/steel_block_crafting.json rename to src/main/resources/data/superbwarfare/recipe/steel_block_crafting.json index 77c51f87d..d644b73b8 100644 --- a/src/main/resources/data/superbwarfare/recipes/steel_block_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/steel_block_crafting.json @@ -8,14 +8,14 @@ ], "key": { "a": { - "tag": "forge:ingots/steel" + "tag": "c:ingots/steel" }, "b": { "item": "superbwarfare:steel_ingot" } }, "result": { - "item": "superbwarfare:steel_block", + "id": "superbwarfare:steel_block", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/steel_ingot_blasting.json b/src/main/resources/data/superbwarfare/recipe/steel_ingot_blasting.json similarity index 74% rename from src/main/resources/data/superbwarfare/recipes/steel_ingot_blasting.json rename to src/main/resources/data/superbwarfare/recipe/steel_ingot_blasting.json index 858fcc3ae..7c4ea3680 100644 --- a/src/main/resources/data/superbwarfare/recipes/steel_ingot_blasting.json +++ b/src/main/resources/data/superbwarfare/recipe/steel_ingot_blasting.json @@ -6,5 +6,7 @@ "ingredient": { "item": "superbwarfare:coal_iron_powder" }, - "result": "superbwarfare:steel_ingot" + "result": { + "id": "superbwarfare:steel_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/steel_ingot_crafting.json b/src/main/resources/data/superbwarfare/recipe/steel_ingot_crafting.json similarity index 81% rename from src/main/resources/data/superbwarfare/recipes/steel_ingot_crafting.json rename to src/main/resources/data/superbwarfare/recipe/steel_ingot_crafting.json index a4763a209..045f3713c 100644 --- a/src/main/resources/data/superbwarfare/recipes/steel_ingot_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/steel_ingot_crafting.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "superbwarfare:steel_ingot", + "id": "superbwarfare:steel_ingot", "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/steel_spring_crafting.json b/src/main/resources/data/superbwarfare/recipe/steel_spring_crafting.json similarity index 86% rename from src/main/resources/data/superbwarfare/recipes/steel_spring_crafting.json rename to src/main/resources/data/superbwarfare/recipe/steel_spring_crafting.json index 802edd2a2..8097cee07 100644 --- a/src/main/resources/data/superbwarfare/recipes/steel_spring_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/steel_spring_crafting.json @@ -15,7 +15,7 @@ } }, "result": { - "item": "superbwarfare:steel_spring", + "id": "superbwarfare:steel_spring", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/steel_trigger_crafting.json b/src/main/resources/data/superbwarfare/recipe/steel_trigger_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/steel_trigger_crafting.json rename to src/main/resources/data/superbwarfare/recipe/steel_trigger_crafting.json index 22bc4c338..55339897f 100644 --- a/src/main/resources/data/superbwarfare/recipes/steel_trigger_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/steel_trigger_crafting.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "superbwarfare:steel_trigger", + "id": "superbwarfare:steel_trigger", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/svd_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/svd_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/svd_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/svd_blueprint_crafting.json index 7a0974bef..83e65692c 100644 --- a/src/main/resources/data/superbwarfare/recipes/svd_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/svd_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:svd_blueprint", + "id": "superbwarfare:svd_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/svd_smithing.json b/src/main/resources/data/superbwarfare/recipe/svd_smithing.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/svd_smithing.json rename to src/main/resources/data/superbwarfare/recipe/svd_smithing.json index b5e904ba4..6674b07d4 100644 --- a/src/main/resources/data/superbwarfare/recipes/svd_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/svd_smithing.json @@ -10,6 +10,6 @@ "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { - "item": "superbwarfare:svd" + "id": "superbwarfare:svd" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/target_crafting.json b/src/main/resources/data/superbwarfare/recipe/target_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/target_crafting.json rename to src/main/resources/data/superbwarfare/recipe/target_crafting.json index b24855087..6446faf24 100644 --- a/src/main/resources/data/superbwarfare/recipes/target_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/target_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:target_deployer", + "id": "superbwarfare:target_deployer", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/taser_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/taser_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/taser_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/taser_blueprint_crafting.json index 134d19117..8a29c873f 100644 --- a/src/main/resources/data/superbwarfare/recipes/taser_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/taser_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:taser_blueprint", + "id": "superbwarfare:taser_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/taser_electrode_crafting.json b/src/main/resources/data/superbwarfare/recipe/taser_electrode_crafting.json similarity index 86% rename from src/main/resources/data/superbwarfare/recipes/taser_electrode_crafting.json rename to src/main/resources/data/superbwarfare/recipe/taser_electrode_crafting.json index 55b0a2caf..1f3c11923 100644 --- a/src/main/resources/data/superbwarfare/recipes/taser_electrode_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/taser_electrode_crafting.json @@ -15,7 +15,7 @@ } }, "result": { - "item": "superbwarfare:taser_electrode", + "id": "superbwarfare:taser_electrode", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/taser_smithing.json b/src/main/resources/data/superbwarfare/recipe/taser_smithing.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/taser_smithing.json rename to src/main/resources/data/superbwarfare/recipe/taser_smithing.json index 188067263..f6eb9e123 100644 --- a/src/main/resources/data/superbwarfare/recipes/taser_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/taser_smithing.json @@ -10,6 +10,6 @@ "item": "minecraft:yellow_concrete" }, "result": { - "item": "superbwarfare:taser" + "id": "superbwarfare:taser" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/tom_6_crafting.json b/src/main/resources/data/superbwarfare/recipe/tom_6_crafting.json similarity index 91% rename from src/main/resources/data/superbwarfare/recipes/tom_6_crafting.json rename to src/main/resources/data/superbwarfare/recipe/tom_6_crafting.json index 1f1e58b0d..d785837bd 100644 --- a/src/main/resources/data/superbwarfare/recipes/tom_6_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/tom_6_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:container", + "id": "superbwarfare:container", "nbt": { "BlockEntityTag": { "EntityType": "superbwarfare:tom_6" diff --git a/src/main/resources/data/superbwarfare/recipes/trachelium_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/trachelium_blueprint_crafting.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/trachelium_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/trachelium_blueprint_crafting.json index cb4d38b63..538d2fdfc 100644 --- a/src/main/resources/data/superbwarfare/recipes/trachelium_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/trachelium_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:trachelium_blueprint", + "id": "superbwarfare:trachelium_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/trachelium_smithing.json b/src/main/resources/data/superbwarfare/recipe/trachelium_smithing.json similarity index 87% rename from src/main/resources/data/superbwarfare/recipes/trachelium_smithing.json rename to src/main/resources/data/superbwarfare/recipe/trachelium_smithing.json index f0ccb5638..4f4cc9a48 100644 --- a/src/main/resources/data/superbwarfare/recipes/trachelium_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/trachelium_smithing.json @@ -10,6 +10,6 @@ "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { - "item": "superbwarfare:trachelium" + "id": "superbwarfare:trachelium" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/track_crafting.json b/src/main/resources/data/superbwarfare/recipe/track_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/track_crafting.json rename to src/main/resources/data/superbwarfare/recipe/track_crafting.json index 3f87a7c72..c2906dcfc 100644 --- a/src/main/resources/data/superbwarfare/recipes/track_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/track_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:track", + "id": "superbwarfare:track", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/transcript_crafting.json b/src/main/resources/data/superbwarfare/recipe/transcript_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/transcript_crafting.json rename to src/main/resources/data/superbwarfare/recipe/transcript_crafting.json index 5d3ea25cc..4f84de9b0 100644 --- a/src/main/resources/data/superbwarfare/recipes/transcript_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/transcript_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:transcript", + "id": "superbwarfare:transcript", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/tungsten_block_crafting.json b/src/main/resources/data/superbwarfare/recipe/tungsten_block_crafting.json similarity index 75% rename from src/main/resources/data/superbwarfare/recipes/tungsten_block_crafting.json rename to src/main/resources/data/superbwarfare/recipe/tungsten_block_crafting.json index c11280950..1923b5432 100644 --- a/src/main/resources/data/superbwarfare/recipes/tungsten_block_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/tungsten_block_crafting.json @@ -11,11 +11,11 @@ "item": "superbwarfare:tungsten_ingot" }, "b": { - "tag":"forge:ingots/tungsten" + "tag": "c:ingots/tungsten" } }, "result": { - "item": "superbwarfare:tungsten_block", + "id": "superbwarfare:tungsten_block", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/tungsten_ingot_blasting.json b/src/main/resources/data/superbwarfare/recipe/tungsten_ingot_blasting.json similarity index 72% rename from src/main/resources/data/superbwarfare/recipes/tungsten_ingot_blasting.json rename to src/main/resources/data/superbwarfare/recipe/tungsten_ingot_blasting.json index 280aca527..157238df2 100644 --- a/src/main/resources/data/superbwarfare/recipes/tungsten_ingot_blasting.json +++ b/src/main/resources/data/superbwarfare/recipe/tungsten_ingot_blasting.json @@ -6,5 +6,7 @@ "ingredient": { "item": "superbwarfare:scheelite" }, - "result": "superbwarfare:tungsten_ingot" + "result": { + "id": "superbwarfare:tungsten_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/tungsten_ingot_blasting_from_ore.json b/src/main/resources/data/superbwarfare/recipe/tungsten_ingot_blasting_from_ore.json similarity index 80% rename from src/main/resources/data/superbwarfare/recipes/tungsten_ingot_blasting_from_ore.json rename to src/main/resources/data/superbwarfare/recipe/tungsten_ingot_blasting_from_ore.json index 27a50e98f..4d74dddbf 100644 --- a/src/main/resources/data/superbwarfare/recipes/tungsten_ingot_blasting_from_ore.json +++ b/src/main/resources/data/superbwarfare/recipe/tungsten_ingot_blasting_from_ore.json @@ -11,5 +11,7 @@ "item": "superbwarfare:deepslate_scheelite_ore" } ], - "result": "superbwarfare:tungsten_ingot" + "result": { + "id": "superbwarfare:tungsten_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/tungsten_ingot_blasting_from_powder.json b/src/main/resources/data/superbwarfare/recipe/tungsten_ingot_blasting_from_powder.json similarity index 73% rename from src/main/resources/data/superbwarfare/recipes/tungsten_ingot_blasting_from_powder.json rename to src/main/resources/data/superbwarfare/recipe/tungsten_ingot_blasting_from_powder.json index 97d7a290f..6b3fdfc3d 100644 --- a/src/main/resources/data/superbwarfare/recipes/tungsten_ingot_blasting_from_powder.json +++ b/src/main/resources/data/superbwarfare/recipe/tungsten_ingot_blasting_from_powder.json @@ -6,5 +6,7 @@ "ingredient": { "item": "superbwarfare:tungsten_powder" }, - "result": "superbwarfare:tungsten_ingot" + "result": { + "id": "superbwarfare:tungsten_ingot" + } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/tungsten_ingot_crafting.json b/src/main/resources/data/superbwarfare/recipe/tungsten_ingot_crafting.json similarity index 80% rename from src/main/resources/data/superbwarfare/recipes/tungsten_ingot_crafting.json rename to src/main/resources/data/superbwarfare/recipe/tungsten_ingot_crafting.json index 93d471838..93cd85f93 100644 --- a/src/main/resources/data/superbwarfare/recipes/tungsten_ingot_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/tungsten_ingot_crafting.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "superbwarfare:tungsten_ingot", + "id": "superbwarfare:tungsten_ingot", "count": 9 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/tungsten_powder_crafting.json b/src/main/resources/data/superbwarfare/recipe/tungsten_powder_crafting.json similarity index 69% rename from src/main/resources/data/superbwarfare/recipes/tungsten_powder_crafting.json rename to src/main/resources/data/superbwarfare/recipe/tungsten_powder_crafting.json index 08019d316..d81c5ca66 100644 --- a/src/main/resources/data/superbwarfare/recipes/tungsten_powder_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/tungsten_powder_crafting.json @@ -3,14 +3,14 @@ "category": "misc", "ingredients": [ { - "tag": "forge:ingots/tungsten" + "tag": "c:ingots/tungsten" }, { "item": "superbwarfare:hammer" } ], "result": { - "item": "superbwarfare:tungsten_powder", + "id": "superbwarfare:tungsten_powder", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/tungsten_rod_crafting.json b/src/main/resources/data/superbwarfare/recipe/tungsten_rod_crafting.json similarity index 67% rename from src/main/resources/data/superbwarfare/recipes/tungsten_rod_crafting.json rename to src/main/resources/data/superbwarfare/recipe/tungsten_rod_crafting.json index 0af6c3481..7bc4e5b86 100644 --- a/src/main/resources/data/superbwarfare/recipes/tungsten_rod_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/tungsten_rod_crafting.json @@ -7,11 +7,11 @@ ], "key": { "a": { - "tag": "forge:ingots/tungsten" + "tag": "c:ingots/tungsten" } }, "result": { - "item": "superbwarfare:tungsten_rod", + "id": "superbwarfare:tungsten_rod", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/us_chest_iotv_crafting.json b/src/main/resources/data/superbwarfare/recipe/us_chest_iotv_crafting.json similarity index 89% rename from src/main/resources/data/superbwarfare/recipes/us_chest_iotv_crafting.json rename to src/main/resources/data/superbwarfare/recipe/us_chest_iotv_crafting.json index f08e98885..6d0bdca2c 100644 --- a/src/main/resources/data/superbwarfare/recipes/us_chest_iotv_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/us_chest_iotv_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:us_chest_iotv", + "id": "superbwarfare:us_chest_iotv", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/us_helmet_pastg_crafting.json b/src/main/resources/data/superbwarfare/recipe/us_helmet_pastg_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/us_helmet_pastg_crafting.json rename to src/main/resources/data/superbwarfare/recipe/us_helmet_pastg_crafting.json index f045f12a1..a2061d3fe 100644 --- a/src/main/resources/data/superbwarfare/recipes/us_helmet_pastg_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/us_helmet_pastg_crafting.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "superbwarfare:us_helmet_pastg", + "id": "superbwarfare:us_helmet_pastg", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/vector_blueprint_crafting.json b/src/main/resources/data/superbwarfare/recipe/vector_blueprint_crafting.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/vector_blueprint_crafting.json rename to src/main/resources/data/superbwarfare/recipe/vector_blueprint_crafting.json index ecf1c5eb8..ca063d953 100644 --- a/src/main/resources/data/superbwarfare/recipes/vector_blueprint_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/vector_blueprint_crafting.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "superbwarfare:vector_blueprint", + "id": "superbwarfare:vector_blueprint", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/vector_smithing.json b/src/main/resources/data/superbwarfare/recipe/vector_smithing.json similarity index 88% rename from src/main/resources/data/superbwarfare/recipes/vector_smithing.json rename to src/main/resources/data/superbwarfare/recipe/vector_smithing.json index a062d7900..c65a62223 100644 --- a/src/main/resources/data/superbwarfare/recipes/vector_smithing.json +++ b/src/main/resources/data/superbwarfare/recipe/vector_smithing.json @@ -10,6 +10,6 @@ "tag": "superbwarfare:ingots/cemented_carbide" }, "result": { - "item": "superbwarfare:vector" + "id": "superbwarfare:vector" } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/wheel_chair_crafting.json b/src/main/resources/data/superbwarfare/recipe/wheel_chair_crafting.json similarity index 92% rename from src/main/resources/data/superbwarfare/recipes/wheel_chair_crafting.json rename to src/main/resources/data/superbwarfare/recipe/wheel_chair_crafting.json index cae0ad894..f1f1b6e48 100644 --- a/src/main/resources/data/superbwarfare/recipes/wheel_chair_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/wheel_chair_crafting.json @@ -20,7 +20,7 @@ } }, "result": { - "item": "superbwarfare:container", + "id": "superbwarfare:container", "nbt": { "BlockEntityTag": { "EntityType": "superbwarfare:wheel_chair" diff --git a/src/main/resources/data/superbwarfare/recipes/wheel_crafting.json b/src/main/resources/data/superbwarfare/recipe/wheel_crafting.json similarity index 78% rename from src/main/resources/data/superbwarfare/recipes/wheel_crafting.json rename to src/main/resources/data/superbwarfare/recipe/wheel_crafting.json index e3692eb20..c935b6d40 100644 --- a/src/main/resources/data/superbwarfare/recipes/wheel_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/wheel_crafting.json @@ -11,11 +11,11 @@ "item": "minecraft:black_wool" }, "b": { - "tag":"forge:ingots/iron" + "tag": "c:ingots/iron" } }, "result": { - "item": "superbwarfare:wheel", + "id": "superbwarfare:wheel", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/wire_guide_missile_to_javelin_missile.json b/src/main/resources/data/superbwarfare/recipe/wire_guide_missile_to_javelin_missile.json similarity index 80% rename from src/main/resources/data/superbwarfare/recipes/wire_guide_missile_to_javelin_missile.json rename to src/main/resources/data/superbwarfare/recipe/wire_guide_missile_to_javelin_missile.json index ed6a826a2..43e9ddb88 100644 --- a/src/main/resources/data/superbwarfare/recipes/wire_guide_missile_to_javelin_missile.json +++ b/src/main/resources/data/superbwarfare/recipe/wire_guide_missile_to_javelin_missile.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "superbwarfare:javelin_missile", + "id": "superbwarfare:javelin_missile", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/xy_100_crafting.json b/src/main/resources/data/superbwarfare/recipe/xy_100_crafting.json similarity index 94% rename from src/main/resources/data/superbwarfare/recipes/xy_100_crafting.json rename to src/main/resources/data/superbwarfare/recipe/xy_100_crafting.json index 03de016b5..2fa9264c4 100644 --- a/src/main/resources/data/superbwarfare/recipes/xy_100_crafting.json +++ b/src/main/resources/data/superbwarfare/recipe/xy_100_crafting.json @@ -27,7 +27,7 @@ } }, "result": { - "item": "superbwarfare:container", + "id": "superbwarfare:container", "nbt": { "BlockEntityTag": { "EntityType": "superbwarfare:yx_100" diff --git a/src/main/resources/data/superbwarfare/recipes/lead_ingot_blasting_from_powder.json b/src/main/resources/data/superbwarfare/recipes/lead_ingot_blasting_from_powder.json deleted file mode 100644 index 908a19693..000000000 --- a/src/main/resources/data/superbwarfare/recipes/lead_ingot_blasting_from_powder.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:blasting", - "cookingtime": 100, - "experience": 0.3, - "ingredient": { - "tag": "forge:dusts/lead" - }, - "result": "superbwarfare:lead_ingot", - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:tag_empty", - "tag": "forge:dusts/lead" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/lead_powder_blasting.json b/src/main/resources/data/superbwarfare/recipes/lead_powder_blasting.json deleted file mode 100644 index 27bec4fab..000000000 --- a/src/main/resources/data/superbwarfare/recipes/lead_powder_blasting.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "cookingtime": 100, - "experience": 0.3, - "ingredient": { - "tag": "c:dusts/lead" - }, - "result": "superbwarfare:lead_ingot" -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/silver_ingot_blasting_from_powder.json b/src/main/resources/data/superbwarfare/recipes/silver_ingot_blasting_from_powder.json deleted file mode 100644 index 5dc3b82a6..000000000 --- a/src/main/resources/data/superbwarfare/recipes/silver_ingot_blasting_from_powder.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:blasting", - "cookingtime": 100, - "experience": 0.3, - "ingredient": { - "tag": "forge:dusts/silver" - }, - "result": "superbwarfare:silver_ingot", - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:tag_empty", - "tag": "forge:dusts/silver" - } - } - ] -} \ No newline at end of file