From 35d135b53e1c38e1d90f59be4c227100200692cf Mon Sep 17 00:00:00 2001 From: CannoliCatfish Date: Fri, 11 Mar 2022 19:31:13 -0500 Subject: [PATCH] Hotfix 1 --- .../resources/assets/rankine/lang/en_us.json | 10 +- .../rankine_misc/amalgam__pickaxe.json | 32 -- .../recipes/rankine_misc/amalgam__shovel.json | 32 -- .../rankine_misc/amalgam__surf_rod.json | 32 -- .../recipes/rankine_misc/amalgam__sword.json | 32 -- .../{amalgam__axe.json => amalgam_axe.json} | 4 +- .../rankine_misc/amalgam_blunderbuss.json | 32 ++ ...lgam__hammer.json => amalgam_crowbar.json} | 4 +- ...malgam__knife.json => amalgam_hammer.json} | 4 +- .../{amalgam__hoe.json => amalgam_hoe.json} | 4 +- ...amalgam__spear.json => amalgam_knife.json} | 4 +- .../recipes/rankine_misc/amalgam_pickaxe.json | 32 ++ .../recipes/rankine_misc/amalgam_shovel.json | 32 ++ .../recipes/rankine_misc/amalgam_spear.json | 32 ++ ...am__crowbar.json => amalgam_surf_rod.json} | 4 +- .../recipes/rankine_misc/amalgam_sword.json | 32 ++ .../rankine_misc/black_gold__blunderbuss.json | 32 -- .../rankine_misc/black_gold__pickaxe.json | 32 -- .../rankine_misc/black_gold__shovel.json | 32 -- .../rankine_misc/black_gold__surf_rod.json | 32 -- .../rankine_misc/black_gold__sword.json | 32 -- ...ack_gold__axe.json => black_gold_axe.json} | 4 +- .../rankine_misc/black_gold_blunderbuss.json | 32 ++ ...d__hammer.json => black_gold_crowbar.json} | 4 +- ...old__knife.json => black_gold_hammer.json} | 4 +- ...ack_gold__hoe.json => black_gold_hoe.json} | 4 +- ...gold__spear.json => black_gold_knife.json} | 4 +- .../rankine_misc/black_gold_pickaxe.json | 32 ++ .../rankine_misc/black_gold_shovel.json | 32 ++ .../rankine_misc/black_gold_spear.json | 32 ++ ..._crowbar.json => black_gold_surf_rod.json} | 4 +- .../rankine_misc/black_gold_sword.json | 32 ++ .../rankine_misc/blue_gold__blunderbuss.json | 32 -- .../rankine_misc/blue_gold__pickaxe.json | 32 -- .../rankine_misc/blue_gold__shovel.json | 32 -- .../rankine_misc/blue_gold__surf_rod.json | 32 -- .../rankine_misc/blue_gold__sword.json | 32 -- ...blue_gold__axe.json => blue_gold_axe.json} | 4 +- .../rankine_misc/blue_gold_blunderbuss.json | 32 ++ ...ld__hammer.json => blue_gold_crowbar.json} | 4 +- ...gold__knife.json => blue_gold_hammer.json} | 4 +- ...blue_gold__hoe.json => blue_gold_hoe.json} | 4 +- ..._gold__spear.json => blue_gold_knife.json} | 4 +- .../rankine_misc/blue_gold_pickaxe.json | 32 ++ .../rankine_misc/blue_gold_shovel.json | 32 ++ .../recipes/rankine_misc/blue_gold_spear.json | 32 ++ ...__crowbar.json => blue_gold_surf_rod.json} | 4 +- .../recipes/rankine_misc/blue_gold_sword.json | 32 ++ .../rankine_misc/brass__blunderbuss.json | 32 -- .../recipes/rankine_misc/brass__pickaxe.json | 32 -- .../recipes/rankine_misc/brass__shovel.json | 32 -- .../recipes/rankine_misc/brass__surf_rod.json | 32 -- .../recipes/rankine_misc/brass__sword.json | 32 -- .../{brass__axe.json => brass_axe.json} | 4 +- .../rankine_misc/brass_blunderbuss.json | 32 ++ ...{brass__hammer.json => brass_crowbar.json} | 4 +- .../{brass__knife.json => brass_hammer.json} | 4 +- .../{brass__hoe.json => brass_hoe.json} | 4 +- .../{brass__spear.json => brass_knife.json} | 4 +- .../recipes/rankine_misc/brass_pickaxe.json | 32 ++ .../recipes/rankine_misc/brass_shovel.json | 32 ++ .../recipes/rankine_misc/brass_spear.json | 32 ++ ...rass__crowbar.json => brass_surf_rod.json} | 4 +- .../recipes/rankine_misc/brass_sword.json | 32 ++ .../rankine_misc/bronze__blunderbuss.json | 32 -- .../recipes/rankine_misc/bronze__pickaxe.json | 32 -- .../recipes/rankine_misc/bronze__shovel.json | 32 -- .../rankine_misc/bronze__surf_rod.json | 32 -- .../recipes/rankine_misc/bronze__sword.json | 32 -- .../{bronze__axe.json => bronze_axe.json} | 4 +- .../rankine_misc/bronze_blunderbuss.json | 32 ++ ...ronze__hammer.json => bronze_crowbar.json} | 4 +- ...{bronze__knife.json => bronze_hammer.json} | 4 +- .../{bronze__hoe.json => bronze_hoe.json} | 4 +- .../{bronze__spear.json => bronze_knife.json} | 4 +- .../recipes/rankine_misc/bronze_pickaxe.json | 32 ++ .../recipes/rankine_misc/bronze_shovel.json | 32 ++ .../recipes/rankine_misc/bronze_spear.json | 32 ++ ...nze__crowbar.json => bronze_surf_rod.json} | 4 +- .../recipes/rankine_misc/bronze_sword.json | 32 ++ .../cobalt_superalloy__blunderbuss.json | 32 -- .../cobalt_superalloy__pickaxe.json | 32 -- .../cobalt_superalloy__shovel.json | 32 -- .../cobalt_superalloy__surf_rod.json | 32 -- .../cobalt_superalloy__sword.json | 32 -- ...y__axe.json => cobalt_superalloy_axe.json} | 4 +- .../cobalt_superalloy_blunderbuss.json | 32 ++ ...er.json => cobalt_superalloy_crowbar.json} | 4 +- ...ife.json => cobalt_superalloy_hammer.json} | 4 +- ...y__hoe.json => cobalt_superalloy_hoe.json} | 4 +- ...pear.json => cobalt_superalloy_knife.json} | 4 +- .../cobalt_superalloy_pickaxe.json | 32 ++ .../cobalt_superalloy_shovel.json | 32 ++ .../rankine_misc/cobalt_superalloy_spear.json | 32 ++ ...r.json => cobalt_superalloy_surf_rod.json} | 4 +- .../rankine_misc/cobalt_superalloy_sword.json | 32 ++ .../ender_amalgam__blunderbuss.json | 32 -- .../rankine_misc/ender_amalgam__pickaxe.json | 32 -- .../rankine_misc/ender_amalgam__shovel.json | 32 -- .../rankine_misc/ender_amalgam__surf_rod.json | 32 -- .../rankine_misc/ender_amalgam__sword.json | 32 -- ...algam__axe.json => ender_amalgam_axe.json} | 4 +- .../ender_amalgam_blunderbuss.json | 32 ++ ...hammer.json => ender_amalgam_crowbar.json} | 4 +- ...__knife.json => ender_amalgam_hammer.json} | 4 +- ...algam__hoe.json => ender_amalgam_hoe.json} | 4 +- ...m__spear.json => ender_amalgam_knife.json} | 4 +- .../rankine_misc/ender_amalgam_pickaxe.json | 32 ++ .../rankine_misc/ender_amalgam_shovel.json | 32 ++ .../rankine_misc/ender_amalgam_spear.json | 32 ++ ...owbar.json => ender_amalgam_surf_rod.json} | 4 +- .../rankine_misc/ender_amalgam_sword.json | 32 ++ .../rankine_misc/green_gold__blunderbuss.json | 32 -- .../rankine_misc/green_gold__pickaxe.json | 32 -- .../rankine_misc/green_gold__shovel.json | 32 -- .../rankine_misc/green_gold__surf_rod.json | 32 -- .../rankine_misc/green_gold__sword.json | 32 -- ...een_gold__axe.json => green_gold_axe.json} | 4 +- .../rankine_misc/green_gold_blunderbuss.json | 32 ++ ...d__hammer.json => green_gold_crowbar.json} | 4 +- ...old__knife.json => green_gold_hammer.json} | 4 +- ...een_gold__hoe.json => green_gold_hoe.json} | 4 +- ...gold__spear.json => green_gold_knife.json} | 4 +- .../rankine_misc/green_gold_pickaxe.json | 32 ++ .../rankine_misc/green_gold_shovel.json | 32 ++ .../rankine_misc/green_gold_spear.json | 32 ++ ..._crowbar.json => green_gold_surf_rod.json} | 4 +- .../rankine_misc/green_gold_sword.json | 32 ++ .../rankine_misc/invar__blunderbuss.json | 32 -- .../recipes/rankine_misc/invar__pickaxe.json | 32 -- .../recipes/rankine_misc/invar__shovel.json | 32 -- .../recipes/rankine_misc/invar__surf_rod.json | 32 -- .../recipes/rankine_misc/invar__sword.json | 32 -- .../{invar__axe.json => invar_axe.json} | 4 +- .../rankine_misc/invar_blunderbuss.json | 32 ++ ...{invar__hammer.json => invar_crowbar.json} | 4 +- .../{invar__knife.json => invar_hammer.json} | 4 +- .../{invar__hoe.json => invar_hoe.json} | 4 +- .../{invar__spear.json => invar_knife.json} | 4 +- .../recipes/rankine_misc/invar_pickaxe.json | 32 ++ .../recipes/rankine_misc/invar_shovel.json | 32 ++ .../recipes/rankine_misc/invar_spear.json | 32 ++ ...nvar__crowbar.json => invar_surf_rod.json} | 4 +- .../recipes/rankine_misc/invar_sword.json | 32 ++ .../meteoric_iron__blunderbuss.json | 32 -- .../rankine_misc/meteoric_iron__pickaxe.json | 32 -- .../rankine_misc/meteoric_iron__shovel.json | 32 -- .../rankine_misc/meteoric_iron__surf_rod.json | 32 -- .../rankine_misc/meteoric_iron__sword.json | 32 -- ..._iron__axe.json => meteoric_iron_axe.json} | 4 +- .../meteoric_iron_blunderbuss.json | 32 ++ ...hammer.json => meteoric_iron_crowbar.json} | 4 +- ...__knife.json => meteoric_iron_hammer.json} | 4 +- ..._iron__hoe.json => meteoric_iron_hoe.json} | 4 +- ...n__spear.json => meteoric_iron_knife.json} | 4 +- .../rankine_misc/meteoric_iron_pickaxe.json | 32 ++ .../rankine_misc/meteoric_iron_shovel.json | 32 ++ .../rankine_misc/meteoric_iron_spear.json | 32 ++ ...owbar.json => meteoric_iron_surf_rod.json} | 4 +- .../rankine_misc/meteoric_iron_sword.json | 32 ++ .../native_osmiridium__blunderbuss.json | 32 -- .../native_osmiridium__pickaxe.json | 32 -- .../native_osmiridium__shovel.json | 32 -- .../native_osmiridium__surf_rod.json | 32 -- .../native_osmiridium__sword.json | 32 -- ...m__axe.json => native_osmiridium_axe.json} | 4 +- .../native_osmiridium_blunderbuss.json | 32 ++ ...er.json => native_osmiridium_crowbar.json} | 4 +- ...ife.json => native_osmiridium_hammer.json} | 4 +- ...m__hoe.json => native_osmiridium_hoe.json} | 4 +- ...pear.json => native_osmiridium_knife.json} | 4 +- .../native_osmiridium_pickaxe.json | 32 ++ .../native_osmiridium_shovel.json | 32 ++ .../rankine_misc/native_osmiridium_spear.json | 32 ++ ...r.json => native_osmiridium_surf_rod.json} | 4 +- .../rankine_misc/native_osmiridium_sword.json | 32 ++ .../nickel_superalloy__blunderbuss.json | 32 -- .../nickel_superalloy__pickaxe.json | 32 -- .../nickel_superalloy__shovel.json | 32 -- .../nickel_superalloy__surf_rod.json | 32 -- .../nickel_superalloy__sword.json | 32 -- ...y__axe.json => nickel_superalloy_axe.json} | 4 +- .../nickel_superalloy_blunderbuss.json | 32 ++ ...er.json => nickel_superalloy_crowbar.json} | 4 +- ...ife.json => nickel_superalloy_hammer.json} | 4 +- ...y__hoe.json => nickel_superalloy_hoe.json} | 4 +- ...pear.json => nickel_superalloy_knife.json} | 4 +- .../nickel_superalloy_pickaxe.json | 32 ++ .../nickel_superalloy_shovel.json | 32 ++ .../rankine_misc/nickel_superalloy_spear.json | 32 ++ ...r.json => nickel_superalloy_surf_rod.json} | 4 +- .../rankine_misc/nickel_superalloy_sword.json | 32 ++ .../niobium_alloy__blunderbuss.json | 32 -- .../rankine_misc/niobium_alloy__pickaxe.json | 32 -- .../rankine_misc/niobium_alloy__shovel.json | 32 -- .../rankine_misc/niobium_alloy__surf_rod.json | 32 -- .../rankine_misc/niobium_alloy__sword.json | 32 -- ...alloy__axe.json => niobium_alloy_axe.json} | 4 +- .../niobium_alloy_blunderbuss.json | 32 ++ ...hammer.json => niobium_alloy_crowbar.json} | 4 +- ...__knife.json => niobium_alloy_hammer.json} | 4 +- ...alloy__hoe.json => niobium_alloy_hoe.json} | 4 +- ...y__spear.json => niobium_alloy_knife.json} | 4 +- .../rankine_misc/niobium_alloy_pickaxe.json | 32 ++ .../rankine_misc/niobium_alloy_shovel.json | 32 ++ .../rankine_misc/niobium_alloy_spear.json | 32 ++ ...owbar.json => niobium_alloy_surf_rod.json} | 4 +- .../rankine_misc/niobium_alloy_sword.json | 32 ++ .../rankine_misc/nitinol__blunderbuss.json | 32 -- .../rankine_misc/nitinol__pickaxe.json | 32 -- .../recipes/rankine_misc/nitinol__shovel.json | 32 -- .../rankine_misc/nitinol__surf_rod.json | 32 -- .../recipes/rankine_misc/nitinol__sword.json | 32 -- .../{nitinol__axe.json => nitinol_axe.json} | 4 +- .../rankine_misc/nitinol_blunderbuss.json | 32 ++ ...inol__hammer.json => nitinol_crowbar.json} | 4 +- ...itinol__knife.json => nitinol_hammer.json} | 4 +- .../{nitinol__hoe.json => nitinol_hoe.json} | 4 +- ...nitinol__spear.json => nitinol_knife.json} | 4 +- .../recipes/rankine_misc/nitinol_pickaxe.json | 32 ++ .../recipes/rankine_misc/nitinol_shovel.json | 32 ++ .../recipes/rankine_misc/nitinol_spear.json | 32 ++ ...ol__crowbar.json => nitinol_surf_rod.json} | 4 +- .../recipes/rankine_misc/nitinol_sword.json | 32 ++ .../rankine_misc/osmiridium__blunderbuss.json | 32 -- .../rankine_misc/osmiridium__pickaxe.json | 32 -- .../rankine_misc/osmiridium__shovel.json | 32 -- .../rankine_misc/osmiridium__surf_rod.json | 32 -- .../rankine_misc/osmiridium__sword.json | 32 -- ...miridium__axe.json => osmiridium_axe.json} | 4 +- .../rankine_misc/osmiridium_blunderbuss.json | 32 ++ ...m__hammer.json => osmiridium_crowbar.json} | 4 +- ...ium__knife.json => osmiridium_hammer.json} | 4 +- ...miridium__hoe.json => osmiridium_hoe.json} | 4 +- ...dium__spear.json => osmiridium_knife.json} | 4 +- .../rankine_misc/osmiridium_pickaxe.json | 32 ++ .../rankine_misc/osmiridium_shovel.json | 32 ++ .../rankine_misc/osmiridium_spear.json | 32 ++ ..._crowbar.json => osmiridium_surf_rod.json} | 4 +- .../rankine_misc/osmiridium_sword.json | 32 ++ .../rankine_misc/pewter__blunderbuss.json | 32 -- .../recipes/rankine_misc/pewter__pickaxe.json | 32 -- .../recipes/rankine_misc/pewter__shovel.json | 32 -- .../rankine_misc/pewter__surf_rod.json | 32 -- .../recipes/rankine_misc/pewter__sword.json | 32 -- .../{pewter__axe.json => pewter_axe.json} | 4 +- .../rankine_misc/pewter_blunderbuss.json | 32 ++ ...ewter__hammer.json => pewter_crowbar.json} | 4 +- ...{pewter__knife.json => pewter_hammer.json} | 4 +- .../{pewter__hoe.json => pewter_hoe.json} | 4 +- .../{pewter__spear.json => pewter_knife.json} | 4 +- .../recipes/rankine_misc/pewter_pickaxe.json | 32 ++ .../recipes/rankine_misc/pewter_shovel.json | 32 ++ .../recipes/rankine_misc/pewter_spear.json | 32 ++ ...ter__crowbar.json => pewter_surf_rod.json} | 4 +- .../recipes/rankine_misc/pewter_sword.json | 32 ++ .../purple_gold__blunderbuss.json | 32 -- .../rankine_misc/purple_gold__pickaxe.json | 32 -- .../rankine_misc/purple_gold__shovel.json | 32 -- .../rankine_misc/purple_gold__surf_rod.json | 32 -- .../rankine_misc/purple_gold__sword.json | 32 -- ...le_gold__axe.json => purple_gold_axe.json} | 4 +- .../rankine_misc/purple_gold_blunderbuss.json | 32 ++ ...__hammer.json => purple_gold_crowbar.json} | 4 +- ...ld__knife.json => purple_gold_hammer.json} | 4 +- ...le_gold__hoe.json => purple_gold_hoe.json} | 4 +- ...old__spear.json => purple_gold_knife.json} | 4 +- .../rankine_misc/purple_gold_pickaxe.json | 32 ++ .../rankine_misc/purple_gold_shovel.json | 32 ++ .../rankine_misc/purple_gold_spear.json | 32 ++ ...crowbar.json => purple_gold_surf_rod.json} | 4 +- .../rankine_misc/purple_gold_sword.json | 32 ++ .../rankine_misc/rose_gold__blunderbuss.json | 32 -- .../rankine_misc/rose_gold__pickaxe.json | 32 -- .../rankine_misc/rose_gold__shovel.json | 32 -- .../rankine_misc/rose_gold__surf_rod.json | 32 -- .../rankine_misc/rose_gold__sword.json | 32 -- ...rose_gold__axe.json => rose_gold_axe.json} | 4 +- .../rankine_misc/rose_gold_blunderbuss.json | 32 ++ ...ld__hammer.json => rose_gold_crowbar.json} | 4 +- ...gold__knife.json => rose_gold_hammer.json} | 4 +- ...rose_gold__hoe.json => rose_gold_hoe.json} | 4 +- ..._gold__spear.json => rose_gold_knife.json} | 4 +- .../rankine_misc/rose_gold_pickaxe.json | 32 ++ .../rankine_misc/rose_gold_shovel.json | 32 ++ .../recipes/rankine_misc/rose_gold_spear.json | 32 ++ ...__crowbar.json => rose_gold_surf_rod.json} | 4 +- .../recipes/rankine_misc/rose_gold_sword.json | 32 ++ .../stainless_steel__blunderbuss.json | 32 -- .../stainless_steel__pickaxe.json | 32 -- .../rankine_misc/stainless_steel__shovel.json | 32 -- .../stainless_steel__surf_rod.json | 32 -- .../rankine_misc/stainless_steel__sword.json | 32 -- ...eel__axe.json => stainless_steel_axe.json} | 4 +- .../stainless_steel_blunderbuss.json | 32 ++ ...mmer.json => stainless_steel_crowbar.json} | 4 +- ...knife.json => stainless_steel_hammer.json} | 4 +- ...eel__hoe.json => stainless_steel_hoe.json} | 4 +- ..._spear.json => stainless_steel_knife.json} | 4 +- .../rankine_misc/stainless_steel_pickaxe.json | 32 ++ .../rankine_misc/stainless_steel_shovel.json | 32 ++ .../rankine_misc/stainless_steel_spear.json | 32 ++ ...bar.json => stainless_steel_surf_rod.json} | 4 +- .../rankine_misc/stainless_steel_sword.json | 32 ++ .../rankine_misc/steel__blunderbuss.json | 32 -- .../recipes/rankine_misc/steel__pickaxe.json | 32 -- .../recipes/rankine_misc/steel__shovel.json | 32 -- .../recipes/rankine_misc/steel__surf_rod.json | 32 -- .../recipes/rankine_misc/steel__sword.json | 32 -- .../{steel__axe.json => steel_axe.json} | 4 +- .../rankine_misc/steel_blunderbuss.json | 32 ++ ...{steel__hammer.json => steel_crowbar.json} | 4 +- .../{steel__knife.json => steel_hammer.json} | 4 +- .../{steel__hoe.json => steel_hoe.json} | 4 +- .../{steel__spear.json => steel_knife.json} | 4 +- .../recipes/rankine_misc/steel_pickaxe.json | 32 ++ .../recipes/rankine_misc/steel_shovel.json | 32 ++ .../recipes/rankine_misc/steel_spear.json | 32 ++ ...teel__crowbar.json => steel_surf_rod.json} | 4 +- .../recipes/rankine_misc/steel_sword.json | 32 ++ .../titanium_alloy__blunderbuss.json | 32 -- .../rankine_misc/titanium_alloy__pickaxe.json | 32 -- .../rankine_misc/titanium_alloy__shovel.json | 32 -- .../titanium_alloy__surf_rod.json | 32 -- .../rankine_misc/titanium_alloy__sword.json | 32 -- ...lloy__axe.json => titanium_alloy_axe.json} | 4 +- .../titanium_alloy_blunderbuss.json | 32 ++ ...ammer.json => titanium_alloy_crowbar.json} | 4 +- ..._knife.json => titanium_alloy_hammer.json} | 4 +- ...lloy__hoe.json => titanium_alloy_hoe.json} | 4 +- ...__spear.json => titanium_alloy_knife.json} | 4 +- .../rankine_misc/titanium_alloy_pickaxe.json | 32 ++ .../rankine_misc/titanium_alloy_shovel.json | 32 ++ .../rankine_misc/titanium_alloy_spear.json | 32 ++ ...wbar.json => titanium_alloy_surf_rod.json} | 4 +- .../rankine_misc/titanium_alloy_sword.json | 32 ++ ...blunderbuss.json => totem_of_blazing.json} | 10 +- .../tungsten_heavy_alloy__blunderbuss.json | 32 -- .../tungsten_heavy_alloy__pickaxe.json | 32 -- .../tungsten_heavy_alloy__shovel.json | 32 -- .../tungsten_heavy_alloy__surf_rod.json | 32 -- .../tungsten_heavy_alloy__sword.json | 32 -- ...axe.json => tungsten_heavy_alloy_axe.json} | 4 +- .../tungsten_heavy_alloy_blunderbuss.json | 32 ++ ...json => tungsten_heavy_alloy_crowbar.json} | 4 +- ....json => tungsten_heavy_alloy_hammer.json} | 4 +- ...hoe.json => tungsten_heavy_alloy_hoe.json} | 4 +- ...r.json => tungsten_heavy_alloy_knife.json} | 4 +- .../tungsten_heavy_alloy_pickaxe.json | 32 ++ .../tungsten_heavy_alloy_shovel.json | 32 ++ .../tungsten_heavy_alloy_spear.json | 32 ++ ...son => tungsten_heavy_alloy_surf_rod.json} | 4 +- .../tungsten_heavy_alloy_sword.json | 32 ++ .../rankine_misc/white_gold__blunderbuss.json | 32 -- .../rankine_misc/white_gold__pickaxe.json | 32 -- .../rankine_misc/white_gold__shovel.json | 32 -- .../rankine_misc/white_gold__surf_rod.json | 32 -- .../rankine_misc/white_gold__sword.json | 32 -- ...ite_gold__axe.json => white_gold_axe.json} | 4 +- .../rankine_misc/white_gold_blunderbuss.json | 32 ++ ...d__hammer.json => white_gold_crowbar.json} | 4 +- ...old__knife.json => white_gold_hammer.json} | 4 +- ...ite_gold__hoe.json => white_gold_hoe.json} | 4 +- ...gold__spear.json => white_gold_knife.json} | 4 +- .../rankine_misc/white_gold_pickaxe.json | 32 ++ .../rankine_misc/white_gold_shovel.json | 32 ++ .../rankine_misc/white_gold_spear.json | 32 ++ ..._crowbar.json => white_gold_surf_rod.json} | 4 +- .../rankine_misc/white_gold_sword.json | 32 ++ .../zirconium_alloy__blunderbuss.json | 32 -- .../zirconium_alloy__pickaxe.json | 32 -- .../rankine_misc/zirconium_alloy__shovel.json | 32 -- .../zirconium_alloy__surf_rod.json | 32 -- .../rankine_misc/zirconium_alloy__sword.json | 32 -- ...loy__axe.json => zirconium_alloy_axe.json} | 4 +- .../zirconium_alloy_blunderbuss.json | 32 ++ ...mmer.json => zirconium_alloy_crowbar.json} | 4 +- ...knife.json => zirconium_alloy_hammer.json} | 4 +- ...loy__hoe.json => zirconium_alloy_hoe.json} | 4 +- ..._spear.json => zirconium_alloy_knife.json} | 4 +- .../rankine_misc/zirconium_alloy_pickaxe.json | 32 ++ .../rankine_misc/zirconium_alloy_shovel.json | 32 ++ .../rankine_misc/zirconium_alloy_spear.json | 32 ++ ...bar.json => zirconium_alloy_surf_rod.json} | 4 +- .../rankine_misc/zirconium_alloy_sword.json | 32 ++ .../{amalgam__axe.json => amalgam_axe.json} | 0 ...nderbuss.json => amalgam_blunderbuss.json} | 0 ...gam__crowbar.json => amalgam_crowbar.json} | 0 ...algam__hammer.json => amalgam_hammer.json} | 0 .../{amalgam__hoe.json => amalgam_hoe.json} | 0 ...amalgam__knife.json => amalgam_knife.json} | 0 ...gam__pickaxe.json => amalgam_pickaxe.json} | 0 ...algam__shovel.json => amalgam_shovel.json} | 0 ...amalgam__spear.json => amalgam_spear.json} | 0 ...m__surf_rod.json => amalgam_surf_rod.json} | 0 ...amalgam__sword.json => amalgam_sword.json} | 0 ...ack_gold__axe.json => black_gold_axe.json} | 0 ...rbuss.json => black_gold_blunderbuss.json} | 0 ...__crowbar.json => black_gold_crowbar.json} | 0 ...ld__hammer.json => black_gold_hammer.json} | 0 ...ack_gold__hoe.json => black_gold_hoe.json} | 0 ...gold__knife.json => black_gold_knife.json} | 0 ...__pickaxe.json => black_gold_pickaxe.json} | 0 ...ld__shovel.json => black_gold_shovel.json} | 0 ...gold__spear.json => black_gold_spear.json} | 0 ...surf_rod.json => black_gold_surf_rod.json} | 0 ...gold__sword.json => black_gold_sword.json} | 0 ...blue_gold__axe.json => blue_gold_axe.json} | 0 ...erbuss.json => blue_gold_blunderbuss.json} | 0 ...d__crowbar.json => blue_gold_crowbar.json} | 0 ...old__hammer.json => blue_gold_hammer.json} | 0 ...blue_gold__hoe.json => blue_gold_hoe.json} | 0 ..._gold__knife.json => blue_gold_knife.json} | 0 ...d__pickaxe.json => blue_gold_pickaxe.json} | 0 ...old__shovel.json => blue_gold_shovel.json} | 0 ..._gold__spear.json => blue_gold_spear.json} | 0 ..._surf_rod.json => blue_gold_surf_rod.json} | 0 ..._gold__sword.json => blue_gold_sword.json} | 0 .../{brass__axe.json => brass_axe.json} | 0 ...lunderbuss.json => brass_blunderbuss.json} | 0 ...brass__crowbar.json => brass_crowbar.json} | 0 .../{brass__hammer.json => brass_hammer.json} | 0 .../{brass__hoe.json => brass_hoe.json} | 0 .../{brass__knife.json => brass_knife.json} | 0 ...brass__pickaxe.json => brass_pickaxe.json} | 0 .../{brass__shovel.json => brass_shovel.json} | 0 .../{brass__spear.json => brass_spear.json} | 0 ...ass__surf_rod.json => brass_surf_rod.json} | 0 .../{brass__sword.json => brass_sword.json} | 0 .../{bronze__axe.json => bronze_axe.json} | 0 ...underbuss.json => bronze_blunderbuss.json} | 0 ...onze__crowbar.json => bronze_crowbar.json} | 0 ...bronze__hammer.json => bronze_hammer.json} | 0 .../{bronze__hoe.json => bronze_hoe.json} | 0 .../{bronze__knife.json => bronze_knife.json} | 0 ...onze__pickaxe.json => bronze_pickaxe.json} | 0 ...bronze__shovel.json => bronze_shovel.json} | 0 .../{bronze__spear.json => bronze_spear.json} | 0 ...ze__surf_rod.json => bronze_surf_rod.json} | 0 .../{bronze__sword.json => bronze_sword.json} | 0 ...y__axe.json => cobalt_superalloy_axe.json} | 1 + ...son => cobalt_superalloy_blunderbuss.json} | 0 ...ar.json => cobalt_superalloy_crowbar.json} | 0 ...mer.json => cobalt_superalloy_hammer.json} | 1 + ...y__hoe.json => cobalt_superalloy_hoe.json} | 1 + ...nife.json => cobalt_superalloy_knife.json} | 1 + ...xe.json => cobalt_superalloy_pickaxe.json} | 1 + ...vel.json => cobalt_superalloy_shovel.json} | 1 + ...pear.json => cobalt_superalloy_spear.json} | 1 + ...d.json => cobalt_superalloy_surf_rod.json} | 0 ...word.json => cobalt_superalloy_sword.json} | 1 + ...algam__axe.json => ender_amalgam_axe.json} | 1 + ...ss.json => ender_amalgam_blunderbuss.json} | 0 ...rowbar.json => ender_amalgam_crowbar.json} | 0 ..._hammer.json => ender_amalgam_hammer.json} | 1 + ...algam__hoe.json => ender_amalgam_hoe.json} | 1 + ...m__knife.json => ender_amalgam_knife.json} | 1 + ...ickaxe.json => ender_amalgam_pickaxe.json} | 1 + ..._shovel.json => ender_amalgam_shovel.json} | 1 + ...m__spear.json => ender_amalgam_spear.json} | 1 + ...f_rod.json => ender_amalgam_surf_rod.json} | 0 ...m__sword.json => ender_amalgam_sword.json} | 1 + ...een_gold__axe.json => green_gold_axe.json} | 0 ...rbuss.json => green_gold_blunderbuss.json} | 0 ...__crowbar.json => green_gold_crowbar.json} | 0 ...ld__hammer.json => green_gold_hammer.json} | 0 ...een_gold__hoe.json => green_gold_hoe.json} | 0 ...gold__knife.json => green_gold_knife.json} | 0 ...__pickaxe.json => green_gold_pickaxe.json} | 0 ...ld__shovel.json => green_gold_shovel.json} | 0 ...gold__spear.json => green_gold_spear.json} | 0 ...surf_rod.json => green_gold_surf_rod.json} | 0 ...gold__sword.json => green_gold_sword.json} | 0 .../{invar__axe.json => invar_axe.json} | 0 ...lunderbuss.json => invar_blunderbuss.json} | 0 ...invar__crowbar.json => invar_crowbar.json} | 0 .../{invar__hammer.json => invar_hammer.json} | 0 .../{invar__hoe.json => invar_hoe.json} | 0 .../{invar__knife.json => invar_knife.json} | 0 ...invar__pickaxe.json => invar_pickaxe.json} | 0 .../{invar__shovel.json => invar_shovel.json} | 0 .../{invar__spear.json => invar_spear.json} | 0 ...var__surf_rod.json => invar_surf_rod.json} | 0 .../{invar__sword.json => invar_sword.json} | 0 ..._iron__axe.json => meteoric_iron_axe.json} | 0 ...ss.json => meteoric_iron_blunderbuss.json} | 0 ...rowbar.json => meteoric_iron_crowbar.json} | 0 ..._hammer.json => meteoric_iron_hammer.json} | 0 ..._iron__hoe.json => meteoric_iron_hoe.json} | 0 ...n__knife.json => meteoric_iron_knife.json} | 0 ...ickaxe.json => meteoric_iron_pickaxe.json} | 0 ..._shovel.json => meteoric_iron_shovel.json} | 0 ...n__spear.json => meteoric_iron_spear.json} | 0 ...f_rod.json => meteoric_iron_surf_rod.json} | 0 ...n__sword.json => meteoric_iron_sword.json} | 0 ...m__axe.json => native_osmiridium_axe.json} | 0 ...son => native_osmiridium_blunderbuss.json} | 0 ...ar.json => native_osmiridium_crowbar.json} | 0 ...mer.json => native_osmiridium_hammer.json} | 0 ...m__hoe.json => native_osmiridium_hoe.json} | 0 ...nife.json => native_osmiridium_knife.json} | 0 ...xe.json => native_osmiridium_pickaxe.json} | 0 ...vel.json => native_osmiridium_shovel.json} | 0 ...pear.json => native_osmiridium_spear.json} | 0 ...d.json => native_osmiridium_surf_rod.json} | 0 ...word.json => native_osmiridium_sword.json} | 0 ...y__axe.json => nickel_superalloy_axe.json} | 1 + ...son => nickel_superalloy_blunderbuss.json} | 0 ...ar.json => nickel_superalloy_crowbar.json} | 0 ...mer.json => nickel_superalloy_hammer.json} | 1 + ...y__hoe.json => nickel_superalloy_hoe.json} | 1 + ...nife.json => nickel_superalloy_knife.json} | 1 + ...xe.json => nickel_superalloy_pickaxe.json} | 1 + ...vel.json => nickel_superalloy_shovel.json} | 1 + ...pear.json => nickel_superalloy_spear.json} | 1 + ...d.json => nickel_superalloy_surf_rod.json} | 0 ...word.json => nickel_superalloy_sword.json} | 1 + ...alloy__axe.json => niobium_alloy_axe.json} | 0 ...ss.json => niobium_alloy_blunderbuss.json} | 0 ...rowbar.json => niobium_alloy_crowbar.json} | 0 ..._hammer.json => niobium_alloy_hammer.json} | 0 ...alloy__hoe.json => niobium_alloy_hoe.json} | 0 ...y__knife.json => niobium_alloy_knife.json} | 0 ...ickaxe.json => niobium_alloy_pickaxe.json} | 0 ..._shovel.json => niobium_alloy_shovel.json} | 0 ...y__spear.json => niobium_alloy_spear.json} | 0 ...f_rod.json => niobium_alloy_surf_rod.json} | 0 ...y__sword.json => niobium_alloy_sword.json} | 0 .../{nitinol__axe.json => nitinol_axe.json} | 0 ...nderbuss.json => nitinol_blunderbuss.json} | 0 ...nol__crowbar.json => nitinol_crowbar.json} | 0 ...tinol__hammer.json => nitinol_hammer.json} | 0 .../{nitinol__hoe.json => nitinol_hoe.json} | 0 ...nitinol__knife.json => nitinol_knife.json} | 0 ...nol__pickaxe.json => nitinol_pickaxe.json} | 0 ...tinol__shovel.json => nitinol_shovel.json} | 0 ...nitinol__spear.json => nitinol_spear.json} | 0 ...l__surf_rod.json => nitinol_surf_rod.json} | 0 ...nitinol__sword.json => nitinol_sword.json} | 0 ...miridium__axe.json => osmiridium_axe.json} | 0 ...rbuss.json => osmiridium_blunderbuss.json} | 0 ...__crowbar.json => osmiridium_crowbar.json} | 0 ...um__hammer.json => osmiridium_hammer.json} | 0 ...miridium__hoe.json => osmiridium_hoe.json} | 0 ...dium__knife.json => osmiridium_knife.json} | 0 ...__pickaxe.json => osmiridium_pickaxe.json} | 0 ...um__shovel.json => osmiridium_shovel.json} | 0 ...dium__spear.json => osmiridium_spear.json} | 0 ...surf_rod.json => osmiridium_surf_rod.json} | 0 ...dium__sword.json => osmiridium_sword.json} | 0 .../{pewter__axe.json => pewter_axe.json} | 0 ...underbuss.json => pewter_blunderbuss.json} | 0 ...wter__crowbar.json => pewter_crowbar.json} | 0 ...pewter__hammer.json => pewter_hammer.json} | 0 .../{pewter__hoe.json => pewter_hoe.json} | 0 .../{pewter__knife.json => pewter_knife.json} | 0 ...wter__pickaxe.json => pewter_pickaxe.json} | 0 ...pewter__shovel.json => pewter_shovel.json} | 0 .../{pewter__spear.json => pewter_spear.json} | 0 ...er__surf_rod.json => pewter_surf_rod.json} | 0 .../{pewter__sword.json => pewter_sword.json} | 0 ...le_gold__axe.json => purple_gold_axe.json} | 0 ...buss.json => purple_gold_blunderbuss.json} | 0 ..._crowbar.json => purple_gold_crowbar.json} | 0 ...d__hammer.json => purple_gold_hammer.json} | 0 ...le_gold__hoe.json => purple_gold_hoe.json} | 0 ...old__knife.json => purple_gold_knife.json} | 0 ..._pickaxe.json => purple_gold_pickaxe.json} | 0 ...d__shovel.json => purple_gold_shovel.json} | 0 ...old__spear.json => purple_gold_spear.json} | 0 ...urf_rod.json => purple_gold_surf_rod.json} | 0 ...old__sword.json => purple_gold_sword.json} | 0 ...rose_gold__axe.json => rose_gold_axe.json} | 0 ...erbuss.json => rose_gold_blunderbuss.json} | 0 ...d__crowbar.json => rose_gold_crowbar.json} | 0 ...old__hammer.json => rose_gold_hammer.json} | 0 ...rose_gold__hoe.json => rose_gold_hoe.json} | 0 ..._gold__knife.json => rose_gold_knife.json} | 0 ...d__pickaxe.json => rose_gold_pickaxe.json} | 0 ...old__shovel.json => rose_gold_shovel.json} | 0 ..._gold__spear.json => rose_gold_spear.json} | 0 ..._surf_rod.json => rose_gold_surf_rod.json} | 0 ..._gold__sword.json => rose_gold_sword.json} | 0 ...eel__axe.json => stainless_steel_axe.json} | 1 + ....json => stainless_steel_blunderbuss.json} | 0 ...wbar.json => stainless_steel_crowbar.json} | 0 ...ammer.json => stainless_steel_hammer.json} | 1 + ...eel__hoe.json => stainless_steel_hoe.json} | 1 + ..._knife.json => stainless_steel_knife.json} | 1 + ...kaxe.json => stainless_steel_pickaxe.json} | 1 + ...hovel.json => stainless_steel_shovel.json} | 1 + ..._spear.json => stainless_steel_spear.json} | 1 + ...rod.json => stainless_steel_surf_rod.json} | 0 ..._sword.json => stainless_steel_sword.json} | 1 + .../{steel__axe.json => steel_axe.json} | 0 ...lunderbuss.json => steel_blunderbuss.json} | 0 ...steel__crowbar.json => steel_crowbar.json} | 0 .../{steel__hammer.json => steel_hammer.json} | 0 .../{steel__hoe.json => steel_hoe.json} | 0 .../{steel__knife.json => steel_knife.json} | 0 ...steel__pickaxe.json => steel_pickaxe.json} | 0 .../{steel__shovel.json => steel_shovel.json} | 0 .../{steel__spear.json => steel_spear.json} | 0 ...eel__surf_rod.json => steel_surf_rod.json} | 0 .../{steel__sword.json => steel_sword.json} | 0 ...lloy__axe.json => titanium_alloy_axe.json} | 0 ...s.json => titanium_alloy_blunderbuss.json} | 0 ...owbar.json => titanium_alloy_crowbar.json} | 0 ...hammer.json => titanium_alloy_hammer.json} | 0 ...lloy__hoe.json => titanium_alloy_hoe.json} | 0 ...__knife.json => titanium_alloy_knife.json} | 0 ...ckaxe.json => titanium_alloy_pickaxe.json} | 0 ...shovel.json => titanium_alloy_shovel.json} | 0 ...__spear.json => titanium_alloy_spear.json} | 0 ..._rod.json => titanium_alloy_surf_rod.json} | 0 ...__sword.json => titanium_alloy_sword.json} | 0 .../rankine/recipes/totem_of_blazing.json | 19 + ...axe.json => tungsten_heavy_alloy_axe.json} | 1 + ... => tungsten_heavy_alloy_blunderbuss.json} | 0 ...json => tungsten_heavy_alloy_crowbar.json} | 0 ....json => tungsten_heavy_alloy_hammer.json} | 1 + ...hoe.json => tungsten_heavy_alloy_hoe.json} | 1 + ...e.json => tungsten_heavy_alloy_knife.json} | 1 + ...json => tungsten_heavy_alloy_pickaxe.json} | 1 + ....json => tungsten_heavy_alloy_shovel.json} | 1 + ...r.json => tungsten_heavy_alloy_spear.json} | 1 + ...son => tungsten_heavy_alloy_surf_rod.json} | 0 ...d.json => tungsten_heavy_alloy_sword.json} | 1 + ...ite_gold__axe.json => white_gold_axe.json} | 0 ...rbuss.json => white_gold_blunderbuss.json} | 0 ...__crowbar.json => white_gold_crowbar.json} | 0 ...ld__hammer.json => white_gold_hammer.json} | 0 ...ite_gold__hoe.json => white_gold_hoe.json} | 0 ...gold__knife.json => white_gold_knife.json} | 0 ...__pickaxe.json => white_gold_pickaxe.json} | 0 ...ld__shovel.json => white_gold_shovel.json} | 0 ...gold__spear.json => white_gold_spear.json} | 0 ...surf_rod.json => white_gold_surf_rod.json} | 0 ...gold__sword.json => white_gold_sword.json} | 0 ...loy__axe.json => zirconium_alloy_axe.json} | 0 ....json => zirconium_alloy_blunderbuss.json} | 0 ...wbar.json => zirconium_alloy_crowbar.json} | 0 ...ammer.json => zirconium_alloy_hammer.json} | 0 ...loy__hoe.json => zirconium_alloy_hoe.json} | 0 ..._knife.json => zirconium_alloy_knife.json} | 0 ...kaxe.json => zirconium_alloy_pickaxe.json} | 0 ...hovel.json => zirconium_alloy_shovel.json} | 0 ..._spear.json => zirconium_alloy_spear.json} | 0 ...rod.json => zirconium_alloy_surf_rod.json} | 0 ..._sword.json => zirconium_alloy_sword.json} | 0 .../rankine/compatibility/AlexMobs.java | 9 + .../rankine/data/RankineLangProvider.java | 11 +- .../rankine/data/RankineRecipesProvider.java | 514 +++++++++++------- .../builders/AlloyCraftingRecipeBuilder.java | 30 +- .../rankine/events/RankineEventHandler.java | 4 + .../rankine/init/RankineItems.java | 2 +- .../items/totems/BlazingTotemItem.java | 35 ++ .../gen/feature/WorldReplacerFeature.java | 7 +- .../rankine/recipes/elements/neptunium.json | 85 ++- 659 files changed, 4689 insertions(+), 4311 deletions(-) delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{amalgam__axe.json => amalgam_axe.json} (87%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{amalgam__hammer.json => amalgam_crowbar.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{amalgam__knife.json => amalgam_hammer.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{amalgam__hoe.json => amalgam_hoe.json} (87%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{amalgam__spear.json => amalgam_knife.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{amalgam__crowbar.json => amalgam_surf_rod.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{black_gold__axe.json => black_gold_axe.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{black_gold__hammer.json => black_gold_crowbar.json} (85%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{black_gold__knife.json => black_gold_hammer.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{black_gold__hoe.json => black_gold_hoe.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{black_gold__spear.json => black_gold_knife.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{black_gold__crowbar.json => black_gold_surf_rod.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{blue_gold__axe.json => blue_gold_axe.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{blue_gold__hammer.json => blue_gold_crowbar.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{blue_gold__knife.json => blue_gold_hammer.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{blue_gold__hoe.json => blue_gold_hoe.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{blue_gold__spear.json => blue_gold_knife.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{blue_gold__crowbar.json => blue_gold_surf_rod.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{brass__axe.json => brass_axe.json} (88%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{brass__hammer.json => brass_crowbar.json} (87%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{brass__knife.json => brass_hammer.json} (87%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{brass__hoe.json => brass_hoe.json} (88%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{brass__spear.json => brass_knife.json} (87%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{brass__crowbar.json => brass_surf_rod.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{bronze__axe.json => bronze_axe.json} (87%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{bronze__hammer.json => bronze_crowbar.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{bronze__knife.json => bronze_hammer.json} (87%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{bronze__hoe.json => bronze_hoe.json} (87%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{bronze__spear.json => bronze_knife.json} (87%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{bronze__crowbar.json => bronze_surf_rod.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{cobalt_superalloy__axe.json => cobalt_superalloy_axe.json} (84%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{cobalt_superalloy__hammer.json => cobalt_superalloy_crowbar.json} (83%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{cobalt_superalloy__knife.json => cobalt_superalloy_hammer.json} (84%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{cobalt_superalloy__hoe.json => cobalt_superalloy_hoe.json} (84%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{cobalt_superalloy__spear.json => cobalt_superalloy_knife.json} (84%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{cobalt_superalloy__crowbar.json => cobalt_superalloy_surf_rod.json} (83%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{ender_amalgam__axe.json => ender_amalgam_axe.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{ender_amalgam__hammer.json => ender_amalgam_crowbar.json} (84%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{ender_amalgam__knife.json => ender_amalgam_hammer.json} (85%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{ender_amalgam__hoe.json => ender_amalgam_hoe.json} (85%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{ender_amalgam__spear.json => ender_amalgam_knife.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{ender_amalgam__crowbar.json => ender_amalgam_surf_rod.json} (84%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{green_gold__axe.json => green_gold_axe.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{green_gold__hammer.json => green_gold_crowbar.json} (85%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{green_gold__knife.json => green_gold_hammer.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{green_gold__hoe.json => green_gold_hoe.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{green_gold__spear.json => green_gold_knife.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{green_gold__crowbar.json => green_gold_surf_rod.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{invar__axe.json => invar_axe.json} (88%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{invar__hammer.json => invar_crowbar.json} (87%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{invar__knife.json => invar_hammer.json} (87%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{invar__hoe.json => invar_hoe.json} (88%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{invar__spear.json => invar_knife.json} (87%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{invar__crowbar.json => invar_surf_rod.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{meteoric_iron__axe.json => meteoric_iron_axe.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{meteoric_iron__hammer.json => meteoric_iron_crowbar.json} (84%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{meteoric_iron__knife.json => meteoric_iron_hammer.json} (85%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{meteoric_iron__hoe.json => meteoric_iron_hoe.json} (85%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{meteoric_iron__spear.json => meteoric_iron_knife.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{meteoric_iron__crowbar.json => meteoric_iron_surf_rod.json} (84%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{native_osmiridium__axe.json => native_osmiridium_axe.json} (84%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{native_osmiridium__hammer.json => native_osmiridium_crowbar.json} (83%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{native_osmiridium__knife.json => native_osmiridium_hammer.json} (83%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{native_osmiridium__hoe.json => native_osmiridium_hoe.json} (84%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{native_osmiridium__spear.json => native_osmiridium_knife.json} (83%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{native_osmiridium__crowbar.json => native_osmiridium_surf_rod.json} (83%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{nickel_superalloy__axe.json => nickel_superalloy_axe.json} (84%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{nickel_superalloy__hammer.json => nickel_superalloy_crowbar.json} (83%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{nickel_superalloy__knife.json => nickel_superalloy_hammer.json} (84%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{nickel_superalloy__hoe.json => nickel_superalloy_hoe.json} (84%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{nickel_superalloy__spear.json => nickel_superalloy_knife.json} (84%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{nickel_superalloy__crowbar.json => nickel_superalloy_surf_rod.json} (83%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{niobium_alloy__axe.json => niobium_alloy_axe.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{niobium_alloy__hammer.json => niobium_alloy_crowbar.json} (84%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{niobium_alloy__knife.json => niobium_alloy_hammer.json} (85%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{niobium_alloy__hoe.json => niobium_alloy_hoe.json} (85%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{niobium_alloy__spear.json => niobium_alloy_knife.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{niobium_alloy__crowbar.json => niobium_alloy_surf_rod.json} (84%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{nitinol__axe.json => nitinol_axe.json} (87%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{nitinol__hammer.json => nitinol_crowbar.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{nitinol__knife.json => nitinol_hammer.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{nitinol__hoe.json => nitinol_hoe.json} (87%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{nitinol__spear.json => nitinol_knife.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{nitinol__crowbar.json => nitinol_surf_rod.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{osmiridium__axe.json => osmiridium_axe.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{osmiridium__hammer.json => osmiridium_crowbar.json} (85%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{osmiridium__knife.json => osmiridium_hammer.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{osmiridium__hoe.json => osmiridium_hoe.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{osmiridium__spear.json => osmiridium_knife.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{osmiridium__crowbar.json => osmiridium_surf_rod.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{pewter__axe.json => pewter_axe.json} (87%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{pewter__hammer.json => pewter_crowbar.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{pewter__knife.json => pewter_hammer.json} (87%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{pewter__hoe.json => pewter_hoe.json} (87%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{pewter__spear.json => pewter_knife.json} (87%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{pewter__crowbar.json => pewter_surf_rod.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{purple_gold__axe.json => purple_gold_axe.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{purple_gold__hammer.json => purple_gold_crowbar.json} (85%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{purple_gold__knife.json => purple_gold_hammer.json} (85%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{purple_gold__hoe.json => purple_gold_hoe.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{purple_gold__spear.json => purple_gold_knife.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{purple_gold__crowbar.json => purple_gold_surf_rod.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{rose_gold__axe.json => rose_gold_axe.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{rose_gold__hammer.json => rose_gold_crowbar.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{rose_gold__knife.json => rose_gold_hammer.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{rose_gold__hoe.json => rose_gold_hoe.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{rose_gold__spear.json => rose_gold_knife.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{rose_gold__crowbar.json => rose_gold_surf_rod.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{stainless_steel__axe.json => stainless_steel_axe.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{stainless_steel__hammer.json => stainless_steel_crowbar.json} (84%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{stainless_steel__knife.json => stainless_steel_hammer.json} (84%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{stainless_steel__hoe.json => stainless_steel_hoe.json} (85%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{stainless_steel__spear.json => stainless_steel_knife.json} (84%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{stainless_steel__crowbar.json => stainless_steel_surf_rod.json} (84%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{steel__axe.json => steel_axe.json} (88%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{steel__hammer.json => steel_crowbar.json} (87%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{steel__knife.json => steel_hammer.json} (87%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{steel__hoe.json => steel_hoe.json} (88%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{steel__spear.json => steel_knife.json} (87%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{steel__crowbar.json => steel_surf_rod.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{titanium_alloy__axe.json => titanium_alloy_axe.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{titanium_alloy__hammer.json => titanium_alloy_crowbar.json} (84%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{titanium_alloy__knife.json => titanium_alloy_hammer.json} (84%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{titanium_alloy__hoe.json => titanium_alloy_hoe.json} (85%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{titanium_alloy__spear.json => titanium_alloy_knife.json} (84%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{titanium_alloy__crowbar.json => titanium_alloy_surf_rod.json} (84%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{amalgam__blunderbuss.json => totem_of_blazing.json} (70%) delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{tungsten_heavy_alloy__axe.json => tungsten_heavy_alloy_axe.json} (83%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{tungsten_heavy_alloy__hammer.json => tungsten_heavy_alloy_crowbar.json} (83%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{tungsten_heavy_alloy__knife.json => tungsten_heavy_alloy_hammer.json} (83%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{tungsten_heavy_alloy__hoe.json => tungsten_heavy_alloy_hoe.json} (83%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{tungsten_heavy_alloy__spear.json => tungsten_heavy_alloy_knife.json} (83%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{tungsten_heavy_alloy__crowbar.json => tungsten_heavy_alloy_surf_rod.json} (82%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{white_gold__axe.json => white_gold_axe.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{white_gold__hammer.json => white_gold_crowbar.json} (85%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{white_gold__knife.json => white_gold_hammer.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{white_gold__hoe.json => white_gold_hoe.json} (86%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{white_gold__spear.json => white_gold_knife.json} (86%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{white_gold__crowbar.json => white_gold_surf_rod.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_sword.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__blunderbuss.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__pickaxe.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__shovel.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__surf_rod.json delete mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__sword.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{zirconium_alloy__axe.json => zirconium_alloy_axe.json} (85%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_blunderbuss.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{zirconium_alloy__hammer.json => zirconium_alloy_crowbar.json} (84%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{zirconium_alloy__knife.json => zirconium_alloy_hammer.json} (84%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{zirconium_alloy__hoe.json => zirconium_alloy_hoe.json} (85%) rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{zirconium_alloy__spear.json => zirconium_alloy_knife.json} (84%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_pickaxe.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_shovel.json create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_spear.json rename src/generated/resources/data/rankine/advancements/recipes/rankine_misc/{zirconium_alloy__crowbar.json => zirconium_alloy_surf_rod.json} (84%) create mode 100644 src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_sword.json rename src/generated/resources/data/rankine/recipes/{amalgam__axe.json => amalgam_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{amalgam__blunderbuss.json => amalgam_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{amalgam__crowbar.json => amalgam_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{amalgam__hammer.json => amalgam_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{amalgam__hoe.json => amalgam_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{amalgam__knife.json => amalgam_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{amalgam__pickaxe.json => amalgam_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{amalgam__shovel.json => amalgam_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{amalgam__spear.json => amalgam_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{amalgam__surf_rod.json => amalgam_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{amalgam__sword.json => amalgam_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{black_gold__axe.json => black_gold_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{black_gold__blunderbuss.json => black_gold_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{black_gold__crowbar.json => black_gold_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{black_gold__hammer.json => black_gold_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{black_gold__hoe.json => black_gold_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{black_gold__knife.json => black_gold_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{black_gold__pickaxe.json => black_gold_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{black_gold__shovel.json => black_gold_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{black_gold__spear.json => black_gold_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{black_gold__surf_rod.json => black_gold_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{black_gold__sword.json => black_gold_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{blue_gold__axe.json => blue_gold_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{blue_gold__blunderbuss.json => blue_gold_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{blue_gold__crowbar.json => blue_gold_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{blue_gold__hammer.json => blue_gold_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{blue_gold__hoe.json => blue_gold_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{blue_gold__knife.json => blue_gold_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{blue_gold__pickaxe.json => blue_gold_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{blue_gold__shovel.json => blue_gold_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{blue_gold__spear.json => blue_gold_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{blue_gold__surf_rod.json => blue_gold_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{blue_gold__sword.json => blue_gold_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{brass__axe.json => brass_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{brass__blunderbuss.json => brass_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{brass__crowbar.json => brass_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{brass__hammer.json => brass_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{brass__hoe.json => brass_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{brass__knife.json => brass_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{brass__pickaxe.json => brass_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{brass__shovel.json => brass_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{brass__spear.json => brass_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{brass__surf_rod.json => brass_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{brass__sword.json => brass_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{bronze__axe.json => bronze_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{bronze__blunderbuss.json => bronze_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{bronze__crowbar.json => bronze_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{bronze__hammer.json => bronze_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{bronze__hoe.json => bronze_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{bronze__knife.json => bronze_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{bronze__pickaxe.json => bronze_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{bronze__shovel.json => bronze_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{bronze__spear.json => bronze_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{bronze__surf_rod.json => bronze_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{bronze__sword.json => bronze_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{cobalt_superalloy__axe.json => cobalt_superalloy_axe.json} (87%) rename src/generated/resources/data/rankine/recipes/{cobalt_superalloy__blunderbuss.json => cobalt_superalloy_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{cobalt_superalloy__crowbar.json => cobalt_superalloy_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{cobalt_superalloy__hammer.json => cobalt_superalloy_hammer.json} (87%) rename src/generated/resources/data/rankine/recipes/{cobalt_superalloy__hoe.json => cobalt_superalloy_hoe.json} (87%) rename src/generated/resources/data/rankine/recipes/{cobalt_superalloy__knife.json => cobalt_superalloy_knife.json} (87%) rename src/generated/resources/data/rankine/recipes/{cobalt_superalloy__pickaxe.json => cobalt_superalloy_pickaxe.json} (87%) rename src/generated/resources/data/rankine/recipes/{cobalt_superalloy__shovel.json => cobalt_superalloy_shovel.json} (87%) rename src/generated/resources/data/rankine/recipes/{cobalt_superalloy__spear.json => cobalt_superalloy_spear.json} (87%) rename src/generated/resources/data/rankine/recipes/{cobalt_superalloy__surf_rod.json => cobalt_superalloy_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{cobalt_superalloy__sword.json => cobalt_superalloy_sword.json} (87%) rename src/generated/resources/data/rankine/recipes/{ender_amalgam__axe.json => ender_amalgam_axe.json} (88%) rename src/generated/resources/data/rankine/recipes/{ender_amalgam__blunderbuss.json => ender_amalgam_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{ender_amalgam__crowbar.json => ender_amalgam_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{ender_amalgam__hammer.json => ender_amalgam_hammer.json} (88%) rename src/generated/resources/data/rankine/recipes/{ender_amalgam__hoe.json => ender_amalgam_hoe.json} (88%) rename src/generated/resources/data/rankine/recipes/{ender_amalgam__knife.json => ender_amalgam_knife.json} (87%) rename src/generated/resources/data/rankine/recipes/{ender_amalgam__pickaxe.json => ender_amalgam_pickaxe.json} (88%) rename src/generated/resources/data/rankine/recipes/{ender_amalgam__shovel.json => ender_amalgam_shovel.json} (88%) rename src/generated/resources/data/rankine/recipes/{ender_amalgam__spear.json => ender_amalgam_spear.json} (88%) rename src/generated/resources/data/rankine/recipes/{ender_amalgam__surf_rod.json => ender_amalgam_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{ender_amalgam__sword.json => ender_amalgam_sword.json} (88%) rename src/generated/resources/data/rankine/recipes/{green_gold__axe.json => green_gold_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{green_gold__blunderbuss.json => green_gold_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{green_gold__crowbar.json => green_gold_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{green_gold__hammer.json => green_gold_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{green_gold__hoe.json => green_gold_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{green_gold__knife.json => green_gold_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{green_gold__pickaxe.json => green_gold_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{green_gold__shovel.json => green_gold_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{green_gold__spear.json => green_gold_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{green_gold__surf_rod.json => green_gold_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{green_gold__sword.json => green_gold_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{invar__axe.json => invar_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{invar__blunderbuss.json => invar_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{invar__crowbar.json => invar_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{invar__hammer.json => invar_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{invar__hoe.json => invar_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{invar__knife.json => invar_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{invar__pickaxe.json => invar_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{invar__shovel.json => invar_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{invar__spear.json => invar_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{invar__surf_rod.json => invar_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{invar__sword.json => invar_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{meteoric_iron__axe.json => meteoric_iron_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{meteoric_iron__blunderbuss.json => meteoric_iron_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{meteoric_iron__crowbar.json => meteoric_iron_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{meteoric_iron__hammer.json => meteoric_iron_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{meteoric_iron__hoe.json => meteoric_iron_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{meteoric_iron__knife.json => meteoric_iron_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{meteoric_iron__pickaxe.json => meteoric_iron_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{meteoric_iron__shovel.json => meteoric_iron_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{meteoric_iron__spear.json => meteoric_iron_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{meteoric_iron__surf_rod.json => meteoric_iron_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{meteoric_iron__sword.json => meteoric_iron_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{native_osmiridium__axe.json => native_osmiridium_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{native_osmiridium__blunderbuss.json => native_osmiridium_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{native_osmiridium__crowbar.json => native_osmiridium_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{native_osmiridium__hammer.json => native_osmiridium_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{native_osmiridium__hoe.json => native_osmiridium_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{native_osmiridium__knife.json => native_osmiridium_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{native_osmiridium__pickaxe.json => native_osmiridium_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{native_osmiridium__shovel.json => native_osmiridium_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{native_osmiridium__spear.json => native_osmiridium_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{native_osmiridium__surf_rod.json => native_osmiridium_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{native_osmiridium__sword.json => native_osmiridium_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{nickel_superalloy__axe.json => nickel_superalloy_axe.json} (87%) rename src/generated/resources/data/rankine/recipes/{nickel_superalloy__blunderbuss.json => nickel_superalloy_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{nickel_superalloy__crowbar.json => nickel_superalloy_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{nickel_superalloy__hammer.json => nickel_superalloy_hammer.json} (87%) rename src/generated/resources/data/rankine/recipes/{nickel_superalloy__hoe.json => nickel_superalloy_hoe.json} (87%) rename src/generated/resources/data/rankine/recipes/{nickel_superalloy__knife.json => nickel_superalloy_knife.json} (87%) rename src/generated/resources/data/rankine/recipes/{nickel_superalloy__pickaxe.json => nickel_superalloy_pickaxe.json} (87%) rename src/generated/resources/data/rankine/recipes/{nickel_superalloy__shovel.json => nickel_superalloy_shovel.json} (87%) rename src/generated/resources/data/rankine/recipes/{nickel_superalloy__spear.json => nickel_superalloy_spear.json} (87%) rename src/generated/resources/data/rankine/recipes/{nickel_superalloy__surf_rod.json => nickel_superalloy_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{nickel_superalloy__sword.json => nickel_superalloy_sword.json} (87%) rename src/generated/resources/data/rankine/recipes/{niobium_alloy__axe.json => niobium_alloy_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{niobium_alloy__blunderbuss.json => niobium_alloy_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{niobium_alloy__crowbar.json => niobium_alloy_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{niobium_alloy__hammer.json => niobium_alloy_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{niobium_alloy__hoe.json => niobium_alloy_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{niobium_alloy__knife.json => niobium_alloy_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{niobium_alloy__pickaxe.json => niobium_alloy_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{niobium_alloy__shovel.json => niobium_alloy_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{niobium_alloy__spear.json => niobium_alloy_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{niobium_alloy__surf_rod.json => niobium_alloy_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{niobium_alloy__sword.json => niobium_alloy_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{nitinol__axe.json => nitinol_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{nitinol__blunderbuss.json => nitinol_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{nitinol__crowbar.json => nitinol_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{nitinol__hammer.json => nitinol_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{nitinol__hoe.json => nitinol_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{nitinol__knife.json => nitinol_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{nitinol__pickaxe.json => nitinol_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{nitinol__shovel.json => nitinol_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{nitinol__spear.json => nitinol_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{nitinol__surf_rod.json => nitinol_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{nitinol__sword.json => nitinol_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{osmiridium__axe.json => osmiridium_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{osmiridium__blunderbuss.json => osmiridium_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{osmiridium__crowbar.json => osmiridium_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{osmiridium__hammer.json => osmiridium_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{osmiridium__hoe.json => osmiridium_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{osmiridium__knife.json => osmiridium_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{osmiridium__pickaxe.json => osmiridium_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{osmiridium__shovel.json => osmiridium_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{osmiridium__spear.json => osmiridium_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{osmiridium__surf_rod.json => osmiridium_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{osmiridium__sword.json => osmiridium_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{pewter__axe.json => pewter_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{pewter__blunderbuss.json => pewter_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{pewter__crowbar.json => pewter_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{pewter__hammer.json => pewter_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{pewter__hoe.json => pewter_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{pewter__knife.json => pewter_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{pewter__pickaxe.json => pewter_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{pewter__shovel.json => pewter_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{pewter__spear.json => pewter_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{pewter__surf_rod.json => pewter_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{pewter__sword.json => pewter_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{purple_gold__axe.json => purple_gold_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{purple_gold__blunderbuss.json => purple_gold_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{purple_gold__crowbar.json => purple_gold_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{purple_gold__hammer.json => purple_gold_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{purple_gold__hoe.json => purple_gold_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{purple_gold__knife.json => purple_gold_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{purple_gold__pickaxe.json => purple_gold_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{purple_gold__shovel.json => purple_gold_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{purple_gold__spear.json => purple_gold_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{purple_gold__surf_rod.json => purple_gold_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{purple_gold__sword.json => purple_gold_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{rose_gold__axe.json => rose_gold_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{rose_gold__blunderbuss.json => rose_gold_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{rose_gold__crowbar.json => rose_gold_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{rose_gold__hammer.json => rose_gold_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{rose_gold__hoe.json => rose_gold_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{rose_gold__knife.json => rose_gold_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{rose_gold__pickaxe.json => rose_gold_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{rose_gold__shovel.json => rose_gold_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{rose_gold__spear.json => rose_gold_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{rose_gold__surf_rod.json => rose_gold_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{rose_gold__sword.json => rose_gold_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{stainless_steel__axe.json => stainless_steel_axe.json} (87%) rename src/generated/resources/data/rankine/recipes/{stainless_steel__blunderbuss.json => stainless_steel_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{stainless_steel__crowbar.json => stainless_steel_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{stainless_steel__hammer.json => stainless_steel_hammer.json} (87%) rename src/generated/resources/data/rankine/recipes/{stainless_steel__hoe.json => stainless_steel_hoe.json} (87%) rename src/generated/resources/data/rankine/recipes/{stainless_steel__knife.json => stainless_steel_knife.json} (87%) rename src/generated/resources/data/rankine/recipes/{stainless_steel__pickaxe.json => stainless_steel_pickaxe.json} (88%) rename src/generated/resources/data/rankine/recipes/{stainless_steel__shovel.json => stainless_steel_shovel.json} (87%) rename src/generated/resources/data/rankine/recipes/{stainless_steel__spear.json => stainless_steel_spear.json} (87%) rename src/generated/resources/data/rankine/recipes/{stainless_steel__surf_rod.json => stainless_steel_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{stainless_steel__sword.json => stainless_steel_sword.json} (87%) rename src/generated/resources/data/rankine/recipes/{steel__axe.json => steel_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{steel__blunderbuss.json => steel_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{steel__crowbar.json => steel_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{steel__hammer.json => steel_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{steel__hoe.json => steel_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{steel__knife.json => steel_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{steel__pickaxe.json => steel_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{steel__shovel.json => steel_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{steel__spear.json => steel_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{steel__surf_rod.json => steel_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{steel__sword.json => steel_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{titanium_alloy__axe.json => titanium_alloy_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{titanium_alloy__blunderbuss.json => titanium_alloy_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{titanium_alloy__crowbar.json => titanium_alloy_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{titanium_alloy__hammer.json => titanium_alloy_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{titanium_alloy__hoe.json => titanium_alloy_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{titanium_alloy__knife.json => titanium_alloy_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{titanium_alloy__pickaxe.json => titanium_alloy_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{titanium_alloy__shovel.json => titanium_alloy_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{titanium_alloy__spear.json => titanium_alloy_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{titanium_alloy__surf_rod.json => titanium_alloy_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{titanium_alloy__sword.json => titanium_alloy_sword.json} (100%) create mode 100644 src/generated/resources/data/rankine/recipes/totem_of_blazing.json rename src/generated/resources/data/rankine/recipes/{tungsten_heavy_alloy__axe.json => tungsten_heavy_alloy_axe.json} (87%) rename src/generated/resources/data/rankine/recipes/{tungsten_heavy_alloy__blunderbuss.json => tungsten_heavy_alloy_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{tungsten_heavy_alloy__crowbar.json => tungsten_heavy_alloy_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{tungsten_heavy_alloy__hammer.json => tungsten_heavy_alloy_hammer.json} (87%) rename src/generated/resources/data/rankine/recipes/{tungsten_heavy_alloy__hoe.json => tungsten_heavy_alloy_hoe.json} (87%) rename src/generated/resources/data/rankine/recipes/{tungsten_heavy_alloy__knife.json => tungsten_heavy_alloy_knife.json} (87%) rename src/generated/resources/data/rankine/recipes/{tungsten_heavy_alloy__pickaxe.json => tungsten_heavy_alloy_pickaxe.json} (87%) rename src/generated/resources/data/rankine/recipes/{tungsten_heavy_alloy__shovel.json => tungsten_heavy_alloy_shovel.json} (87%) rename src/generated/resources/data/rankine/recipes/{tungsten_heavy_alloy__spear.json => tungsten_heavy_alloy_spear.json} (87%) rename src/generated/resources/data/rankine/recipes/{tungsten_heavy_alloy__surf_rod.json => tungsten_heavy_alloy_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{tungsten_heavy_alloy__sword.json => tungsten_heavy_alloy_sword.json} (87%) rename src/generated/resources/data/rankine/recipes/{white_gold__axe.json => white_gold_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{white_gold__blunderbuss.json => white_gold_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{white_gold__crowbar.json => white_gold_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{white_gold__hammer.json => white_gold_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{white_gold__hoe.json => white_gold_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{white_gold__knife.json => white_gold_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{white_gold__pickaxe.json => white_gold_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{white_gold__shovel.json => white_gold_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{white_gold__spear.json => white_gold_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{white_gold__surf_rod.json => white_gold_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{white_gold__sword.json => white_gold_sword.json} (100%) rename src/generated/resources/data/rankine/recipes/{zirconium_alloy__axe.json => zirconium_alloy_axe.json} (100%) rename src/generated/resources/data/rankine/recipes/{zirconium_alloy__blunderbuss.json => zirconium_alloy_blunderbuss.json} (100%) rename src/generated/resources/data/rankine/recipes/{zirconium_alloy__crowbar.json => zirconium_alloy_crowbar.json} (100%) rename src/generated/resources/data/rankine/recipes/{zirconium_alloy__hammer.json => zirconium_alloy_hammer.json} (100%) rename src/generated/resources/data/rankine/recipes/{zirconium_alloy__hoe.json => zirconium_alloy_hoe.json} (100%) rename src/generated/resources/data/rankine/recipes/{zirconium_alloy__knife.json => zirconium_alloy_knife.json} (100%) rename src/generated/resources/data/rankine/recipes/{zirconium_alloy__pickaxe.json => zirconium_alloy_pickaxe.json} (100%) rename src/generated/resources/data/rankine/recipes/{zirconium_alloy__shovel.json => zirconium_alloy_shovel.json} (100%) rename src/generated/resources/data/rankine/recipes/{zirconium_alloy__spear.json => zirconium_alloy_spear.json} (100%) rename src/generated/resources/data/rankine/recipes/{zirconium_alloy__surf_rod.json => zirconium_alloy_surf_rod.json} (100%) rename src/generated/resources/data/rankine/recipes/{zirconium_alloy__sword.json => zirconium_alloy_sword.json} (100%) create mode 100644 src/main/java/com/cannolicatfish/rankine/compatibility/AlexMobs.java diff --git a/src/generated/resources/assets/rankine/lang/en_us.json b/src/generated/resources/assets/rankine/lang/en_us.json index bf5dd496eb..5f9771e392 100644 --- a/src/generated/resources/assets/rankine/lang/en_us.json +++ b/src/generated/resources/assets/rankine/lang/en_us.json @@ -2820,6 +2820,8 @@ "death.attack.columns.player": "%1$s was squished by a falling column whilst trying to escape %2$s", "death.attack.suffocating": "%1$s suffocated in a gas cloud", "death.attack.suffocating.player": "%1$s suffocated in a gas cloud whilst trying to escape %2$s", + "effect.rankine.conductive": "Conductive", + "effect.rankine.mercury_poison": "Mercury Poisoning", "element.rankine:elements/copper.desc0": "Copper is a transition metal with an atomic number of 29.", "element.rankine:elements/copper.desc1": "Commonly used in electrical components and early alloys.", "element.rankine:elements/copper.desc2": "Commonly used in electrical components and early alloys.", @@ -2953,6 +2955,12 @@ "fluid.rankine.sap": "Sap", "fluid.rankine.sulfuric_acid": "Sulfuric Acid", "fluid.rankine.white_liquor": "White Liquor", + "item.minecraft.lingering_potion.effect.conductive": "Lingering Potion of Conductivity", + "item.minecraft.lingering_potion.effect.mercury_poison": "Lingering Potion of Mercury Poisoning", + "item.minecraft.potion.effect.conductive": "Potion of Conductivity", + "item.minecraft.potion.effect.mercury_poison": "Potion of Mercury Poisoning", + "item.minecraft.splash_potion.effect.conductive": "Splash Potion of Conductivity", + "item.minecraft.splash_potion.effect.mercury_poison": "Splash Potion of Mercury Poisoning", "item.rankine.acanthite": "Acanthite", "item.rankine.acanthite.tooltip0": "Ag2S", "item.rankine.acanthite.tooltip1": "Used as a source of silver.", @@ -4557,7 +4565,7 @@ "rankine.journal.cat_tools.standard_tools.text9": "A familiar tool used to break wooden blocks. Additional items can be obtained from stripping logs. $(br2)Alloy axes have the bonus capability of chopping down entire trees.", "rankine.journal.cat_tools.totems.name": "Totems", "rankine.journal.cat_tools.totems.text1": "Totems are relics derived from the natural magics of the world. While in the offhand, they provide various effects.", - "rankine.journal.cat_tools.totems.totem_of_blazing": "", + "rankine.journal.cat_tools.totems.totem_of_blazing": "When on fire, deal 1.5x damage and lay fire at your feet. When health is less than 25% or you fall in lava, this totem disappears and provides Fire Resistance and a small amount of Regeneration.", "rankine.journal.cat_tools.totems.totem_of_cobbling": "Internally stores all types of stones up to 8 stacks. Can be used to place cobblestone.", "rankine.journal.cat_tools.totems.totem_of_enduring": "Increases the wearer's health capacity. Can be used every so often to apply regeneration.", "rankine.journal.cat_tools.totems.totem_of_hastening": "Applies efficiency to your arms, allowing you to mine all blocks quicker.", diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__pickaxe.json deleted file mode 100644 index 04ff7ebd1d..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:amalgam__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:amalgam_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:amalgam__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__shovel.json deleted file mode 100644 index 50b6b103d2..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:amalgam__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:amalgam_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:amalgam__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__surf_rod.json deleted file mode 100644 index c6c5c30fce..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:amalgam__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:amalgam_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:amalgam__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__sword.json deleted file mode 100644 index 65e866b141..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:amalgam__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:amalgam_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:amalgam__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_axe.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_axe.json index 0ef6065466..15e503b46c 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:amalgam__axe" + "rankine:amalgam_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:amalgam__axe" + "recipe": "rankine:amalgam_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_blunderbuss.json new file mode 100644 index 0000000000..5ca585da99 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:amalgam_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:amalgam_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:amalgam_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_crowbar.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_crowbar.json index ed2e834f14..2913c4b4f9 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:amalgam__hammer" + "rankine:amalgam_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:amalgam__hammer" + "recipe": "rankine:amalgam_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_hammer.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_hammer.json index da05045c65..15500e2376 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:amalgam__knife" + "rankine:amalgam_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:amalgam__knife" + "recipe": "rankine:amalgam_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_hoe.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_hoe.json index 9f7a3bf700..41f67663ab 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:amalgam__hoe" + "rankine:amalgam_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:amalgam__hoe" + "recipe": "rankine:amalgam_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_knife.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_knife.json index 9afd30a19c..02cb4425d9 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:amalgam__spear" + "rankine:amalgam_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:amalgam__spear" + "recipe": "rankine:amalgam_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_pickaxe.json new file mode 100644 index 0000000000..feb4664193 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:amalgam_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:amalgam_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:amalgam_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_shovel.json new file mode 100644 index 0000000000..0a74a288a5 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:amalgam_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:amalgam_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:amalgam_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_spear.json new file mode 100644 index 0000000000..2877d5a607 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:amalgam_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:amalgam_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:amalgam_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_surf_rod.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_surf_rod.json index dc107697fe..041110b1f4 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:amalgam__crowbar" + "rankine:amalgam_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:amalgam__crowbar" + "recipe": "rankine:amalgam_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_sword.json new file mode 100644 index 0000000000..0de18c3606 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:amalgam_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:amalgam_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:amalgam_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__blunderbuss.json deleted file mode 100644 index dcc32dae50..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:black_gold__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:black_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:black_gold__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__pickaxe.json deleted file mode 100644 index 49150685e6..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:black_gold__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:black_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:black_gold__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__shovel.json deleted file mode 100644 index ee1cd263eb..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:black_gold__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:black_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:black_gold__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__surf_rod.json deleted file mode 100644 index a7ae71a0d4..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:black_gold__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:black_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:black_gold__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__sword.json deleted file mode 100644 index 2255bbba33..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:black_gold__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:black_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:black_gold__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_axe.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_axe.json index 78695eb165..f939f5cc12 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:black_gold__axe" + "rankine:black_gold_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:black_gold__axe" + "recipe": "rankine:black_gold_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_blunderbuss.json new file mode 100644 index 0000000000..32bb714a82 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:black_gold_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:black_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:black_gold_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_crowbar.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_crowbar.json index 5ab9428ebd..9dd45c625c 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:black_gold__hammer" + "rankine:black_gold_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:black_gold__hammer" + "recipe": "rankine:black_gold_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_hammer.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_hammer.json index 96b40fb276..4b22883df6 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:black_gold__knife" + "rankine:black_gold_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:black_gold__knife" + "recipe": "rankine:black_gold_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_hoe.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_hoe.json index d301fb575a..1c3de9943f 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:black_gold__hoe" + "rankine:black_gold_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:black_gold__hoe" + "recipe": "rankine:black_gold_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_knife.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_knife.json index 520ccf7923..2dfa612c6c 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:black_gold__spear" + "rankine:black_gold_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:black_gold__spear" + "recipe": "rankine:black_gold_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_pickaxe.json new file mode 100644 index 0000000000..70338c1b57 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:black_gold_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:black_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:black_gold_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_shovel.json new file mode 100644 index 0000000000..e15da2324f --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:black_gold_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:black_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:black_gold_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_spear.json new file mode 100644 index 0000000000..4605730ad5 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:black_gold_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:black_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:black_gold_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_surf_rod.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_surf_rod.json index c3c73787c5..925156d680 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:black_gold__crowbar" + "rankine:black_gold_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:black_gold__crowbar" + "recipe": "rankine:black_gold_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_sword.json new file mode 100644 index 0000000000..8c6602ec6b --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/black_gold_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:black_gold_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:black_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:black_gold_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__blunderbuss.json deleted file mode 100644 index fa86f01eec..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:blue_gold__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:blue_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:blue_gold__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__pickaxe.json deleted file mode 100644 index 413c40eb92..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:blue_gold__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:blue_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:blue_gold__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__shovel.json deleted file mode 100644 index 8844e5dcc9..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:blue_gold__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:blue_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:blue_gold__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__surf_rod.json deleted file mode 100644 index 6319c56288..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:blue_gold__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:blue_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:blue_gold__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__sword.json deleted file mode 100644 index bb1e8f8dc2..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:blue_gold__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:blue_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:blue_gold__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_axe.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_axe.json index 4fcd1a2f5e..7c31f413ae 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:blue_gold__axe" + "rankine:blue_gold_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:blue_gold__axe" + "recipe": "rankine:blue_gold_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_blunderbuss.json new file mode 100644 index 0000000000..7eae481de2 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:blue_gold_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:blue_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:blue_gold_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_crowbar.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_crowbar.json index b2b2507758..36c0f9f2c9 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:blue_gold__hammer" + "rankine:blue_gold_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:blue_gold__hammer" + "recipe": "rankine:blue_gold_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_hammer.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_hammer.json index bf365e876f..27e28b17c3 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:blue_gold__knife" + "rankine:blue_gold_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:blue_gold__knife" + "recipe": "rankine:blue_gold_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_hoe.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_hoe.json index 9951212cb6..6644114fbe 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:blue_gold__hoe" + "rankine:blue_gold_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:blue_gold__hoe" + "recipe": "rankine:blue_gold_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_knife.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_knife.json index 211f7e0cc5..099c4d7400 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:blue_gold__spear" + "rankine:blue_gold_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:blue_gold__spear" + "recipe": "rankine:blue_gold_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_pickaxe.json new file mode 100644 index 0000000000..ebd3642a1f --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:blue_gold_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:blue_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:blue_gold_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_shovel.json new file mode 100644 index 0000000000..00a91b5936 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:blue_gold_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:blue_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:blue_gold_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_spear.json new file mode 100644 index 0000000000..d10a7d5831 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:blue_gold_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:blue_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:blue_gold_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_surf_rod.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_surf_rod.json index 1d877a7de3..d9b64254b9 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:blue_gold__crowbar" + "rankine:blue_gold_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:blue_gold__crowbar" + "recipe": "rankine:blue_gold_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_sword.json new file mode 100644 index 0000000000..0ef6815689 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/blue_gold_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:blue_gold_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:blue_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:blue_gold_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__blunderbuss.json deleted file mode 100644 index a4df747fd6..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:brass__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:brass_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:brass__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__pickaxe.json deleted file mode 100644 index b7dd5bcbf6..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:brass__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:brass_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:brass__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__shovel.json deleted file mode 100644 index 6df7b99076..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:brass__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:brass_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:brass__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__surf_rod.json deleted file mode 100644 index e185fe9bb8..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:brass__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:brass_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:brass__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__sword.json deleted file mode 100644 index a2cb9036e3..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:brass__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:brass_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:brass__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_axe.json similarity index 88% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_axe.json index 297fa8a6e2..78eec3b2e4 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:brass__axe" + "rankine:brass_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:brass__axe" + "recipe": "rankine:brass_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_blunderbuss.json new file mode 100644 index 0000000000..5e080820ae --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:brass_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:brass_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:brass_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_crowbar.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_crowbar.json index 8b70d470f7..90aa62aa82 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:brass__hammer" + "rankine:brass_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:brass__hammer" + "recipe": "rankine:brass_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_hammer.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_hammer.json index ec2e3a4551..438b284e57 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:brass__knife" + "rankine:brass_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:brass__knife" + "recipe": "rankine:brass_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_hoe.json similarity index 88% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_hoe.json index 93a2d878be..29170ff2fc 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:brass__hoe" + "rankine:brass_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:brass__hoe" + "recipe": "rankine:brass_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_knife.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_knife.json index e534a5dedf..aed0c40774 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:brass__spear" + "rankine:brass_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:brass__spear" + "recipe": "rankine:brass_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_pickaxe.json new file mode 100644 index 0000000000..48b57dafaa --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:brass_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:brass_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:brass_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_shovel.json new file mode 100644 index 0000000000..c9c2b4ad97 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:brass_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:brass_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:brass_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_spear.json new file mode 100644 index 0000000000..2f13f05766 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:brass_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:brass_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:brass_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_surf_rod.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_surf_rod.json index 49a0401ba9..c063cd820c 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:brass__crowbar" + "rankine:brass_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:brass__crowbar" + "recipe": "rankine:brass_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_sword.json new file mode 100644 index 0000000000..7ef3cccf9e --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/brass_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:brass_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:brass_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:brass_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__blunderbuss.json deleted file mode 100644 index 74e7455cb4..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:bronze__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:bronze_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:bronze__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__pickaxe.json deleted file mode 100644 index 3299475d84..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:bronze__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:bronze_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:bronze__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__shovel.json deleted file mode 100644 index 2d41e021c1..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:bronze__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:bronze_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:bronze__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__surf_rod.json deleted file mode 100644 index 94b64eee6f..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:bronze__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:bronze_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:bronze__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__sword.json deleted file mode 100644 index b1a6002dc0..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:bronze__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:bronze_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:bronze__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_axe.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_axe.json index 3ed245c3fd..d04e9f70b1 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:bronze__axe" + "rankine:bronze_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:bronze__axe" + "recipe": "rankine:bronze_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_blunderbuss.json new file mode 100644 index 0000000000..76f8b1cd62 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:bronze_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:bronze_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:bronze_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_crowbar.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_crowbar.json index 9cd80697d4..5ca4f8167b 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:bronze__hammer" + "rankine:bronze_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:bronze__hammer" + "recipe": "rankine:bronze_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_hammer.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_hammer.json index 67d34b7ee9..14fd421fe4 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:bronze__knife" + "rankine:bronze_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:bronze__knife" + "recipe": "rankine:bronze_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_hoe.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_hoe.json index b89ecb30b9..8921607b17 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:bronze__hoe" + "rankine:bronze_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:bronze__hoe" + "recipe": "rankine:bronze_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_knife.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_knife.json index c7235be3c6..8c258dcda0 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:bronze__spear" + "rankine:bronze_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:bronze__spear" + "recipe": "rankine:bronze_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_pickaxe.json new file mode 100644 index 0000000000..f18bd8f657 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:bronze_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:bronze_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:bronze_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_shovel.json new file mode 100644 index 0000000000..5183bc3145 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:bronze_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:bronze_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:bronze_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_spear.json new file mode 100644 index 0000000000..1ae1153b2c --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:bronze_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:bronze_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:bronze_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_surf_rod.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_surf_rod.json index 3e697055eb..69156003dd 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:bronze__crowbar" + "rankine:bronze_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:bronze__crowbar" + "recipe": "rankine:bronze_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_sword.json new file mode 100644 index 0000000000..2fea614d6a --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/bronze_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:bronze_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:bronze_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:bronze_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__blunderbuss.json deleted file mode 100644 index 7b0d3e360a..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:cobalt_superalloy__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:cobalt_superalloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:cobalt_superalloy__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__pickaxe.json deleted file mode 100644 index bf011dfc28..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:cobalt_superalloy__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:cobalt_superalloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:cobalt_superalloy__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__shovel.json deleted file mode 100644 index 37455c2629..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:cobalt_superalloy__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:cobalt_superalloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:cobalt_superalloy__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__surf_rod.json deleted file mode 100644 index a0c49153f3..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:cobalt_superalloy__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:cobalt_superalloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:cobalt_superalloy__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__sword.json deleted file mode 100644 index 9255c13153..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:cobalt_superalloy__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:cobalt_superalloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:cobalt_superalloy__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_axe.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_axe.json index 4a606567c6..9b8130ff5d 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:cobalt_superalloy__axe" + "rankine:cobalt_superalloy_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:cobalt_superalloy__axe" + "recipe": "rankine:cobalt_superalloy_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_blunderbuss.json new file mode 100644 index 0000000000..e366a1da1f --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:cobalt_superalloy_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:cobalt_superalloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:cobalt_superalloy_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_crowbar.json similarity index 83% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_crowbar.json index cb1c95cafc..0fb3e1ac18 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:cobalt_superalloy__hammer" + "rankine:cobalt_superalloy_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:cobalt_superalloy__hammer" + "recipe": "rankine:cobalt_superalloy_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_hammer.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_hammer.json index e18be1da48..d42e593ed9 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:cobalt_superalloy__knife" + "rankine:cobalt_superalloy_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:cobalt_superalloy__knife" + "recipe": "rankine:cobalt_superalloy_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_hoe.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_hoe.json index d4e2bf2b49..5592fa18c1 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:cobalt_superalloy__hoe" + "rankine:cobalt_superalloy_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:cobalt_superalloy__hoe" + "recipe": "rankine:cobalt_superalloy_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_knife.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_knife.json index 83eea90da1..f590a6c8dd 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:cobalt_superalloy__spear" + "rankine:cobalt_superalloy_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:cobalt_superalloy__spear" + "recipe": "rankine:cobalt_superalloy_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_pickaxe.json new file mode 100644 index 0000000000..0824458b95 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:cobalt_superalloy_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:cobalt_superalloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:cobalt_superalloy_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_shovel.json new file mode 100644 index 0000000000..cfd5103ae9 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:cobalt_superalloy_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:cobalt_superalloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:cobalt_superalloy_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_spear.json new file mode 100644 index 0000000000..72e9e8a7cb --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:cobalt_superalloy_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:cobalt_superalloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:cobalt_superalloy_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_surf_rod.json similarity index 83% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_surf_rod.json index 9d20c7fcec..581f0a3c9c 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:cobalt_superalloy__crowbar" + "rankine:cobalt_superalloy_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:cobalt_superalloy__crowbar" + "recipe": "rankine:cobalt_superalloy_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_sword.json new file mode 100644 index 0000000000..bd518838f6 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/cobalt_superalloy_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:cobalt_superalloy_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:cobalt_superalloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:cobalt_superalloy_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__blunderbuss.json deleted file mode 100644 index c13e50695c..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:ender_amalgam__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:ender_amalgam_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:ender_amalgam__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__pickaxe.json deleted file mode 100644 index fe492dabaa..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:ender_amalgam__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:ender_amalgam_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:ender_amalgam__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__shovel.json deleted file mode 100644 index 0cf3ad82f0..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:ender_amalgam__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:ender_amalgam_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:ender_amalgam__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__surf_rod.json deleted file mode 100644 index 0594658fb6..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:ender_amalgam__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:ender_amalgam_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:ender_amalgam__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__sword.json deleted file mode 100644 index 08e3d96828..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:ender_amalgam__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:ender_amalgam_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:ender_amalgam__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_axe.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_axe.json index 57b341db01..0b03454e3d 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:ender_amalgam__axe" + "rankine:ender_amalgam_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:ender_amalgam__axe" + "recipe": "rankine:ender_amalgam_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_blunderbuss.json new file mode 100644 index 0000000000..74a8aae1aa --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:ender_amalgam_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:ender_amalgam_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:ender_amalgam_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_crowbar.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_crowbar.json index 1dec8c5e0a..363f906080 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:ender_amalgam__hammer" + "rankine:ender_amalgam_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:ender_amalgam__hammer" + "recipe": "rankine:ender_amalgam_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_hammer.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_hammer.json index 8b8434acad..50e323a1f6 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:ender_amalgam__knife" + "rankine:ender_amalgam_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:ender_amalgam__knife" + "recipe": "rankine:ender_amalgam_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_hoe.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_hoe.json index dfa472d8f8..017c5f2e1f 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:ender_amalgam__hoe" + "rankine:ender_amalgam_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:ender_amalgam__hoe" + "recipe": "rankine:ender_amalgam_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_knife.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_knife.json index 81356a66c5..89fc2c71ba 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:ender_amalgam__spear" + "rankine:ender_amalgam_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:ender_amalgam__spear" + "recipe": "rankine:ender_amalgam_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_pickaxe.json new file mode 100644 index 0000000000..0235d81eb1 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:ender_amalgam_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:ender_amalgam_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:ender_amalgam_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_shovel.json new file mode 100644 index 0000000000..f0aff03e7f --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:ender_amalgam_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:ender_amalgam_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:ender_amalgam_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_spear.json new file mode 100644 index 0000000000..f238ee7c70 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:ender_amalgam_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:ender_amalgam_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:ender_amalgam_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_surf_rod.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_surf_rod.json index 611bd5301b..f2eb5185e3 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:ender_amalgam__crowbar" + "rankine:ender_amalgam_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:ender_amalgam__crowbar" + "recipe": "rankine:ender_amalgam_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_sword.json new file mode 100644 index 0000000000..b6c22fe1a0 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/ender_amalgam_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:ender_amalgam_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:ender_amalgam_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:ender_amalgam_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__blunderbuss.json deleted file mode 100644 index 282c8c16e0..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:green_gold__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:green_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:green_gold__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__pickaxe.json deleted file mode 100644 index 3f5a91c717..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:green_gold__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:green_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:green_gold__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__shovel.json deleted file mode 100644 index 89803af7d2..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:green_gold__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:green_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:green_gold__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__surf_rod.json deleted file mode 100644 index 59506b404a..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:green_gold__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:green_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:green_gold__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__sword.json deleted file mode 100644 index 5cd014a60a..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:green_gold__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:green_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:green_gold__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_axe.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_axe.json index ae3c4db57b..a6f9efaf73 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:green_gold__axe" + "rankine:green_gold_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:green_gold__axe" + "recipe": "rankine:green_gold_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_blunderbuss.json new file mode 100644 index 0000000000..bc57bf2303 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:green_gold_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:green_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:green_gold_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_crowbar.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_crowbar.json index 75bf80eede..abffcfa011 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:green_gold__hammer" + "rankine:green_gold_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:green_gold__hammer" + "recipe": "rankine:green_gold_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_hammer.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_hammer.json index 65203248a0..f9329da27b 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:green_gold__knife" + "rankine:green_gold_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:green_gold__knife" + "recipe": "rankine:green_gold_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_hoe.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_hoe.json index b565494fbc..2661da7b29 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:green_gold__hoe" + "rankine:green_gold_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:green_gold__hoe" + "recipe": "rankine:green_gold_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_knife.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_knife.json index 3562f72c31..e5cdd9687e 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:green_gold__spear" + "rankine:green_gold_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:green_gold__spear" + "recipe": "rankine:green_gold_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_pickaxe.json new file mode 100644 index 0000000000..067340282a --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:green_gold_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:green_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:green_gold_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_shovel.json new file mode 100644 index 0000000000..e83f825c7e --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:green_gold_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:green_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:green_gold_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_spear.json new file mode 100644 index 0000000000..e6e856116d --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:green_gold_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:green_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:green_gold_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_surf_rod.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_surf_rod.json index 7a0cd77984..1a114d70a7 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:green_gold__crowbar" + "rankine:green_gold_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:green_gold__crowbar" + "recipe": "rankine:green_gold_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_sword.json new file mode 100644 index 0000000000..619e51b6b6 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/green_gold_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:green_gold_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:green_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:green_gold_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__blunderbuss.json deleted file mode 100644 index fd7d15f258..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:invar__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:invar_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:invar__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__pickaxe.json deleted file mode 100644 index 2537354a91..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:invar__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:invar_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:invar__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__shovel.json deleted file mode 100644 index f23f66c8e5..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:invar__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:invar_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:invar__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__surf_rod.json deleted file mode 100644 index 722ece3d14..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:invar__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:invar_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:invar__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__sword.json deleted file mode 100644 index 8625fdd9cc..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:invar__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:invar_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:invar__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_axe.json similarity index 88% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_axe.json index 2178045c2b..d562571875 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:invar__axe" + "rankine:invar_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:invar__axe" + "recipe": "rankine:invar_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_blunderbuss.json new file mode 100644 index 0000000000..80ed1f4388 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:invar_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:invar_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:invar_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_crowbar.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_crowbar.json index 047e7344f1..a0eee622a0 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:invar__hammer" + "rankine:invar_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:invar__hammer" + "recipe": "rankine:invar_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_hammer.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_hammer.json index 8d7577da24..5d704878e0 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:invar__knife" + "rankine:invar_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:invar__knife" + "recipe": "rankine:invar_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_hoe.json similarity index 88% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_hoe.json index d3ff3865cd..dd3b57fc53 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:invar__hoe" + "rankine:invar_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:invar__hoe" + "recipe": "rankine:invar_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_knife.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_knife.json index 34cd294884..5cdad32ed2 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:invar__spear" + "rankine:invar_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:invar__spear" + "recipe": "rankine:invar_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_pickaxe.json new file mode 100644 index 0000000000..acf7f797eb --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:invar_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:invar_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:invar_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_shovel.json new file mode 100644 index 0000000000..2d63f49c8e --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:invar_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:invar_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:invar_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_spear.json new file mode 100644 index 0000000000..d57fa10c95 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:invar_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:invar_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:invar_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_surf_rod.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_surf_rod.json index b1e0cb2c37..f9c450478c 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:invar__crowbar" + "rankine:invar_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:invar__crowbar" + "recipe": "rankine:invar_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_sword.json new file mode 100644 index 0000000000..9e032ddab9 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/invar_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:invar_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:invar_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:invar_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__blunderbuss.json deleted file mode 100644 index 054b16e2d7..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:meteoric_iron__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:meteoric_iron" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:meteoric_iron__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__pickaxe.json deleted file mode 100644 index 2ccd4845ca..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:meteoric_iron__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:meteoric_iron" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:meteoric_iron__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__shovel.json deleted file mode 100644 index 9f817bebec..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:meteoric_iron__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:meteoric_iron" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:meteoric_iron__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__surf_rod.json deleted file mode 100644 index 5a72c623e6..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:meteoric_iron__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:meteoric_iron" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:meteoric_iron__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__sword.json deleted file mode 100644 index cb8db07114..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:meteoric_iron__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:meteoric_iron" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:meteoric_iron__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_axe.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_axe.json index 77db3f8b6b..1cf04bf3f7 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:meteoric_iron__axe" + "rankine:meteoric_iron_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:meteoric_iron__axe" + "recipe": "rankine:meteoric_iron_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_blunderbuss.json new file mode 100644 index 0000000000..6c65558397 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:meteoric_iron_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:meteoric_iron" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:meteoric_iron_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_crowbar.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_crowbar.json index 5778881aef..76f793e788 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:meteoric_iron__hammer" + "rankine:meteoric_iron_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:meteoric_iron__hammer" + "recipe": "rankine:meteoric_iron_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_hammer.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_hammer.json index e8bd72079b..f1c4688b81 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:meteoric_iron__knife" + "rankine:meteoric_iron_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:meteoric_iron__knife" + "recipe": "rankine:meteoric_iron_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_hoe.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_hoe.json index b39f223331..4045149a79 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:meteoric_iron__hoe" + "rankine:meteoric_iron_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:meteoric_iron__hoe" + "recipe": "rankine:meteoric_iron_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_knife.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_knife.json index 2d3374675e..508345912a 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:meteoric_iron__spear" + "rankine:meteoric_iron_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:meteoric_iron__spear" + "recipe": "rankine:meteoric_iron_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_pickaxe.json new file mode 100644 index 0000000000..9974eac5e2 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:meteoric_iron_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:meteoric_iron" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:meteoric_iron_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_shovel.json new file mode 100644 index 0000000000..205d211273 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:meteoric_iron_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:meteoric_iron" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:meteoric_iron_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_spear.json new file mode 100644 index 0000000000..2da8c06270 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:meteoric_iron_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:meteoric_iron" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:meteoric_iron_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_surf_rod.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_surf_rod.json index d638234e60..03ec6730af 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:meteoric_iron__crowbar" + "rankine:meteoric_iron_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:meteoric_iron__crowbar" + "recipe": "rankine:meteoric_iron_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_sword.json new file mode 100644 index 0000000000..bf9a76e91a --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/meteoric_iron_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:meteoric_iron_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:meteoric_iron" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:meteoric_iron_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__blunderbuss.json deleted file mode 100644 index 5701012a62..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:native_osmiridium__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:osmiridium" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:native_osmiridium__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__pickaxe.json deleted file mode 100644 index 48098ee844..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:native_osmiridium__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:osmiridium" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:native_osmiridium__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__shovel.json deleted file mode 100644 index a8ab90ce89..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:native_osmiridium__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:osmiridium" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:native_osmiridium__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__surf_rod.json deleted file mode 100644 index d20fcc0090..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:native_osmiridium__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:osmiridium" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:native_osmiridium__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__sword.json deleted file mode 100644 index e3361442c9..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:native_osmiridium__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:osmiridium" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:native_osmiridium__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_axe.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_axe.json index 7c54e42139..059be64246 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:native_osmiridium__axe" + "rankine:native_osmiridium_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:native_osmiridium__axe" + "recipe": "rankine:native_osmiridium_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_blunderbuss.json new file mode 100644 index 0000000000..2fe9500401 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:native_osmiridium_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:osmiridium" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:native_osmiridium_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_crowbar.json similarity index 83% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_crowbar.json index 269bbeac7f..c82d34fb07 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:native_osmiridium__hammer" + "rankine:native_osmiridium_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:native_osmiridium__hammer" + "recipe": "rankine:native_osmiridium_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_hammer.json similarity index 83% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_hammer.json index 9deeb89e85..993dec17cd 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:native_osmiridium__knife" + "rankine:native_osmiridium_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:native_osmiridium__knife" + "recipe": "rankine:native_osmiridium_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_hoe.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_hoe.json index 84ea05320c..a6fc69ef18 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:native_osmiridium__hoe" + "rankine:native_osmiridium_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:native_osmiridium__hoe" + "recipe": "rankine:native_osmiridium_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_knife.json similarity index 83% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_knife.json index d80560f302..5616f29f0f 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:native_osmiridium__spear" + "rankine:native_osmiridium_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:native_osmiridium__spear" + "recipe": "rankine:native_osmiridium_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_pickaxe.json new file mode 100644 index 0000000000..7cadb69967 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:native_osmiridium_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:osmiridium" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:native_osmiridium_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_shovel.json new file mode 100644 index 0000000000..d0f2bfb808 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:native_osmiridium_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:osmiridium" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:native_osmiridium_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_spear.json new file mode 100644 index 0000000000..123ee553ce --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:native_osmiridium_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:osmiridium" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:native_osmiridium_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_surf_rod.json similarity index 83% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_surf_rod.json index b1dd5eb16c..c31b221f04 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:native_osmiridium__crowbar" + "rankine:native_osmiridium_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:native_osmiridium__crowbar" + "recipe": "rankine:native_osmiridium_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_sword.json new file mode 100644 index 0000000000..fdc768c371 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/native_osmiridium_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:native_osmiridium_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:osmiridium" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:native_osmiridium_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__blunderbuss.json deleted file mode 100644 index 58b1ac710a..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:nickel_superalloy__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:nickel_superalloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:nickel_superalloy__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__pickaxe.json deleted file mode 100644 index 439d76866e..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:nickel_superalloy__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:nickel_superalloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:nickel_superalloy__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__shovel.json deleted file mode 100644 index b7ed5e53f4..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:nickel_superalloy__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:nickel_superalloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:nickel_superalloy__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__surf_rod.json deleted file mode 100644 index 1f13296a7a..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:nickel_superalloy__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:nickel_superalloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:nickel_superalloy__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__sword.json deleted file mode 100644 index f4e7080345..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:nickel_superalloy__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:nickel_superalloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:nickel_superalloy__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_axe.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_axe.json index be60235070..3a6ccbecc3 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:nickel_superalloy__axe" + "rankine:nickel_superalloy_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:nickel_superalloy__axe" + "recipe": "rankine:nickel_superalloy_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_blunderbuss.json new file mode 100644 index 0000000000..a0fda7e9e3 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:nickel_superalloy_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:nickel_superalloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:nickel_superalloy_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_crowbar.json similarity index 83% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_crowbar.json index 99c39a4321..b558b50b42 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:nickel_superalloy__hammer" + "rankine:nickel_superalloy_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:nickel_superalloy__hammer" + "recipe": "rankine:nickel_superalloy_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_hammer.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_hammer.json index c88c5098e3..6be15ec219 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:nickel_superalloy__knife" + "rankine:nickel_superalloy_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:nickel_superalloy__knife" + "recipe": "rankine:nickel_superalloy_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_hoe.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_hoe.json index 67572c1111..f9113302f6 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:nickel_superalloy__hoe" + "rankine:nickel_superalloy_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:nickel_superalloy__hoe" + "recipe": "rankine:nickel_superalloy_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_knife.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_knife.json index 143bcb2e46..02e4870712 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:nickel_superalloy__spear" + "rankine:nickel_superalloy_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:nickel_superalloy__spear" + "recipe": "rankine:nickel_superalloy_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_pickaxe.json new file mode 100644 index 0000000000..16b24d7075 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:nickel_superalloy_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:nickel_superalloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:nickel_superalloy_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_shovel.json new file mode 100644 index 0000000000..83bc7af9c3 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:nickel_superalloy_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:nickel_superalloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:nickel_superalloy_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_spear.json new file mode 100644 index 0000000000..d93ec3ea57 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:nickel_superalloy_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:nickel_superalloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:nickel_superalloy_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_surf_rod.json similarity index 83% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_surf_rod.json index 44e1a26b5f..c6e9c2ea26 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:nickel_superalloy__crowbar" + "rankine:nickel_superalloy_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:nickel_superalloy__crowbar" + "recipe": "rankine:nickel_superalloy_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_sword.json new file mode 100644 index 0000000000..51f64c0a03 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nickel_superalloy_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:nickel_superalloy_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:nickel_superalloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:nickel_superalloy_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__blunderbuss.json deleted file mode 100644 index 4ae104a282..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:niobium_alloy__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:niobium_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:niobium_alloy__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__pickaxe.json deleted file mode 100644 index 661e2c7c95..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:niobium_alloy__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:niobium_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:niobium_alloy__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__shovel.json deleted file mode 100644 index fb3b4ece28..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:niobium_alloy__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:niobium_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:niobium_alloy__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__surf_rod.json deleted file mode 100644 index 203eea6332..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:niobium_alloy__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:niobium_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:niobium_alloy__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__sword.json deleted file mode 100644 index cf9b99633a..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:niobium_alloy__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:niobium_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:niobium_alloy__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_axe.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_axe.json index 18a2f4ffd2..7d76bd255c 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:niobium_alloy__axe" + "rankine:niobium_alloy_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:niobium_alloy__axe" + "recipe": "rankine:niobium_alloy_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_blunderbuss.json new file mode 100644 index 0000000000..ace08eac1c --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:niobium_alloy_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:niobium_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:niobium_alloy_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_crowbar.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_crowbar.json index 059bc42638..5d31d85763 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:niobium_alloy__hammer" + "rankine:niobium_alloy_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:niobium_alloy__hammer" + "recipe": "rankine:niobium_alloy_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_hammer.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_hammer.json index 736efb0ca9..f4d6301c76 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:niobium_alloy__knife" + "rankine:niobium_alloy_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:niobium_alloy__knife" + "recipe": "rankine:niobium_alloy_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_hoe.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_hoe.json index 6aa0383e5f..cd29ccc10c 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:niobium_alloy__hoe" + "rankine:niobium_alloy_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:niobium_alloy__hoe" + "recipe": "rankine:niobium_alloy_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_knife.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_knife.json index 05c38f001a..dcb2f88a7a 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:niobium_alloy__spear" + "rankine:niobium_alloy_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:niobium_alloy__spear" + "recipe": "rankine:niobium_alloy_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_pickaxe.json new file mode 100644 index 0000000000..a5146f23ca --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:niobium_alloy_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:niobium_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:niobium_alloy_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_shovel.json new file mode 100644 index 0000000000..734aabcb3e --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:niobium_alloy_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:niobium_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:niobium_alloy_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_spear.json new file mode 100644 index 0000000000..941f143da0 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:niobium_alloy_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:niobium_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:niobium_alloy_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_surf_rod.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_surf_rod.json index 1cdbcebf32..b28943ad14 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:niobium_alloy__crowbar" + "rankine:niobium_alloy_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:niobium_alloy__crowbar" + "recipe": "rankine:niobium_alloy_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_sword.json new file mode 100644 index 0000000000..a8536b0ed7 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/niobium_alloy_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:niobium_alloy_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:niobium_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:niobium_alloy_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__blunderbuss.json deleted file mode 100644 index 60d3a85e27..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:nitinol__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:nitinol_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:nitinol__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__pickaxe.json deleted file mode 100644 index fa10474302..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:nitinol__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:nitinol_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:nitinol__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__shovel.json deleted file mode 100644 index 1fa66904b4..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:nitinol__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:nitinol_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:nitinol__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__surf_rod.json deleted file mode 100644 index cd7e3dcd7e..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:nitinol__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:nitinol_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:nitinol__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__sword.json deleted file mode 100644 index fb78cdfd67..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:nitinol__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:nitinol_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:nitinol__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_axe.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_axe.json index 91f98ed5be..3df70e4882 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:nitinol__axe" + "rankine:nitinol_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:nitinol__axe" + "recipe": "rankine:nitinol_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_blunderbuss.json new file mode 100644 index 0000000000..d23b2efc40 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:nitinol_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:nitinol_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:nitinol_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_crowbar.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_crowbar.json index 92d4eb30c3..4a4afbf628 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:nitinol__hammer" + "rankine:nitinol_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:nitinol__hammer" + "recipe": "rankine:nitinol_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_hammer.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_hammer.json index 9d5fd6bb15..bda59001ac 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:nitinol__knife" + "rankine:nitinol_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:nitinol__knife" + "recipe": "rankine:nitinol_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_hoe.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_hoe.json index cf7978737a..88e7434e4b 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:nitinol__hoe" + "rankine:nitinol_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:nitinol__hoe" + "recipe": "rankine:nitinol_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_knife.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_knife.json index 1e835f3a0f..d6f43e3c45 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:nitinol__spear" + "rankine:nitinol_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:nitinol__spear" + "recipe": "rankine:nitinol_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_pickaxe.json new file mode 100644 index 0000000000..883c023109 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:nitinol_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:nitinol_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:nitinol_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_shovel.json new file mode 100644 index 0000000000..c36f695b95 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:nitinol_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:nitinol_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:nitinol_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_spear.json new file mode 100644 index 0000000000..0cbf79aaf0 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:nitinol_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:nitinol_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:nitinol_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_surf_rod.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_surf_rod.json index 025fe8d398..3531c52536 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:nitinol__crowbar" + "rankine:nitinol_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:nitinol__crowbar" + "recipe": "rankine:nitinol_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_sword.json new file mode 100644 index 0000000000..3552c6814f --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/nitinol_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:nitinol_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:nitinol_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:nitinol_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__blunderbuss.json deleted file mode 100644 index 38b40087f5..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:osmiridium__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:osmiridium_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:osmiridium__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__pickaxe.json deleted file mode 100644 index 13fbc8b872..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:osmiridium__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:osmiridium_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:osmiridium__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__shovel.json deleted file mode 100644 index f02f6f9eba..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:osmiridium__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:osmiridium_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:osmiridium__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__surf_rod.json deleted file mode 100644 index 212d1b54e2..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:osmiridium__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:osmiridium_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:osmiridium__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__sword.json deleted file mode 100644 index b2d1362321..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:osmiridium__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:osmiridium_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:osmiridium__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_axe.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_axe.json index 90594e7aa3..c795a66971 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:osmiridium__axe" + "rankine:osmiridium_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:osmiridium__axe" + "recipe": "rankine:osmiridium_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_blunderbuss.json new file mode 100644 index 0000000000..c4ed68161b --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:osmiridium_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:osmiridium_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:osmiridium_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_crowbar.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_crowbar.json index dc18cac0ea..878022e9ca 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:osmiridium__hammer" + "rankine:osmiridium_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:osmiridium__hammer" + "recipe": "rankine:osmiridium_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_hammer.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_hammer.json index 813e2cee0b..92e9d1a368 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:osmiridium__knife" + "rankine:osmiridium_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:osmiridium__knife" + "recipe": "rankine:osmiridium_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_hoe.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_hoe.json index 26d40ebec4..c2df3c4999 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:osmiridium__hoe" + "rankine:osmiridium_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:osmiridium__hoe" + "recipe": "rankine:osmiridium_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_knife.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_knife.json index 61d31eb70b..35116baba0 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:osmiridium__spear" + "rankine:osmiridium_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:osmiridium__spear" + "recipe": "rankine:osmiridium_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_pickaxe.json new file mode 100644 index 0000000000..bedb97141d --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:osmiridium_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:osmiridium_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:osmiridium_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_shovel.json new file mode 100644 index 0000000000..dd62d4d571 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:osmiridium_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:osmiridium_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:osmiridium_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_spear.json new file mode 100644 index 0000000000..d7599f8840 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:osmiridium_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:osmiridium_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:osmiridium_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_surf_rod.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_surf_rod.json index 6eb98141fe..fe30306d82 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:osmiridium__crowbar" + "rankine:osmiridium_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:osmiridium__crowbar" + "recipe": "rankine:osmiridium_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_sword.json new file mode 100644 index 0000000000..0d284b66a0 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/osmiridium_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:osmiridium_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:osmiridium_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:osmiridium_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__blunderbuss.json deleted file mode 100644 index aa4520a4c2..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:pewter__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:pewter_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:pewter__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__pickaxe.json deleted file mode 100644 index 5134f12364..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:pewter__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:pewter_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:pewter__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__shovel.json deleted file mode 100644 index aa3553e554..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:pewter__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:pewter_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:pewter__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__surf_rod.json deleted file mode 100644 index 901133691b..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:pewter__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:pewter_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:pewter__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__sword.json deleted file mode 100644 index 57e68c8097..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:pewter__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:pewter_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:pewter__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_axe.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_axe.json index 684c58183f..c7724d0370 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:pewter__axe" + "rankine:pewter_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:pewter__axe" + "recipe": "rankine:pewter_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_blunderbuss.json new file mode 100644 index 0000000000..e0a4bb806b --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:pewter_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:pewter_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:pewter_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_crowbar.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_crowbar.json index 98082f061a..fabad7492d 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:pewter__hammer" + "rankine:pewter_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:pewter__hammer" + "recipe": "rankine:pewter_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_hammer.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_hammer.json index 4043f2a133..68cfca44dc 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:pewter__knife" + "rankine:pewter_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:pewter__knife" + "recipe": "rankine:pewter_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_hoe.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_hoe.json index d18437e245..a2c746ee24 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:pewter__hoe" + "rankine:pewter_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:pewter__hoe" + "recipe": "rankine:pewter_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_knife.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_knife.json index 882323b0a0..2548ddb7eb 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:pewter__spear" + "rankine:pewter_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:pewter__spear" + "recipe": "rankine:pewter_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_pickaxe.json new file mode 100644 index 0000000000..c7b5f33f4d --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:pewter_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:pewter_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:pewter_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_shovel.json new file mode 100644 index 0000000000..14b6f0e2a1 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:pewter_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:pewter_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:pewter_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_spear.json new file mode 100644 index 0000000000..b1d1cea0ac --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:pewter_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:pewter_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:pewter_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_surf_rod.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_surf_rod.json index cd6d2cda8c..a364b4716e 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:pewter__crowbar" + "rankine:pewter_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:pewter__crowbar" + "recipe": "rankine:pewter_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_sword.json new file mode 100644 index 0000000000..86629edcaa --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/pewter_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:pewter_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:pewter_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:pewter_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__blunderbuss.json deleted file mode 100644 index 786ba0c1a0..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:purple_gold__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:purple_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:purple_gold__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__pickaxe.json deleted file mode 100644 index 2c7d7011bb..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:purple_gold__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:purple_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:purple_gold__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__shovel.json deleted file mode 100644 index b54ef5e36a..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:purple_gold__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:purple_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:purple_gold__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__surf_rod.json deleted file mode 100644 index 88bebbdef5..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:purple_gold__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:purple_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:purple_gold__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__sword.json deleted file mode 100644 index b70869e50f..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:purple_gold__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:purple_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:purple_gold__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_axe.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_axe.json index 3c6775b30b..a32572e836 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:purple_gold__axe" + "rankine:purple_gold_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:purple_gold__axe" + "recipe": "rankine:purple_gold_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_blunderbuss.json new file mode 100644 index 0000000000..6d7f70a043 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:purple_gold_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:purple_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:purple_gold_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_crowbar.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_crowbar.json index b059ebdeca..2740328fb3 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:purple_gold__hammer" + "rankine:purple_gold_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:purple_gold__hammer" + "recipe": "rankine:purple_gold_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_hammer.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_hammer.json index 264613413b..06833b34aa 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:purple_gold__knife" + "rankine:purple_gold_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:purple_gold__knife" + "recipe": "rankine:purple_gold_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_hoe.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_hoe.json index b37ea263b5..0c123a8814 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:purple_gold__hoe" + "rankine:purple_gold_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:purple_gold__hoe" + "recipe": "rankine:purple_gold_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_knife.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_knife.json index 698f4740c3..9187251ef6 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:purple_gold__spear" + "rankine:purple_gold_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:purple_gold__spear" + "recipe": "rankine:purple_gold_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_pickaxe.json new file mode 100644 index 0000000000..da02c1bcaa --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:purple_gold_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:purple_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:purple_gold_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_shovel.json new file mode 100644 index 0000000000..4be0a2a75c --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:purple_gold_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:purple_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:purple_gold_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_spear.json new file mode 100644 index 0000000000..4bb7ab8bc5 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:purple_gold_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:purple_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:purple_gold_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_surf_rod.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_surf_rod.json index 1b3ef85ed1..56ce65ac0f 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:purple_gold__crowbar" + "rankine:purple_gold_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:purple_gold__crowbar" + "recipe": "rankine:purple_gold_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_sword.json new file mode 100644 index 0000000000..b1d86a426c --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/purple_gold_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:purple_gold_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:purple_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:purple_gold_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__blunderbuss.json deleted file mode 100644 index fbde5088dc..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:rose_gold__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:rose_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:rose_gold__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__pickaxe.json deleted file mode 100644 index bc1dcfe71e..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:rose_gold__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:rose_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:rose_gold__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__shovel.json deleted file mode 100644 index bdfef20f38..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:rose_gold__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:rose_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:rose_gold__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__surf_rod.json deleted file mode 100644 index e853545035..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:rose_gold__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:rose_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:rose_gold__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__sword.json deleted file mode 100644 index 1d44c4324a..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:rose_gold__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:rose_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:rose_gold__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_axe.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_axe.json index 6cad4f627c..185f06e63d 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:rose_gold__axe" + "rankine:rose_gold_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:rose_gold__axe" + "recipe": "rankine:rose_gold_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_blunderbuss.json new file mode 100644 index 0000000000..2fe254e282 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:rose_gold_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:rose_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:rose_gold_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_crowbar.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_crowbar.json index ab598516ea..b95013a1a6 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:rose_gold__hammer" + "rankine:rose_gold_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:rose_gold__hammer" + "recipe": "rankine:rose_gold_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_hammer.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_hammer.json index 2573ea89b9..656af7ac2b 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:rose_gold__knife" + "rankine:rose_gold_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:rose_gold__knife" + "recipe": "rankine:rose_gold_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_hoe.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_hoe.json index 455bc61754..b2c5e229a8 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:rose_gold__hoe" + "rankine:rose_gold_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:rose_gold__hoe" + "recipe": "rankine:rose_gold_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_knife.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_knife.json index fb2fcbe579..763e3e13f6 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:rose_gold__spear" + "rankine:rose_gold_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:rose_gold__spear" + "recipe": "rankine:rose_gold_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_pickaxe.json new file mode 100644 index 0000000000..591750aa82 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:rose_gold_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:rose_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:rose_gold_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_shovel.json new file mode 100644 index 0000000000..b67e942759 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:rose_gold_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:rose_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:rose_gold_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_spear.json new file mode 100644 index 0000000000..f139e2a40d --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:rose_gold_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:rose_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:rose_gold_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_surf_rod.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_surf_rod.json index 77eb3e86b5..14cfb63205 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:rose_gold__crowbar" + "rankine:rose_gold_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:rose_gold__crowbar" + "recipe": "rankine:rose_gold_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_sword.json new file mode 100644 index 0000000000..3bd4142a37 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/rose_gold_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:rose_gold_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:rose_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:rose_gold_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__blunderbuss.json deleted file mode 100644 index 80386db55f..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:stainless_steel__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:stainless_steel_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:stainless_steel__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__pickaxe.json deleted file mode 100644 index 9db8204a7b..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:stainless_steel__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:stainless_steel_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:stainless_steel__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__shovel.json deleted file mode 100644 index 5de0067679..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:stainless_steel__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:stainless_steel_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:stainless_steel__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__surf_rod.json deleted file mode 100644 index 6032d871b5..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:stainless_steel__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:stainless_steel_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:stainless_steel__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__sword.json deleted file mode 100644 index 42214e3626..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:stainless_steel__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:stainless_steel_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:stainless_steel__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_axe.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_axe.json index 3851c5c8a2..79c746a705 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:stainless_steel__axe" + "rankine:stainless_steel_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:stainless_steel__axe" + "recipe": "rankine:stainless_steel_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_blunderbuss.json new file mode 100644 index 0000000000..cb14fcd8f9 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:stainless_steel_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:stainless_steel_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:stainless_steel_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_crowbar.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_crowbar.json index c1bf9ab705..22d7cf2add 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:stainless_steel__hammer" + "rankine:stainless_steel_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:stainless_steel__hammer" + "recipe": "rankine:stainless_steel_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_hammer.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_hammer.json index 2f9bc10664..778635ff84 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:stainless_steel__knife" + "rankine:stainless_steel_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:stainless_steel__knife" + "recipe": "rankine:stainless_steel_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_hoe.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_hoe.json index 020def01f5..e9a10dce3b 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:stainless_steel__hoe" + "rankine:stainless_steel_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:stainless_steel__hoe" + "recipe": "rankine:stainless_steel_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_knife.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_knife.json index fef57c79c0..673eebeb16 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:stainless_steel__spear" + "rankine:stainless_steel_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:stainless_steel__spear" + "recipe": "rankine:stainless_steel_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_pickaxe.json new file mode 100644 index 0000000000..986f5baeec --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:stainless_steel_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:stainless_steel_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:stainless_steel_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_shovel.json new file mode 100644 index 0000000000..1e0754280f --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:stainless_steel_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:stainless_steel_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:stainless_steel_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_spear.json new file mode 100644 index 0000000000..a5cf9aeace --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:stainless_steel_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:stainless_steel_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:stainless_steel_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_surf_rod.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_surf_rod.json index 990fa37996..6c6b8aaf8e 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:stainless_steel__crowbar" + "rankine:stainless_steel_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:stainless_steel__crowbar" + "recipe": "rankine:stainless_steel_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_sword.json new file mode 100644 index 0000000000..70d8a8ae61 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/stainless_steel_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:stainless_steel_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:stainless_steel_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:stainless_steel_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__blunderbuss.json deleted file mode 100644 index 3ef13c2ea1..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:steel__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:steel_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:steel__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__pickaxe.json deleted file mode 100644 index de7ef30eb2..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:steel__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:steel_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:steel__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__shovel.json deleted file mode 100644 index c9305947e8..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:steel__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:steel_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:steel__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__surf_rod.json deleted file mode 100644 index e69e8a75d9..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:steel__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:steel_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:steel__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__sword.json deleted file mode 100644 index ce31601d41..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:steel__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:steel_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:steel__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_axe.json similarity index 88% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_axe.json index 229649008a..c403e0b539 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:steel__axe" + "rankine:steel_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:steel__axe" + "recipe": "rankine:steel_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_blunderbuss.json new file mode 100644 index 0000000000..7e16b6950f --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:steel_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:steel_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:steel_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_crowbar.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_crowbar.json index 975341a1e9..60b855c494 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:steel__hammer" + "rankine:steel_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:steel__hammer" + "recipe": "rankine:steel_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_hammer.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_hammer.json index d1daac4926..fcf823776a 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:steel__knife" + "rankine:steel_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:steel__knife" + "recipe": "rankine:steel_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_hoe.json similarity index 88% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_hoe.json index 6afe8409f0..769abd7cd3 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:steel__hoe" + "rankine:steel_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:steel__hoe" + "recipe": "rankine:steel_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_knife.json similarity index 87% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_knife.json index 59c422a747..10a00ed53e 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:steel__spear" + "rankine:steel_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:steel__spear" + "recipe": "rankine:steel_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_pickaxe.json new file mode 100644 index 0000000000..768e617bed --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:steel_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:steel_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:steel_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_shovel.json new file mode 100644 index 0000000000..07252fa555 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:steel_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:steel_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:steel_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_spear.json new file mode 100644 index 0000000000..0fefe2efd3 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:steel_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:steel_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:steel_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_surf_rod.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_surf_rod.json index 958742f6d7..c7263a56c2 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:steel__crowbar" + "rankine:steel_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:steel__crowbar" + "recipe": "rankine:steel_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_sword.json new file mode 100644 index 0000000000..99bc9ceb2c --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/steel_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:steel_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:steel_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:steel_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__blunderbuss.json deleted file mode 100644 index c1c3c281d0..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:titanium_alloy__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:titanium_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:titanium_alloy__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__pickaxe.json deleted file mode 100644 index f5865f04a4..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:titanium_alloy__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:titanium_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:titanium_alloy__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__shovel.json deleted file mode 100644 index b701919918..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:titanium_alloy__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:titanium_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:titanium_alloy__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__surf_rod.json deleted file mode 100644 index 209b332025..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:titanium_alloy__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:titanium_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:titanium_alloy__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__sword.json deleted file mode 100644 index f1eecdac65..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:titanium_alloy__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:titanium_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:titanium_alloy__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_axe.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_axe.json index 5c9604d027..70ee671daa 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:titanium_alloy__axe" + "rankine:titanium_alloy_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:titanium_alloy__axe" + "recipe": "rankine:titanium_alloy_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_blunderbuss.json new file mode 100644 index 0000000000..088a4b0790 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:titanium_alloy_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:titanium_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:titanium_alloy_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_crowbar.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_crowbar.json index 4fc94dbf00..226a8168ce 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:titanium_alloy__hammer" + "rankine:titanium_alloy_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:titanium_alloy__hammer" + "recipe": "rankine:titanium_alloy_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_hammer.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_hammer.json index 963ff1b733..084c442e39 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:titanium_alloy__knife" + "rankine:titanium_alloy_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:titanium_alloy__knife" + "recipe": "rankine:titanium_alloy_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_hoe.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_hoe.json index 7bd7ccba78..2e5e2902c2 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:titanium_alloy__hoe" + "rankine:titanium_alloy_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:titanium_alloy__hoe" + "recipe": "rankine:titanium_alloy_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_knife.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_knife.json index 21bb8b773b..78f147e9cd 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:titanium_alloy__spear" + "rankine:titanium_alloy_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:titanium_alloy__spear" + "recipe": "rankine:titanium_alloy_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_pickaxe.json new file mode 100644 index 0000000000..f05ec20e24 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:titanium_alloy_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:titanium_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:titanium_alloy_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_shovel.json new file mode 100644 index 0000000000..ae16b84913 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:titanium_alloy_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:titanium_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:titanium_alloy_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_spear.json new file mode 100644 index 0000000000..707401c4c1 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:titanium_alloy_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:titanium_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:titanium_alloy_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_surf_rod.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_surf_rod.json index 13d34c7c65..a59bb7f73a 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:titanium_alloy__crowbar" + "rankine:titanium_alloy_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:titanium_alloy__crowbar" + "recipe": "rankine:titanium_alloy_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_sword.json new file mode 100644 index 0000000000..5f5cd92b62 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/titanium_alloy_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:titanium_alloy_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:titanium_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:titanium_alloy_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/totem_of_blazing.json similarity index 70% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__blunderbuss.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/totem_of_blazing.json index 98d8ae6a7f..6720770e3f 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/amalgam__blunderbuss.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/totem_of_blazing.json @@ -2,16 +2,16 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:amalgam__blunderbuss" + "rankine:totem_of_blazing" ] }, "criteria": { - "has_alloy": { + "has_ingredient": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "rankine:amalgam_ingot" + "tag": "forge:ingots/ferrocerium" } ] } @@ -19,13 +19,13 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:amalgam__blunderbuss" + "recipe": "rankine:totem_of_blazing" } } }, "requirements": [ [ - "has_alloy", + "has_ingredient", "has_the_recipe" ] ] diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__blunderbuss.json deleted file mode 100644 index d9288f00ab..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:tungsten_heavy_alloy__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:tungsten_heavy_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:tungsten_heavy_alloy__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__pickaxe.json deleted file mode 100644 index 99154bde54..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:tungsten_heavy_alloy__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:tungsten_heavy_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:tungsten_heavy_alloy__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__shovel.json deleted file mode 100644 index ad0d871054..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:tungsten_heavy_alloy__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:tungsten_heavy_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:tungsten_heavy_alloy__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__surf_rod.json deleted file mode 100644 index 2c24b9de4f..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:tungsten_heavy_alloy__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:tungsten_heavy_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:tungsten_heavy_alloy__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__sword.json deleted file mode 100644 index bb0c57c6e2..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:tungsten_heavy_alloy__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:tungsten_heavy_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:tungsten_heavy_alloy__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_axe.json similarity index 83% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_axe.json index f267948914..7c253511aa 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:tungsten_heavy_alloy__axe" + "rankine:tungsten_heavy_alloy_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:tungsten_heavy_alloy__axe" + "recipe": "rankine:tungsten_heavy_alloy_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_blunderbuss.json new file mode 100644 index 0000000000..481cbaeb22 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:tungsten_heavy_alloy_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:tungsten_heavy_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:tungsten_heavy_alloy_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_crowbar.json similarity index 83% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_crowbar.json index 4450486865..e8c65be5c8 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:tungsten_heavy_alloy__hammer" + "rankine:tungsten_heavy_alloy_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:tungsten_heavy_alloy__hammer" + "recipe": "rankine:tungsten_heavy_alloy_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_hammer.json similarity index 83% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_hammer.json index 62c63bff7b..ae8f1f3301 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:tungsten_heavy_alloy__knife" + "rankine:tungsten_heavy_alloy_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:tungsten_heavy_alloy__knife" + "recipe": "rankine:tungsten_heavy_alloy_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_hoe.json similarity index 83% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_hoe.json index 8f92c65990..661bb7f04a 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:tungsten_heavy_alloy__hoe" + "rankine:tungsten_heavy_alloy_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:tungsten_heavy_alloy__hoe" + "recipe": "rankine:tungsten_heavy_alloy_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_knife.json similarity index 83% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_knife.json index 584b46ae0f..d2eb6c9ac7 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:tungsten_heavy_alloy__spear" + "rankine:tungsten_heavy_alloy_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:tungsten_heavy_alloy__spear" + "recipe": "rankine:tungsten_heavy_alloy_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_pickaxe.json new file mode 100644 index 0000000000..211a85a50c --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:tungsten_heavy_alloy_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:tungsten_heavy_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:tungsten_heavy_alloy_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_shovel.json new file mode 100644 index 0000000000..5741a0c20d --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:tungsten_heavy_alloy_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:tungsten_heavy_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:tungsten_heavy_alloy_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_spear.json new file mode 100644 index 0000000000..aed02d496e --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:tungsten_heavy_alloy_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:tungsten_heavy_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:tungsten_heavy_alloy_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_surf_rod.json similarity index 82% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_surf_rod.json index b0df6ed858..9bcfcec896 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:tungsten_heavy_alloy__crowbar" + "rankine:tungsten_heavy_alloy_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:tungsten_heavy_alloy__crowbar" + "recipe": "rankine:tungsten_heavy_alloy_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_sword.json new file mode 100644 index 0000000000..ed3296bb83 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/tungsten_heavy_alloy_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:tungsten_heavy_alloy_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:tungsten_heavy_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:tungsten_heavy_alloy_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__blunderbuss.json deleted file mode 100644 index 268f353850..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:white_gold__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:white_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:white_gold__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__pickaxe.json deleted file mode 100644 index eb4491345d..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:white_gold__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:white_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:white_gold__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__shovel.json deleted file mode 100644 index 80c68fc287..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:white_gold__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:white_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:white_gold__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__surf_rod.json deleted file mode 100644 index d30fbe40ee..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:white_gold__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:white_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:white_gold__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__sword.json deleted file mode 100644 index efad9d7ce5..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:white_gold__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:white_gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:white_gold__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_axe.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_axe.json index 09178a8984..990b2b963b 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:white_gold__axe" + "rankine:white_gold_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:white_gold__axe" + "recipe": "rankine:white_gold_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_blunderbuss.json new file mode 100644 index 0000000000..58a68626d4 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:white_gold_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:white_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:white_gold_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_crowbar.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_crowbar.json index 66d89fd88c..fe72e97cbf 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:white_gold__hammer" + "rankine:white_gold_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:white_gold__hammer" + "recipe": "rankine:white_gold_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_hammer.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_hammer.json index 8f07e32926..44bb9c712b 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:white_gold__knife" + "rankine:white_gold_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:white_gold__knife" + "recipe": "rankine:white_gold_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_hoe.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_hoe.json index 6b19837f50..a03831faa5 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:white_gold__hoe" + "rankine:white_gold_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:white_gold__hoe" + "recipe": "rankine:white_gold_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_knife.json similarity index 86% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_knife.json index eb79fb2305..e2028386d5 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:white_gold__spear" + "rankine:white_gold_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:white_gold__spear" + "recipe": "rankine:white_gold_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_pickaxe.json new file mode 100644 index 0000000000..52d8cde081 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:white_gold_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:white_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:white_gold_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_shovel.json new file mode 100644 index 0000000000..0ac1dc2933 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:white_gold_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:white_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:white_gold_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_spear.json new file mode 100644 index 0000000000..2741d22862 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:white_gold_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:white_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:white_gold_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_surf_rod.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_surf_rod.json index e3b526d629..1e46303937 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:white_gold__crowbar" + "rankine:white_gold_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:white_gold__crowbar" + "recipe": "rankine:white_gold_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_sword.json new file mode 100644 index 0000000000..cd1feaf23d --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/white_gold_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:white_gold_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:white_gold_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:white_gold_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__blunderbuss.json deleted file mode 100644 index 938e64d6fd..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__blunderbuss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:zirconium_alloy__blunderbuss" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:zirconium_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:zirconium_alloy__blunderbuss" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__pickaxe.json deleted file mode 100644 index 0ac6bf83fa..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:zirconium_alloy__pickaxe" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:zirconium_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:zirconium_alloy__pickaxe" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__shovel.json deleted file mode 100644 index e9edd218cd..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:zirconium_alloy__shovel" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:zirconium_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:zirconium_alloy__shovel" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__surf_rod.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__surf_rod.json deleted file mode 100644 index 575523d203..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__surf_rod.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:zirconium_alloy__surf_rod" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:zirconium_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:zirconium_alloy__surf_rod" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__sword.json deleted file mode 100644 index b53460f602..0000000000 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "rankine:zirconium_alloy__sword" - ] - }, - "criteria": { - "has_alloy": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "rankine:zirconium_alloy_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "rankine:zirconium_alloy__sword" - } - } - }, - "requirements": [ - [ - "has_alloy", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__axe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_axe.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__axe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_axe.json index e18d84c284..d4484f5a5b 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__axe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_axe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:zirconium_alloy__axe" + "rankine:zirconium_alloy_axe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:zirconium_alloy__axe" + "recipe": "rankine:zirconium_alloy_axe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_blunderbuss.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_blunderbuss.json new file mode 100644 index 0000000000..b525866b5d --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_blunderbuss.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:zirconium_alloy_blunderbuss" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:zirconium_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:zirconium_alloy_blunderbuss" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__hammer.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_crowbar.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__hammer.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_crowbar.json index 90d979eacc..d2ffd826fc 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__hammer.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_crowbar.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:zirconium_alloy__hammer" + "rankine:zirconium_alloy_crowbar" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:zirconium_alloy__hammer" + "recipe": "rankine:zirconium_alloy_crowbar" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__knife.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_hammer.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__knife.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_hammer.json index f9c871650d..80c33a0b74 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__knife.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_hammer.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:zirconium_alloy__knife" + "rankine:zirconium_alloy_hammer" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:zirconium_alloy__knife" + "recipe": "rankine:zirconium_alloy_hammer" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__hoe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_hoe.json similarity index 85% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__hoe.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_hoe.json index 63492debb9..acd8083752 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__hoe.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_hoe.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:zirconium_alloy__hoe" + "rankine:zirconium_alloy_hoe" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:zirconium_alloy__hoe" + "recipe": "rankine:zirconium_alloy_hoe" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_knife.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__spear.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_knife.json index 9488558ca9..79ffd9544a 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__spear.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_knife.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:zirconium_alloy__spear" + "rankine:zirconium_alloy_knife" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:zirconium_alloy__spear" + "recipe": "rankine:zirconium_alloy_knife" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_pickaxe.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_pickaxe.json new file mode 100644 index 0000000000..35fbedb312 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:zirconium_alloy_pickaxe" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:zirconium_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:zirconium_alloy_pickaxe" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_shovel.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_shovel.json new file mode 100644 index 0000000000..284e592cb8 --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:zirconium_alloy_shovel" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:zirconium_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:zirconium_alloy_shovel" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_spear.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_spear.json new file mode 100644 index 0000000000..cb41300a9a --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:zirconium_alloy_spear" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:zirconium_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:zirconium_alloy_spear" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__crowbar.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_surf_rod.json similarity index 84% rename from src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__crowbar.json rename to src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_surf_rod.json index 83393ba145..f265e7205b 100644 --- a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy__crowbar.json +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_surf_rod.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "rankine:zirconium_alloy__crowbar" + "rankine:zirconium_alloy_surf_rod" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "rankine:zirconium_alloy__crowbar" + "recipe": "rankine:zirconium_alloy_surf_rod" } } }, diff --git a/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_sword.json b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_sword.json new file mode 100644 index 0000000000..ab89de45ea --- /dev/null +++ b/src/generated/resources/data/rankine/advancements/recipes/rankine_misc/zirconium_alloy_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "rankine:zirconium_alloy_sword" + ] + }, + "criteria": { + "has_alloy": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "rankine:zirconium_alloy_ingot" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "rankine:zirconium_alloy_sword" + } + } + }, + "requirements": [ + [ + "has_alloy", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/recipes/amalgam__axe.json b/src/generated/resources/data/rankine/recipes/amalgam_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/amalgam__axe.json rename to src/generated/resources/data/rankine/recipes/amalgam_axe.json diff --git a/src/generated/resources/data/rankine/recipes/amalgam__blunderbuss.json b/src/generated/resources/data/rankine/recipes/amalgam_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/amalgam__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/amalgam_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/amalgam__crowbar.json b/src/generated/resources/data/rankine/recipes/amalgam_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/amalgam__crowbar.json rename to src/generated/resources/data/rankine/recipes/amalgam_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/amalgam__hammer.json b/src/generated/resources/data/rankine/recipes/amalgam_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/amalgam__hammer.json rename to src/generated/resources/data/rankine/recipes/amalgam_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/amalgam__hoe.json b/src/generated/resources/data/rankine/recipes/amalgam_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/amalgam__hoe.json rename to src/generated/resources/data/rankine/recipes/amalgam_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/amalgam__knife.json b/src/generated/resources/data/rankine/recipes/amalgam_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/amalgam__knife.json rename to src/generated/resources/data/rankine/recipes/amalgam_knife.json diff --git a/src/generated/resources/data/rankine/recipes/amalgam__pickaxe.json b/src/generated/resources/data/rankine/recipes/amalgam_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/amalgam__pickaxe.json rename to src/generated/resources/data/rankine/recipes/amalgam_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/amalgam__shovel.json b/src/generated/resources/data/rankine/recipes/amalgam_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/amalgam__shovel.json rename to src/generated/resources/data/rankine/recipes/amalgam_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/amalgam__spear.json b/src/generated/resources/data/rankine/recipes/amalgam_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/amalgam__spear.json rename to src/generated/resources/data/rankine/recipes/amalgam_spear.json diff --git a/src/generated/resources/data/rankine/recipes/amalgam__surf_rod.json b/src/generated/resources/data/rankine/recipes/amalgam_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/amalgam__surf_rod.json rename to src/generated/resources/data/rankine/recipes/amalgam_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/amalgam__sword.json b/src/generated/resources/data/rankine/recipes/amalgam_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/amalgam__sword.json rename to src/generated/resources/data/rankine/recipes/amalgam_sword.json diff --git a/src/generated/resources/data/rankine/recipes/black_gold__axe.json b/src/generated/resources/data/rankine/recipes/black_gold_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/black_gold__axe.json rename to src/generated/resources/data/rankine/recipes/black_gold_axe.json diff --git a/src/generated/resources/data/rankine/recipes/black_gold__blunderbuss.json b/src/generated/resources/data/rankine/recipes/black_gold_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/black_gold__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/black_gold_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/black_gold__crowbar.json b/src/generated/resources/data/rankine/recipes/black_gold_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/black_gold__crowbar.json rename to src/generated/resources/data/rankine/recipes/black_gold_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/black_gold__hammer.json b/src/generated/resources/data/rankine/recipes/black_gold_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/black_gold__hammer.json rename to src/generated/resources/data/rankine/recipes/black_gold_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/black_gold__hoe.json b/src/generated/resources/data/rankine/recipes/black_gold_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/black_gold__hoe.json rename to src/generated/resources/data/rankine/recipes/black_gold_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/black_gold__knife.json b/src/generated/resources/data/rankine/recipes/black_gold_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/black_gold__knife.json rename to src/generated/resources/data/rankine/recipes/black_gold_knife.json diff --git a/src/generated/resources/data/rankine/recipes/black_gold__pickaxe.json b/src/generated/resources/data/rankine/recipes/black_gold_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/black_gold__pickaxe.json rename to src/generated/resources/data/rankine/recipes/black_gold_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/black_gold__shovel.json b/src/generated/resources/data/rankine/recipes/black_gold_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/black_gold__shovel.json rename to src/generated/resources/data/rankine/recipes/black_gold_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/black_gold__spear.json b/src/generated/resources/data/rankine/recipes/black_gold_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/black_gold__spear.json rename to src/generated/resources/data/rankine/recipes/black_gold_spear.json diff --git a/src/generated/resources/data/rankine/recipes/black_gold__surf_rod.json b/src/generated/resources/data/rankine/recipes/black_gold_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/black_gold__surf_rod.json rename to src/generated/resources/data/rankine/recipes/black_gold_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/black_gold__sword.json b/src/generated/resources/data/rankine/recipes/black_gold_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/black_gold__sword.json rename to src/generated/resources/data/rankine/recipes/black_gold_sword.json diff --git a/src/generated/resources/data/rankine/recipes/blue_gold__axe.json b/src/generated/resources/data/rankine/recipes/blue_gold_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/blue_gold__axe.json rename to src/generated/resources/data/rankine/recipes/blue_gold_axe.json diff --git a/src/generated/resources/data/rankine/recipes/blue_gold__blunderbuss.json b/src/generated/resources/data/rankine/recipes/blue_gold_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/blue_gold__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/blue_gold_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/blue_gold__crowbar.json b/src/generated/resources/data/rankine/recipes/blue_gold_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/blue_gold__crowbar.json rename to src/generated/resources/data/rankine/recipes/blue_gold_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/blue_gold__hammer.json b/src/generated/resources/data/rankine/recipes/blue_gold_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/blue_gold__hammer.json rename to src/generated/resources/data/rankine/recipes/blue_gold_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/blue_gold__hoe.json b/src/generated/resources/data/rankine/recipes/blue_gold_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/blue_gold__hoe.json rename to src/generated/resources/data/rankine/recipes/blue_gold_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/blue_gold__knife.json b/src/generated/resources/data/rankine/recipes/blue_gold_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/blue_gold__knife.json rename to src/generated/resources/data/rankine/recipes/blue_gold_knife.json diff --git a/src/generated/resources/data/rankine/recipes/blue_gold__pickaxe.json b/src/generated/resources/data/rankine/recipes/blue_gold_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/blue_gold__pickaxe.json rename to src/generated/resources/data/rankine/recipes/blue_gold_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/blue_gold__shovel.json b/src/generated/resources/data/rankine/recipes/blue_gold_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/blue_gold__shovel.json rename to src/generated/resources/data/rankine/recipes/blue_gold_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/blue_gold__spear.json b/src/generated/resources/data/rankine/recipes/blue_gold_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/blue_gold__spear.json rename to src/generated/resources/data/rankine/recipes/blue_gold_spear.json diff --git a/src/generated/resources/data/rankine/recipes/blue_gold__surf_rod.json b/src/generated/resources/data/rankine/recipes/blue_gold_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/blue_gold__surf_rod.json rename to src/generated/resources/data/rankine/recipes/blue_gold_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/blue_gold__sword.json b/src/generated/resources/data/rankine/recipes/blue_gold_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/blue_gold__sword.json rename to src/generated/resources/data/rankine/recipes/blue_gold_sword.json diff --git a/src/generated/resources/data/rankine/recipes/brass__axe.json b/src/generated/resources/data/rankine/recipes/brass_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/brass__axe.json rename to src/generated/resources/data/rankine/recipes/brass_axe.json diff --git a/src/generated/resources/data/rankine/recipes/brass__blunderbuss.json b/src/generated/resources/data/rankine/recipes/brass_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/brass__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/brass_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/brass__crowbar.json b/src/generated/resources/data/rankine/recipes/brass_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/brass__crowbar.json rename to src/generated/resources/data/rankine/recipes/brass_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/brass__hammer.json b/src/generated/resources/data/rankine/recipes/brass_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/brass__hammer.json rename to src/generated/resources/data/rankine/recipes/brass_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/brass__hoe.json b/src/generated/resources/data/rankine/recipes/brass_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/brass__hoe.json rename to src/generated/resources/data/rankine/recipes/brass_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/brass__knife.json b/src/generated/resources/data/rankine/recipes/brass_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/brass__knife.json rename to src/generated/resources/data/rankine/recipes/brass_knife.json diff --git a/src/generated/resources/data/rankine/recipes/brass__pickaxe.json b/src/generated/resources/data/rankine/recipes/brass_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/brass__pickaxe.json rename to src/generated/resources/data/rankine/recipes/brass_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/brass__shovel.json b/src/generated/resources/data/rankine/recipes/brass_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/brass__shovel.json rename to src/generated/resources/data/rankine/recipes/brass_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/brass__spear.json b/src/generated/resources/data/rankine/recipes/brass_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/brass__spear.json rename to src/generated/resources/data/rankine/recipes/brass_spear.json diff --git a/src/generated/resources/data/rankine/recipes/brass__surf_rod.json b/src/generated/resources/data/rankine/recipes/brass_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/brass__surf_rod.json rename to src/generated/resources/data/rankine/recipes/brass_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/brass__sword.json b/src/generated/resources/data/rankine/recipes/brass_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/brass__sword.json rename to src/generated/resources/data/rankine/recipes/brass_sword.json diff --git a/src/generated/resources/data/rankine/recipes/bronze__axe.json b/src/generated/resources/data/rankine/recipes/bronze_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/bronze__axe.json rename to src/generated/resources/data/rankine/recipes/bronze_axe.json diff --git a/src/generated/resources/data/rankine/recipes/bronze__blunderbuss.json b/src/generated/resources/data/rankine/recipes/bronze_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/bronze__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/bronze_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/bronze__crowbar.json b/src/generated/resources/data/rankine/recipes/bronze_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/bronze__crowbar.json rename to src/generated/resources/data/rankine/recipes/bronze_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/bronze__hammer.json b/src/generated/resources/data/rankine/recipes/bronze_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/bronze__hammer.json rename to src/generated/resources/data/rankine/recipes/bronze_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/bronze__hoe.json b/src/generated/resources/data/rankine/recipes/bronze_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/bronze__hoe.json rename to src/generated/resources/data/rankine/recipes/bronze_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/bronze__knife.json b/src/generated/resources/data/rankine/recipes/bronze_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/bronze__knife.json rename to src/generated/resources/data/rankine/recipes/bronze_knife.json diff --git a/src/generated/resources/data/rankine/recipes/bronze__pickaxe.json b/src/generated/resources/data/rankine/recipes/bronze_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/bronze__pickaxe.json rename to src/generated/resources/data/rankine/recipes/bronze_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/bronze__shovel.json b/src/generated/resources/data/rankine/recipes/bronze_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/bronze__shovel.json rename to src/generated/resources/data/rankine/recipes/bronze_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/bronze__spear.json b/src/generated/resources/data/rankine/recipes/bronze_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/bronze__spear.json rename to src/generated/resources/data/rankine/recipes/bronze_spear.json diff --git a/src/generated/resources/data/rankine/recipes/bronze__surf_rod.json b/src/generated/resources/data/rankine/recipes/bronze_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/bronze__surf_rod.json rename to src/generated/resources/data/rankine/recipes/bronze_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/bronze__sword.json b/src/generated/resources/data/rankine/recipes/bronze_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/bronze__sword.json rename to src/generated/resources/data/rankine/recipes/bronze_sword.json diff --git a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__axe.json b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_axe.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/cobalt_superalloy__axe.json rename to src/generated/resources/data/rankine/recipes/cobalt_superalloy_axe.json index b6907b36cc..3e70bbd7d3 100644 --- a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__axe.json +++ b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_axe.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_axes", "inherit": true, + "inheritRecipe": "rankine:alloying/cobalt_superalloy_alloying", "pattern": [ "##", "#s", diff --git a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__blunderbuss.json b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/cobalt_superalloy__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/cobalt_superalloy_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__crowbar.json b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/cobalt_superalloy__crowbar.json rename to src/generated/resources/data/rankine/recipes/cobalt_superalloy_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__hammer.json b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_hammer.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/cobalt_superalloy__hammer.json rename to src/generated/resources/data/rankine/recipes/cobalt_superalloy_hammer.json index 2ede1622a4..db5334df49 100644 --- a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__hammer.json +++ b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_hammer.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_hammers", "inherit": true, + "inheritRecipe": "rankine:alloying/cobalt_superalloy_alloying", "pattern": [ "###", "#s#", diff --git a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__hoe.json b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_hoe.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/cobalt_superalloy__hoe.json rename to src/generated/resources/data/rankine/recipes/cobalt_superalloy_hoe.json index 51883af8eb..1e7a20c0fa 100644 --- a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__hoe.json +++ b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_hoe.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_hoes", "inherit": true, + "inheritRecipe": "rankine:alloying/cobalt_superalloy_alloying", "pattern": [ "##", " s", diff --git a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__knife.json b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_knife.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/cobalt_superalloy__knife.json rename to src/generated/resources/data/rankine/recipes/cobalt_superalloy_knife.json index 59e920ccd1..0c94b47dd3 100644 --- a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__knife.json +++ b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_knife.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_knives", "inherit": true, + "inheritRecipe": "rankine:alloying/cobalt_superalloy_alloying", "pattern": [ " #", "s " diff --git a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__pickaxe.json b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_pickaxe.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/cobalt_superalloy__pickaxe.json rename to src/generated/resources/data/rankine/recipes/cobalt_superalloy_pickaxe.json index d063e99760..16a669a8ca 100644 --- a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__pickaxe.json +++ b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_pickaxe.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_pickaxes", "inherit": true, + "inheritRecipe": "rankine:alloying/cobalt_superalloy_alloying", "pattern": [ "###", " s ", diff --git a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__shovel.json b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_shovel.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/cobalt_superalloy__shovel.json rename to src/generated/resources/data/rankine/recipes/cobalt_superalloy_shovel.json index 58bb147e07..099eff3583 100644 --- a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__shovel.json +++ b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_shovel.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_shovels", "inherit": true, + "inheritRecipe": "rankine:alloying/cobalt_superalloy_alloying", "pattern": [ "#", "s", diff --git a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__spear.json b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_spear.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/cobalt_superalloy__spear.json rename to src/generated/resources/data/rankine/recipes/cobalt_superalloy_spear.json index 7c295c961a..04a203a96a 100644 --- a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__spear.json +++ b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_spear.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_spears", "inherit": true, + "inheritRecipe": "rankine:alloying/cobalt_superalloy_alloying", "pattern": [ " ##", " s#", diff --git a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__surf_rod.json b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/cobalt_superalloy__surf_rod.json rename to src/generated/resources/data/rankine/recipes/cobalt_superalloy_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__sword.json b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_sword.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/cobalt_superalloy__sword.json rename to src/generated/resources/data/rankine/recipes/cobalt_superalloy_sword.json index ab0b3d6831..36a64a3cda 100644 --- a/src/generated/resources/data/rankine/recipes/cobalt_superalloy__sword.json +++ b/src/generated/resources/data/rankine/recipes/cobalt_superalloy_sword.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_swords", "inherit": true, + "inheritRecipe": "rankine:alloying/cobalt_superalloy_alloying", "pattern": [ "#", "#", diff --git a/src/generated/resources/data/rankine/recipes/ender_amalgam__axe.json b/src/generated/resources/data/rankine/recipes/ender_amalgam_axe.json similarity index 88% rename from src/generated/resources/data/rankine/recipes/ender_amalgam__axe.json rename to src/generated/resources/data/rankine/recipes/ender_amalgam_axe.json index 838a9fec1e..86ead15a3e 100644 --- a/src/generated/resources/data/rankine/recipes/ender_amalgam__axe.json +++ b/src/generated/resources/data/rankine/recipes/ender_amalgam_axe.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_axes", "inherit": true, + "inheritRecipe": "rankine:alloying/ender_amalgam_alloying", "pattern": [ "##", "#s", diff --git a/src/generated/resources/data/rankine/recipes/ender_amalgam__blunderbuss.json b/src/generated/resources/data/rankine/recipes/ender_amalgam_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/ender_amalgam__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/ender_amalgam_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/ender_amalgam__crowbar.json b/src/generated/resources/data/rankine/recipes/ender_amalgam_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/ender_amalgam__crowbar.json rename to src/generated/resources/data/rankine/recipes/ender_amalgam_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/ender_amalgam__hammer.json b/src/generated/resources/data/rankine/recipes/ender_amalgam_hammer.json similarity index 88% rename from src/generated/resources/data/rankine/recipes/ender_amalgam__hammer.json rename to src/generated/resources/data/rankine/recipes/ender_amalgam_hammer.json index ac16539b73..bd78a3bc6a 100644 --- a/src/generated/resources/data/rankine/recipes/ender_amalgam__hammer.json +++ b/src/generated/resources/data/rankine/recipes/ender_amalgam_hammer.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_hammers", "inherit": true, + "inheritRecipe": "rankine:alloying/ender_amalgam_alloying", "pattern": [ "###", "#s#", diff --git a/src/generated/resources/data/rankine/recipes/ender_amalgam__hoe.json b/src/generated/resources/data/rankine/recipes/ender_amalgam_hoe.json similarity index 88% rename from src/generated/resources/data/rankine/recipes/ender_amalgam__hoe.json rename to src/generated/resources/data/rankine/recipes/ender_amalgam_hoe.json index e243501c53..2efa9e4c0c 100644 --- a/src/generated/resources/data/rankine/recipes/ender_amalgam__hoe.json +++ b/src/generated/resources/data/rankine/recipes/ender_amalgam_hoe.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_hoes", "inherit": true, + "inheritRecipe": "rankine:alloying/ender_amalgam_alloying", "pattern": [ "##", " s", diff --git a/src/generated/resources/data/rankine/recipes/ender_amalgam__knife.json b/src/generated/resources/data/rankine/recipes/ender_amalgam_knife.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/ender_amalgam__knife.json rename to src/generated/resources/data/rankine/recipes/ender_amalgam_knife.json index 70db44363c..65861dfc0e 100644 --- a/src/generated/resources/data/rankine/recipes/ender_amalgam__knife.json +++ b/src/generated/resources/data/rankine/recipes/ender_amalgam_knife.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_knives", "inherit": true, + "inheritRecipe": "rankine:alloying/ender_amalgam_alloying", "pattern": [ " #", "s " diff --git a/src/generated/resources/data/rankine/recipes/ender_amalgam__pickaxe.json b/src/generated/resources/data/rankine/recipes/ender_amalgam_pickaxe.json similarity index 88% rename from src/generated/resources/data/rankine/recipes/ender_amalgam__pickaxe.json rename to src/generated/resources/data/rankine/recipes/ender_amalgam_pickaxe.json index 5538763c58..cbd055bd88 100644 --- a/src/generated/resources/data/rankine/recipes/ender_amalgam__pickaxe.json +++ b/src/generated/resources/data/rankine/recipes/ender_amalgam_pickaxe.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_pickaxes", "inherit": true, + "inheritRecipe": "rankine:alloying/ender_amalgam_alloying", "pattern": [ "###", " s ", diff --git a/src/generated/resources/data/rankine/recipes/ender_amalgam__shovel.json b/src/generated/resources/data/rankine/recipes/ender_amalgam_shovel.json similarity index 88% rename from src/generated/resources/data/rankine/recipes/ender_amalgam__shovel.json rename to src/generated/resources/data/rankine/recipes/ender_amalgam_shovel.json index e978a33831..8fd580f3b0 100644 --- a/src/generated/resources/data/rankine/recipes/ender_amalgam__shovel.json +++ b/src/generated/resources/data/rankine/recipes/ender_amalgam_shovel.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_shovels", "inherit": true, + "inheritRecipe": "rankine:alloying/ender_amalgam_alloying", "pattern": [ "#", "s", diff --git a/src/generated/resources/data/rankine/recipes/ender_amalgam__spear.json b/src/generated/resources/data/rankine/recipes/ender_amalgam_spear.json similarity index 88% rename from src/generated/resources/data/rankine/recipes/ender_amalgam__spear.json rename to src/generated/resources/data/rankine/recipes/ender_amalgam_spear.json index cb980eb464..bc1c170266 100644 --- a/src/generated/resources/data/rankine/recipes/ender_amalgam__spear.json +++ b/src/generated/resources/data/rankine/recipes/ender_amalgam_spear.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_spears", "inherit": true, + "inheritRecipe": "rankine:alloying/ender_amalgam_alloying", "pattern": [ " ##", " s#", diff --git a/src/generated/resources/data/rankine/recipes/ender_amalgam__surf_rod.json b/src/generated/resources/data/rankine/recipes/ender_amalgam_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/ender_amalgam__surf_rod.json rename to src/generated/resources/data/rankine/recipes/ender_amalgam_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/ender_amalgam__sword.json b/src/generated/resources/data/rankine/recipes/ender_amalgam_sword.json similarity index 88% rename from src/generated/resources/data/rankine/recipes/ender_amalgam__sword.json rename to src/generated/resources/data/rankine/recipes/ender_amalgam_sword.json index 9761d03819..31261d19b9 100644 --- a/src/generated/resources/data/rankine/recipes/ender_amalgam__sword.json +++ b/src/generated/resources/data/rankine/recipes/ender_amalgam_sword.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_swords", "inherit": true, + "inheritRecipe": "rankine:alloying/ender_amalgam_alloying", "pattern": [ "#", "#", diff --git a/src/generated/resources/data/rankine/recipes/green_gold__axe.json b/src/generated/resources/data/rankine/recipes/green_gold_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/green_gold__axe.json rename to src/generated/resources/data/rankine/recipes/green_gold_axe.json diff --git a/src/generated/resources/data/rankine/recipes/green_gold__blunderbuss.json b/src/generated/resources/data/rankine/recipes/green_gold_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/green_gold__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/green_gold_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/green_gold__crowbar.json b/src/generated/resources/data/rankine/recipes/green_gold_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/green_gold__crowbar.json rename to src/generated/resources/data/rankine/recipes/green_gold_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/green_gold__hammer.json b/src/generated/resources/data/rankine/recipes/green_gold_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/green_gold__hammer.json rename to src/generated/resources/data/rankine/recipes/green_gold_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/green_gold__hoe.json b/src/generated/resources/data/rankine/recipes/green_gold_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/green_gold__hoe.json rename to src/generated/resources/data/rankine/recipes/green_gold_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/green_gold__knife.json b/src/generated/resources/data/rankine/recipes/green_gold_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/green_gold__knife.json rename to src/generated/resources/data/rankine/recipes/green_gold_knife.json diff --git a/src/generated/resources/data/rankine/recipes/green_gold__pickaxe.json b/src/generated/resources/data/rankine/recipes/green_gold_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/green_gold__pickaxe.json rename to src/generated/resources/data/rankine/recipes/green_gold_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/green_gold__shovel.json b/src/generated/resources/data/rankine/recipes/green_gold_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/green_gold__shovel.json rename to src/generated/resources/data/rankine/recipes/green_gold_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/green_gold__spear.json b/src/generated/resources/data/rankine/recipes/green_gold_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/green_gold__spear.json rename to src/generated/resources/data/rankine/recipes/green_gold_spear.json diff --git a/src/generated/resources/data/rankine/recipes/green_gold__surf_rod.json b/src/generated/resources/data/rankine/recipes/green_gold_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/green_gold__surf_rod.json rename to src/generated/resources/data/rankine/recipes/green_gold_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/green_gold__sword.json b/src/generated/resources/data/rankine/recipes/green_gold_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/green_gold__sword.json rename to src/generated/resources/data/rankine/recipes/green_gold_sword.json diff --git a/src/generated/resources/data/rankine/recipes/invar__axe.json b/src/generated/resources/data/rankine/recipes/invar_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/invar__axe.json rename to src/generated/resources/data/rankine/recipes/invar_axe.json diff --git a/src/generated/resources/data/rankine/recipes/invar__blunderbuss.json b/src/generated/resources/data/rankine/recipes/invar_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/invar__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/invar_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/invar__crowbar.json b/src/generated/resources/data/rankine/recipes/invar_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/invar__crowbar.json rename to src/generated/resources/data/rankine/recipes/invar_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/invar__hammer.json b/src/generated/resources/data/rankine/recipes/invar_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/invar__hammer.json rename to src/generated/resources/data/rankine/recipes/invar_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/invar__hoe.json b/src/generated/resources/data/rankine/recipes/invar_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/invar__hoe.json rename to src/generated/resources/data/rankine/recipes/invar_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/invar__knife.json b/src/generated/resources/data/rankine/recipes/invar_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/invar__knife.json rename to src/generated/resources/data/rankine/recipes/invar_knife.json diff --git a/src/generated/resources/data/rankine/recipes/invar__pickaxe.json b/src/generated/resources/data/rankine/recipes/invar_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/invar__pickaxe.json rename to src/generated/resources/data/rankine/recipes/invar_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/invar__shovel.json b/src/generated/resources/data/rankine/recipes/invar_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/invar__shovel.json rename to src/generated/resources/data/rankine/recipes/invar_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/invar__spear.json b/src/generated/resources/data/rankine/recipes/invar_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/invar__spear.json rename to src/generated/resources/data/rankine/recipes/invar_spear.json diff --git a/src/generated/resources/data/rankine/recipes/invar__surf_rod.json b/src/generated/resources/data/rankine/recipes/invar_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/invar__surf_rod.json rename to src/generated/resources/data/rankine/recipes/invar_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/invar__sword.json b/src/generated/resources/data/rankine/recipes/invar_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/invar__sword.json rename to src/generated/resources/data/rankine/recipes/invar_sword.json diff --git a/src/generated/resources/data/rankine/recipes/meteoric_iron__axe.json b/src/generated/resources/data/rankine/recipes/meteoric_iron_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/meteoric_iron__axe.json rename to src/generated/resources/data/rankine/recipes/meteoric_iron_axe.json diff --git a/src/generated/resources/data/rankine/recipes/meteoric_iron__blunderbuss.json b/src/generated/resources/data/rankine/recipes/meteoric_iron_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/meteoric_iron__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/meteoric_iron_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/meteoric_iron__crowbar.json b/src/generated/resources/data/rankine/recipes/meteoric_iron_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/meteoric_iron__crowbar.json rename to src/generated/resources/data/rankine/recipes/meteoric_iron_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/meteoric_iron__hammer.json b/src/generated/resources/data/rankine/recipes/meteoric_iron_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/meteoric_iron__hammer.json rename to src/generated/resources/data/rankine/recipes/meteoric_iron_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/meteoric_iron__hoe.json b/src/generated/resources/data/rankine/recipes/meteoric_iron_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/meteoric_iron__hoe.json rename to src/generated/resources/data/rankine/recipes/meteoric_iron_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/meteoric_iron__knife.json b/src/generated/resources/data/rankine/recipes/meteoric_iron_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/meteoric_iron__knife.json rename to src/generated/resources/data/rankine/recipes/meteoric_iron_knife.json diff --git a/src/generated/resources/data/rankine/recipes/meteoric_iron__pickaxe.json b/src/generated/resources/data/rankine/recipes/meteoric_iron_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/meteoric_iron__pickaxe.json rename to src/generated/resources/data/rankine/recipes/meteoric_iron_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/meteoric_iron__shovel.json b/src/generated/resources/data/rankine/recipes/meteoric_iron_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/meteoric_iron__shovel.json rename to src/generated/resources/data/rankine/recipes/meteoric_iron_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/meteoric_iron__spear.json b/src/generated/resources/data/rankine/recipes/meteoric_iron_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/meteoric_iron__spear.json rename to src/generated/resources/data/rankine/recipes/meteoric_iron_spear.json diff --git a/src/generated/resources/data/rankine/recipes/meteoric_iron__surf_rod.json b/src/generated/resources/data/rankine/recipes/meteoric_iron_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/meteoric_iron__surf_rod.json rename to src/generated/resources/data/rankine/recipes/meteoric_iron_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/meteoric_iron__sword.json b/src/generated/resources/data/rankine/recipes/meteoric_iron_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/meteoric_iron__sword.json rename to src/generated/resources/data/rankine/recipes/meteoric_iron_sword.json diff --git a/src/generated/resources/data/rankine/recipes/native_osmiridium__axe.json b/src/generated/resources/data/rankine/recipes/native_osmiridium_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/native_osmiridium__axe.json rename to src/generated/resources/data/rankine/recipes/native_osmiridium_axe.json diff --git a/src/generated/resources/data/rankine/recipes/native_osmiridium__blunderbuss.json b/src/generated/resources/data/rankine/recipes/native_osmiridium_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/native_osmiridium__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/native_osmiridium_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/native_osmiridium__crowbar.json b/src/generated/resources/data/rankine/recipes/native_osmiridium_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/native_osmiridium__crowbar.json rename to src/generated/resources/data/rankine/recipes/native_osmiridium_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/native_osmiridium__hammer.json b/src/generated/resources/data/rankine/recipes/native_osmiridium_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/native_osmiridium__hammer.json rename to src/generated/resources/data/rankine/recipes/native_osmiridium_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/native_osmiridium__hoe.json b/src/generated/resources/data/rankine/recipes/native_osmiridium_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/native_osmiridium__hoe.json rename to src/generated/resources/data/rankine/recipes/native_osmiridium_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/native_osmiridium__knife.json b/src/generated/resources/data/rankine/recipes/native_osmiridium_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/native_osmiridium__knife.json rename to src/generated/resources/data/rankine/recipes/native_osmiridium_knife.json diff --git a/src/generated/resources/data/rankine/recipes/native_osmiridium__pickaxe.json b/src/generated/resources/data/rankine/recipes/native_osmiridium_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/native_osmiridium__pickaxe.json rename to src/generated/resources/data/rankine/recipes/native_osmiridium_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/native_osmiridium__shovel.json b/src/generated/resources/data/rankine/recipes/native_osmiridium_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/native_osmiridium__shovel.json rename to src/generated/resources/data/rankine/recipes/native_osmiridium_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/native_osmiridium__spear.json b/src/generated/resources/data/rankine/recipes/native_osmiridium_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/native_osmiridium__spear.json rename to src/generated/resources/data/rankine/recipes/native_osmiridium_spear.json diff --git a/src/generated/resources/data/rankine/recipes/native_osmiridium__surf_rod.json b/src/generated/resources/data/rankine/recipes/native_osmiridium_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/native_osmiridium__surf_rod.json rename to src/generated/resources/data/rankine/recipes/native_osmiridium_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/native_osmiridium__sword.json b/src/generated/resources/data/rankine/recipes/native_osmiridium_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/native_osmiridium__sword.json rename to src/generated/resources/data/rankine/recipes/native_osmiridium_sword.json diff --git a/src/generated/resources/data/rankine/recipes/nickel_superalloy__axe.json b/src/generated/resources/data/rankine/recipes/nickel_superalloy_axe.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/nickel_superalloy__axe.json rename to src/generated/resources/data/rankine/recipes/nickel_superalloy_axe.json index 82ce56f080..7701c30d87 100644 --- a/src/generated/resources/data/rankine/recipes/nickel_superalloy__axe.json +++ b/src/generated/resources/data/rankine/recipes/nickel_superalloy_axe.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_axes", "inherit": true, + "inheritRecipe": "rankine:alloying/nickel_superalloy_alloying", "pattern": [ "##", "#s", diff --git a/src/generated/resources/data/rankine/recipes/nickel_superalloy__blunderbuss.json b/src/generated/resources/data/rankine/recipes/nickel_superalloy_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/nickel_superalloy__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/nickel_superalloy_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/nickel_superalloy__crowbar.json b/src/generated/resources/data/rankine/recipes/nickel_superalloy_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/nickel_superalloy__crowbar.json rename to src/generated/resources/data/rankine/recipes/nickel_superalloy_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/nickel_superalloy__hammer.json b/src/generated/resources/data/rankine/recipes/nickel_superalloy_hammer.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/nickel_superalloy__hammer.json rename to src/generated/resources/data/rankine/recipes/nickel_superalloy_hammer.json index 32eb3ec21b..6671a020c7 100644 --- a/src/generated/resources/data/rankine/recipes/nickel_superalloy__hammer.json +++ b/src/generated/resources/data/rankine/recipes/nickel_superalloy_hammer.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_hammers", "inherit": true, + "inheritRecipe": "rankine:alloying/nickel_superalloy_alloying", "pattern": [ "###", "#s#", diff --git a/src/generated/resources/data/rankine/recipes/nickel_superalloy__hoe.json b/src/generated/resources/data/rankine/recipes/nickel_superalloy_hoe.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/nickel_superalloy__hoe.json rename to src/generated/resources/data/rankine/recipes/nickel_superalloy_hoe.json index 431f18c5de..9212ae9e7f 100644 --- a/src/generated/resources/data/rankine/recipes/nickel_superalloy__hoe.json +++ b/src/generated/resources/data/rankine/recipes/nickel_superalloy_hoe.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_hoes", "inherit": true, + "inheritRecipe": "rankine:alloying/nickel_superalloy_alloying", "pattern": [ "##", " s", diff --git a/src/generated/resources/data/rankine/recipes/nickel_superalloy__knife.json b/src/generated/resources/data/rankine/recipes/nickel_superalloy_knife.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/nickel_superalloy__knife.json rename to src/generated/resources/data/rankine/recipes/nickel_superalloy_knife.json index 8fdc4cae2d..75d890e977 100644 --- a/src/generated/resources/data/rankine/recipes/nickel_superalloy__knife.json +++ b/src/generated/resources/data/rankine/recipes/nickel_superalloy_knife.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_knives", "inherit": true, + "inheritRecipe": "rankine:alloying/nickel_superalloy_alloying", "pattern": [ " #", "s " diff --git a/src/generated/resources/data/rankine/recipes/nickel_superalloy__pickaxe.json b/src/generated/resources/data/rankine/recipes/nickel_superalloy_pickaxe.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/nickel_superalloy__pickaxe.json rename to src/generated/resources/data/rankine/recipes/nickel_superalloy_pickaxe.json index 56aad6a572..3ff8260719 100644 --- a/src/generated/resources/data/rankine/recipes/nickel_superalloy__pickaxe.json +++ b/src/generated/resources/data/rankine/recipes/nickel_superalloy_pickaxe.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_pickaxes", "inherit": true, + "inheritRecipe": "rankine:alloying/nickel_superalloy_alloying", "pattern": [ "###", " s ", diff --git a/src/generated/resources/data/rankine/recipes/nickel_superalloy__shovel.json b/src/generated/resources/data/rankine/recipes/nickel_superalloy_shovel.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/nickel_superalloy__shovel.json rename to src/generated/resources/data/rankine/recipes/nickel_superalloy_shovel.json index c65df8f09e..952237b502 100644 --- a/src/generated/resources/data/rankine/recipes/nickel_superalloy__shovel.json +++ b/src/generated/resources/data/rankine/recipes/nickel_superalloy_shovel.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_shovels", "inherit": true, + "inheritRecipe": "rankine:alloying/nickel_superalloy_alloying", "pattern": [ "#", "s", diff --git a/src/generated/resources/data/rankine/recipes/nickel_superalloy__spear.json b/src/generated/resources/data/rankine/recipes/nickel_superalloy_spear.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/nickel_superalloy__spear.json rename to src/generated/resources/data/rankine/recipes/nickel_superalloy_spear.json index d03fe95fbc..07e5d3d78a 100644 --- a/src/generated/resources/data/rankine/recipes/nickel_superalloy__spear.json +++ b/src/generated/resources/data/rankine/recipes/nickel_superalloy_spear.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_spears", "inherit": true, + "inheritRecipe": "rankine:alloying/nickel_superalloy_alloying", "pattern": [ " ##", " s#", diff --git a/src/generated/resources/data/rankine/recipes/nickel_superalloy__surf_rod.json b/src/generated/resources/data/rankine/recipes/nickel_superalloy_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/nickel_superalloy__surf_rod.json rename to src/generated/resources/data/rankine/recipes/nickel_superalloy_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/nickel_superalloy__sword.json b/src/generated/resources/data/rankine/recipes/nickel_superalloy_sword.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/nickel_superalloy__sword.json rename to src/generated/resources/data/rankine/recipes/nickel_superalloy_sword.json index fcd09aa015..81b486f67b 100644 --- a/src/generated/resources/data/rankine/recipes/nickel_superalloy__sword.json +++ b/src/generated/resources/data/rankine/recipes/nickel_superalloy_sword.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_swords", "inherit": true, + "inheritRecipe": "rankine:alloying/nickel_superalloy_alloying", "pattern": [ "#", "#", diff --git a/src/generated/resources/data/rankine/recipes/niobium_alloy__axe.json b/src/generated/resources/data/rankine/recipes/niobium_alloy_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/niobium_alloy__axe.json rename to src/generated/resources/data/rankine/recipes/niobium_alloy_axe.json diff --git a/src/generated/resources/data/rankine/recipes/niobium_alloy__blunderbuss.json b/src/generated/resources/data/rankine/recipes/niobium_alloy_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/niobium_alloy__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/niobium_alloy_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/niobium_alloy__crowbar.json b/src/generated/resources/data/rankine/recipes/niobium_alloy_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/niobium_alloy__crowbar.json rename to src/generated/resources/data/rankine/recipes/niobium_alloy_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/niobium_alloy__hammer.json b/src/generated/resources/data/rankine/recipes/niobium_alloy_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/niobium_alloy__hammer.json rename to src/generated/resources/data/rankine/recipes/niobium_alloy_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/niobium_alloy__hoe.json b/src/generated/resources/data/rankine/recipes/niobium_alloy_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/niobium_alloy__hoe.json rename to src/generated/resources/data/rankine/recipes/niobium_alloy_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/niobium_alloy__knife.json b/src/generated/resources/data/rankine/recipes/niobium_alloy_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/niobium_alloy__knife.json rename to src/generated/resources/data/rankine/recipes/niobium_alloy_knife.json diff --git a/src/generated/resources/data/rankine/recipes/niobium_alloy__pickaxe.json b/src/generated/resources/data/rankine/recipes/niobium_alloy_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/niobium_alloy__pickaxe.json rename to src/generated/resources/data/rankine/recipes/niobium_alloy_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/niobium_alloy__shovel.json b/src/generated/resources/data/rankine/recipes/niobium_alloy_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/niobium_alloy__shovel.json rename to src/generated/resources/data/rankine/recipes/niobium_alloy_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/niobium_alloy__spear.json b/src/generated/resources/data/rankine/recipes/niobium_alloy_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/niobium_alloy__spear.json rename to src/generated/resources/data/rankine/recipes/niobium_alloy_spear.json diff --git a/src/generated/resources/data/rankine/recipes/niobium_alloy__surf_rod.json b/src/generated/resources/data/rankine/recipes/niobium_alloy_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/niobium_alloy__surf_rod.json rename to src/generated/resources/data/rankine/recipes/niobium_alloy_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/niobium_alloy__sword.json b/src/generated/resources/data/rankine/recipes/niobium_alloy_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/niobium_alloy__sword.json rename to src/generated/resources/data/rankine/recipes/niobium_alloy_sword.json diff --git a/src/generated/resources/data/rankine/recipes/nitinol__axe.json b/src/generated/resources/data/rankine/recipes/nitinol_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/nitinol__axe.json rename to src/generated/resources/data/rankine/recipes/nitinol_axe.json diff --git a/src/generated/resources/data/rankine/recipes/nitinol__blunderbuss.json b/src/generated/resources/data/rankine/recipes/nitinol_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/nitinol__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/nitinol_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/nitinol__crowbar.json b/src/generated/resources/data/rankine/recipes/nitinol_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/nitinol__crowbar.json rename to src/generated/resources/data/rankine/recipes/nitinol_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/nitinol__hammer.json b/src/generated/resources/data/rankine/recipes/nitinol_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/nitinol__hammer.json rename to src/generated/resources/data/rankine/recipes/nitinol_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/nitinol__hoe.json b/src/generated/resources/data/rankine/recipes/nitinol_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/nitinol__hoe.json rename to src/generated/resources/data/rankine/recipes/nitinol_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/nitinol__knife.json b/src/generated/resources/data/rankine/recipes/nitinol_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/nitinol__knife.json rename to src/generated/resources/data/rankine/recipes/nitinol_knife.json diff --git a/src/generated/resources/data/rankine/recipes/nitinol__pickaxe.json b/src/generated/resources/data/rankine/recipes/nitinol_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/nitinol__pickaxe.json rename to src/generated/resources/data/rankine/recipes/nitinol_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/nitinol__shovel.json b/src/generated/resources/data/rankine/recipes/nitinol_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/nitinol__shovel.json rename to src/generated/resources/data/rankine/recipes/nitinol_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/nitinol__spear.json b/src/generated/resources/data/rankine/recipes/nitinol_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/nitinol__spear.json rename to src/generated/resources/data/rankine/recipes/nitinol_spear.json diff --git a/src/generated/resources/data/rankine/recipes/nitinol__surf_rod.json b/src/generated/resources/data/rankine/recipes/nitinol_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/nitinol__surf_rod.json rename to src/generated/resources/data/rankine/recipes/nitinol_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/nitinol__sword.json b/src/generated/resources/data/rankine/recipes/nitinol_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/nitinol__sword.json rename to src/generated/resources/data/rankine/recipes/nitinol_sword.json diff --git a/src/generated/resources/data/rankine/recipes/osmiridium__axe.json b/src/generated/resources/data/rankine/recipes/osmiridium_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/osmiridium__axe.json rename to src/generated/resources/data/rankine/recipes/osmiridium_axe.json diff --git a/src/generated/resources/data/rankine/recipes/osmiridium__blunderbuss.json b/src/generated/resources/data/rankine/recipes/osmiridium_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/osmiridium__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/osmiridium_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/osmiridium__crowbar.json b/src/generated/resources/data/rankine/recipes/osmiridium_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/osmiridium__crowbar.json rename to src/generated/resources/data/rankine/recipes/osmiridium_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/osmiridium__hammer.json b/src/generated/resources/data/rankine/recipes/osmiridium_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/osmiridium__hammer.json rename to src/generated/resources/data/rankine/recipes/osmiridium_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/osmiridium__hoe.json b/src/generated/resources/data/rankine/recipes/osmiridium_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/osmiridium__hoe.json rename to src/generated/resources/data/rankine/recipes/osmiridium_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/osmiridium__knife.json b/src/generated/resources/data/rankine/recipes/osmiridium_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/osmiridium__knife.json rename to src/generated/resources/data/rankine/recipes/osmiridium_knife.json diff --git a/src/generated/resources/data/rankine/recipes/osmiridium__pickaxe.json b/src/generated/resources/data/rankine/recipes/osmiridium_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/osmiridium__pickaxe.json rename to src/generated/resources/data/rankine/recipes/osmiridium_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/osmiridium__shovel.json b/src/generated/resources/data/rankine/recipes/osmiridium_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/osmiridium__shovel.json rename to src/generated/resources/data/rankine/recipes/osmiridium_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/osmiridium__spear.json b/src/generated/resources/data/rankine/recipes/osmiridium_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/osmiridium__spear.json rename to src/generated/resources/data/rankine/recipes/osmiridium_spear.json diff --git a/src/generated/resources/data/rankine/recipes/osmiridium__surf_rod.json b/src/generated/resources/data/rankine/recipes/osmiridium_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/osmiridium__surf_rod.json rename to src/generated/resources/data/rankine/recipes/osmiridium_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/osmiridium__sword.json b/src/generated/resources/data/rankine/recipes/osmiridium_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/osmiridium__sword.json rename to src/generated/resources/data/rankine/recipes/osmiridium_sword.json diff --git a/src/generated/resources/data/rankine/recipes/pewter__axe.json b/src/generated/resources/data/rankine/recipes/pewter_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/pewter__axe.json rename to src/generated/resources/data/rankine/recipes/pewter_axe.json diff --git a/src/generated/resources/data/rankine/recipes/pewter__blunderbuss.json b/src/generated/resources/data/rankine/recipes/pewter_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/pewter__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/pewter_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/pewter__crowbar.json b/src/generated/resources/data/rankine/recipes/pewter_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/pewter__crowbar.json rename to src/generated/resources/data/rankine/recipes/pewter_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/pewter__hammer.json b/src/generated/resources/data/rankine/recipes/pewter_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/pewter__hammer.json rename to src/generated/resources/data/rankine/recipes/pewter_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/pewter__hoe.json b/src/generated/resources/data/rankine/recipes/pewter_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/pewter__hoe.json rename to src/generated/resources/data/rankine/recipes/pewter_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/pewter__knife.json b/src/generated/resources/data/rankine/recipes/pewter_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/pewter__knife.json rename to src/generated/resources/data/rankine/recipes/pewter_knife.json diff --git a/src/generated/resources/data/rankine/recipes/pewter__pickaxe.json b/src/generated/resources/data/rankine/recipes/pewter_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/pewter__pickaxe.json rename to src/generated/resources/data/rankine/recipes/pewter_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/pewter__shovel.json b/src/generated/resources/data/rankine/recipes/pewter_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/pewter__shovel.json rename to src/generated/resources/data/rankine/recipes/pewter_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/pewter__spear.json b/src/generated/resources/data/rankine/recipes/pewter_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/pewter__spear.json rename to src/generated/resources/data/rankine/recipes/pewter_spear.json diff --git a/src/generated/resources/data/rankine/recipes/pewter__surf_rod.json b/src/generated/resources/data/rankine/recipes/pewter_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/pewter__surf_rod.json rename to src/generated/resources/data/rankine/recipes/pewter_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/pewter__sword.json b/src/generated/resources/data/rankine/recipes/pewter_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/pewter__sword.json rename to src/generated/resources/data/rankine/recipes/pewter_sword.json diff --git a/src/generated/resources/data/rankine/recipes/purple_gold__axe.json b/src/generated/resources/data/rankine/recipes/purple_gold_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/purple_gold__axe.json rename to src/generated/resources/data/rankine/recipes/purple_gold_axe.json diff --git a/src/generated/resources/data/rankine/recipes/purple_gold__blunderbuss.json b/src/generated/resources/data/rankine/recipes/purple_gold_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/purple_gold__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/purple_gold_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/purple_gold__crowbar.json b/src/generated/resources/data/rankine/recipes/purple_gold_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/purple_gold__crowbar.json rename to src/generated/resources/data/rankine/recipes/purple_gold_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/purple_gold__hammer.json b/src/generated/resources/data/rankine/recipes/purple_gold_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/purple_gold__hammer.json rename to src/generated/resources/data/rankine/recipes/purple_gold_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/purple_gold__hoe.json b/src/generated/resources/data/rankine/recipes/purple_gold_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/purple_gold__hoe.json rename to src/generated/resources/data/rankine/recipes/purple_gold_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/purple_gold__knife.json b/src/generated/resources/data/rankine/recipes/purple_gold_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/purple_gold__knife.json rename to src/generated/resources/data/rankine/recipes/purple_gold_knife.json diff --git a/src/generated/resources/data/rankine/recipes/purple_gold__pickaxe.json b/src/generated/resources/data/rankine/recipes/purple_gold_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/purple_gold__pickaxe.json rename to src/generated/resources/data/rankine/recipes/purple_gold_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/purple_gold__shovel.json b/src/generated/resources/data/rankine/recipes/purple_gold_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/purple_gold__shovel.json rename to src/generated/resources/data/rankine/recipes/purple_gold_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/purple_gold__spear.json b/src/generated/resources/data/rankine/recipes/purple_gold_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/purple_gold__spear.json rename to src/generated/resources/data/rankine/recipes/purple_gold_spear.json diff --git a/src/generated/resources/data/rankine/recipes/purple_gold__surf_rod.json b/src/generated/resources/data/rankine/recipes/purple_gold_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/purple_gold__surf_rod.json rename to src/generated/resources/data/rankine/recipes/purple_gold_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/purple_gold__sword.json b/src/generated/resources/data/rankine/recipes/purple_gold_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/purple_gold__sword.json rename to src/generated/resources/data/rankine/recipes/purple_gold_sword.json diff --git a/src/generated/resources/data/rankine/recipes/rose_gold__axe.json b/src/generated/resources/data/rankine/recipes/rose_gold_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/rose_gold__axe.json rename to src/generated/resources/data/rankine/recipes/rose_gold_axe.json diff --git a/src/generated/resources/data/rankine/recipes/rose_gold__blunderbuss.json b/src/generated/resources/data/rankine/recipes/rose_gold_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/rose_gold__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/rose_gold_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/rose_gold__crowbar.json b/src/generated/resources/data/rankine/recipes/rose_gold_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/rose_gold__crowbar.json rename to src/generated/resources/data/rankine/recipes/rose_gold_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/rose_gold__hammer.json b/src/generated/resources/data/rankine/recipes/rose_gold_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/rose_gold__hammer.json rename to src/generated/resources/data/rankine/recipes/rose_gold_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/rose_gold__hoe.json b/src/generated/resources/data/rankine/recipes/rose_gold_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/rose_gold__hoe.json rename to src/generated/resources/data/rankine/recipes/rose_gold_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/rose_gold__knife.json b/src/generated/resources/data/rankine/recipes/rose_gold_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/rose_gold__knife.json rename to src/generated/resources/data/rankine/recipes/rose_gold_knife.json diff --git a/src/generated/resources/data/rankine/recipes/rose_gold__pickaxe.json b/src/generated/resources/data/rankine/recipes/rose_gold_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/rose_gold__pickaxe.json rename to src/generated/resources/data/rankine/recipes/rose_gold_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/rose_gold__shovel.json b/src/generated/resources/data/rankine/recipes/rose_gold_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/rose_gold__shovel.json rename to src/generated/resources/data/rankine/recipes/rose_gold_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/rose_gold__spear.json b/src/generated/resources/data/rankine/recipes/rose_gold_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/rose_gold__spear.json rename to src/generated/resources/data/rankine/recipes/rose_gold_spear.json diff --git a/src/generated/resources/data/rankine/recipes/rose_gold__surf_rod.json b/src/generated/resources/data/rankine/recipes/rose_gold_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/rose_gold__surf_rod.json rename to src/generated/resources/data/rankine/recipes/rose_gold_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/rose_gold__sword.json b/src/generated/resources/data/rankine/recipes/rose_gold_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/rose_gold__sword.json rename to src/generated/resources/data/rankine/recipes/rose_gold_sword.json diff --git a/src/generated/resources/data/rankine/recipes/stainless_steel__axe.json b/src/generated/resources/data/rankine/recipes/stainless_steel_axe.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/stainless_steel__axe.json rename to src/generated/resources/data/rankine/recipes/stainless_steel_axe.json index 0ac78960ac..79ff802850 100644 --- a/src/generated/resources/data/rankine/recipes/stainless_steel__axe.json +++ b/src/generated/resources/data/rankine/recipes/stainless_steel_axe.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_axes", "inherit": true, + "inheritRecipe": "rankine:alloying/stainless_steel_alloying", "pattern": [ "##", "#s", diff --git a/src/generated/resources/data/rankine/recipes/stainless_steel__blunderbuss.json b/src/generated/resources/data/rankine/recipes/stainless_steel_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/stainless_steel__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/stainless_steel_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/stainless_steel__crowbar.json b/src/generated/resources/data/rankine/recipes/stainless_steel_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/stainless_steel__crowbar.json rename to src/generated/resources/data/rankine/recipes/stainless_steel_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/stainless_steel__hammer.json b/src/generated/resources/data/rankine/recipes/stainless_steel_hammer.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/stainless_steel__hammer.json rename to src/generated/resources/data/rankine/recipes/stainless_steel_hammer.json index 17d3648e86..52ef0c102b 100644 --- a/src/generated/resources/data/rankine/recipes/stainless_steel__hammer.json +++ b/src/generated/resources/data/rankine/recipes/stainless_steel_hammer.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_hammers", "inherit": true, + "inheritRecipe": "rankine:alloying/stainless_steel_alloying", "pattern": [ "###", "#s#", diff --git a/src/generated/resources/data/rankine/recipes/stainless_steel__hoe.json b/src/generated/resources/data/rankine/recipes/stainless_steel_hoe.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/stainless_steel__hoe.json rename to src/generated/resources/data/rankine/recipes/stainless_steel_hoe.json index 7bc995c6eb..39c8c320de 100644 --- a/src/generated/resources/data/rankine/recipes/stainless_steel__hoe.json +++ b/src/generated/resources/data/rankine/recipes/stainless_steel_hoe.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_hoes", "inherit": true, + "inheritRecipe": "rankine:alloying/stainless_steel_alloying", "pattern": [ "##", " s", diff --git a/src/generated/resources/data/rankine/recipes/stainless_steel__knife.json b/src/generated/resources/data/rankine/recipes/stainless_steel_knife.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/stainless_steel__knife.json rename to src/generated/resources/data/rankine/recipes/stainless_steel_knife.json index 3cc0ac3a9b..957292f8bb 100644 --- a/src/generated/resources/data/rankine/recipes/stainless_steel__knife.json +++ b/src/generated/resources/data/rankine/recipes/stainless_steel_knife.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_knives", "inherit": true, + "inheritRecipe": "rankine:alloying/stainless_steel_alloying", "pattern": [ " #", "s " diff --git a/src/generated/resources/data/rankine/recipes/stainless_steel__pickaxe.json b/src/generated/resources/data/rankine/recipes/stainless_steel_pickaxe.json similarity index 88% rename from src/generated/resources/data/rankine/recipes/stainless_steel__pickaxe.json rename to src/generated/resources/data/rankine/recipes/stainless_steel_pickaxe.json index 5e84ff0a7e..88359ffc06 100644 --- a/src/generated/resources/data/rankine/recipes/stainless_steel__pickaxe.json +++ b/src/generated/resources/data/rankine/recipes/stainless_steel_pickaxe.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_pickaxes", "inherit": true, + "inheritRecipe": "rankine:alloying/stainless_steel_alloying", "pattern": [ "###", " s ", diff --git a/src/generated/resources/data/rankine/recipes/stainless_steel__shovel.json b/src/generated/resources/data/rankine/recipes/stainless_steel_shovel.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/stainless_steel__shovel.json rename to src/generated/resources/data/rankine/recipes/stainless_steel_shovel.json index ff1dd6d6f5..c275eb0bd4 100644 --- a/src/generated/resources/data/rankine/recipes/stainless_steel__shovel.json +++ b/src/generated/resources/data/rankine/recipes/stainless_steel_shovel.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_shovels", "inherit": true, + "inheritRecipe": "rankine:alloying/stainless_steel_alloying", "pattern": [ "#", "s", diff --git a/src/generated/resources/data/rankine/recipes/stainless_steel__spear.json b/src/generated/resources/data/rankine/recipes/stainless_steel_spear.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/stainless_steel__spear.json rename to src/generated/resources/data/rankine/recipes/stainless_steel_spear.json index cacc90610b..ced4e23c44 100644 --- a/src/generated/resources/data/rankine/recipes/stainless_steel__spear.json +++ b/src/generated/resources/data/rankine/recipes/stainless_steel_spear.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_spears", "inherit": true, + "inheritRecipe": "rankine:alloying/stainless_steel_alloying", "pattern": [ " ##", " s#", diff --git a/src/generated/resources/data/rankine/recipes/stainless_steel__surf_rod.json b/src/generated/resources/data/rankine/recipes/stainless_steel_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/stainless_steel__surf_rod.json rename to src/generated/resources/data/rankine/recipes/stainless_steel_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/stainless_steel__sword.json b/src/generated/resources/data/rankine/recipes/stainless_steel_sword.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/stainless_steel__sword.json rename to src/generated/resources/data/rankine/recipes/stainless_steel_sword.json index cdc53e4221..b1d26d4bca 100644 --- a/src/generated/resources/data/rankine/recipes/stainless_steel__sword.json +++ b/src/generated/resources/data/rankine/recipes/stainless_steel_sword.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_swords", "inherit": true, + "inheritRecipe": "rankine:alloying/stainless_steel_alloying", "pattern": [ "#", "#", diff --git a/src/generated/resources/data/rankine/recipes/steel__axe.json b/src/generated/resources/data/rankine/recipes/steel_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/steel__axe.json rename to src/generated/resources/data/rankine/recipes/steel_axe.json diff --git a/src/generated/resources/data/rankine/recipes/steel__blunderbuss.json b/src/generated/resources/data/rankine/recipes/steel_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/steel__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/steel_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/steel__crowbar.json b/src/generated/resources/data/rankine/recipes/steel_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/steel__crowbar.json rename to src/generated/resources/data/rankine/recipes/steel_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/steel__hammer.json b/src/generated/resources/data/rankine/recipes/steel_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/steel__hammer.json rename to src/generated/resources/data/rankine/recipes/steel_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/steel__hoe.json b/src/generated/resources/data/rankine/recipes/steel_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/steel__hoe.json rename to src/generated/resources/data/rankine/recipes/steel_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/steel__knife.json b/src/generated/resources/data/rankine/recipes/steel_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/steel__knife.json rename to src/generated/resources/data/rankine/recipes/steel_knife.json diff --git a/src/generated/resources/data/rankine/recipes/steel__pickaxe.json b/src/generated/resources/data/rankine/recipes/steel_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/steel__pickaxe.json rename to src/generated/resources/data/rankine/recipes/steel_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/steel__shovel.json b/src/generated/resources/data/rankine/recipes/steel_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/steel__shovel.json rename to src/generated/resources/data/rankine/recipes/steel_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/steel__spear.json b/src/generated/resources/data/rankine/recipes/steel_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/steel__spear.json rename to src/generated/resources/data/rankine/recipes/steel_spear.json diff --git a/src/generated/resources/data/rankine/recipes/steel__surf_rod.json b/src/generated/resources/data/rankine/recipes/steel_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/steel__surf_rod.json rename to src/generated/resources/data/rankine/recipes/steel_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/steel__sword.json b/src/generated/resources/data/rankine/recipes/steel_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/steel__sword.json rename to src/generated/resources/data/rankine/recipes/steel_sword.json diff --git a/src/generated/resources/data/rankine/recipes/titanium_alloy__axe.json b/src/generated/resources/data/rankine/recipes/titanium_alloy_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/titanium_alloy__axe.json rename to src/generated/resources/data/rankine/recipes/titanium_alloy_axe.json diff --git a/src/generated/resources/data/rankine/recipes/titanium_alloy__blunderbuss.json b/src/generated/resources/data/rankine/recipes/titanium_alloy_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/titanium_alloy__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/titanium_alloy_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/titanium_alloy__crowbar.json b/src/generated/resources/data/rankine/recipes/titanium_alloy_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/titanium_alloy__crowbar.json rename to src/generated/resources/data/rankine/recipes/titanium_alloy_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/titanium_alloy__hammer.json b/src/generated/resources/data/rankine/recipes/titanium_alloy_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/titanium_alloy__hammer.json rename to src/generated/resources/data/rankine/recipes/titanium_alloy_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/titanium_alloy__hoe.json b/src/generated/resources/data/rankine/recipes/titanium_alloy_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/titanium_alloy__hoe.json rename to src/generated/resources/data/rankine/recipes/titanium_alloy_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/titanium_alloy__knife.json b/src/generated/resources/data/rankine/recipes/titanium_alloy_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/titanium_alloy__knife.json rename to src/generated/resources/data/rankine/recipes/titanium_alloy_knife.json diff --git a/src/generated/resources/data/rankine/recipes/titanium_alloy__pickaxe.json b/src/generated/resources/data/rankine/recipes/titanium_alloy_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/titanium_alloy__pickaxe.json rename to src/generated/resources/data/rankine/recipes/titanium_alloy_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/titanium_alloy__shovel.json b/src/generated/resources/data/rankine/recipes/titanium_alloy_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/titanium_alloy__shovel.json rename to src/generated/resources/data/rankine/recipes/titanium_alloy_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/titanium_alloy__spear.json b/src/generated/resources/data/rankine/recipes/titanium_alloy_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/titanium_alloy__spear.json rename to src/generated/resources/data/rankine/recipes/titanium_alloy_spear.json diff --git a/src/generated/resources/data/rankine/recipes/titanium_alloy__surf_rod.json b/src/generated/resources/data/rankine/recipes/titanium_alloy_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/titanium_alloy__surf_rod.json rename to src/generated/resources/data/rankine/recipes/titanium_alloy_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/titanium_alloy__sword.json b/src/generated/resources/data/rankine/recipes/titanium_alloy_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/titanium_alloy__sword.json rename to src/generated/resources/data/rankine/recipes/titanium_alloy_sword.json diff --git a/src/generated/resources/data/rankine/recipes/totem_of_blazing.json b/src/generated/resources/data/rankine/recipes/totem_of_blazing.json new file mode 100644 index 0000000000..e086ad38e1 --- /dev/null +++ b/src/generated/resources/data/rankine/recipes/totem_of_blazing.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "III", + "IRI", + "III" + ], + "key": { + "I": { + "tag": "forge:ingots/ferrocerium" + }, + "R": { + "tag": "forge:storage_blocks/peridot" + } + }, + "result": { + "item": "rankine:totem_of_blazing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__axe.json b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_axe.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__axe.json rename to src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_axe.json index 6ba75fc932..76f595d91d 100644 --- a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__axe.json +++ b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_axe.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_axes", "inherit": true, + "inheritRecipe": "rankine:alloying/tungsten_heavy_alloy_alloying", "pattern": [ "##", "#s", diff --git a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__blunderbuss.json b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__crowbar.json b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__crowbar.json rename to src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__hammer.json b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_hammer.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__hammer.json rename to src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_hammer.json index e16fc7a352..b8b70cfeeb 100644 --- a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__hammer.json +++ b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_hammer.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_hammers", "inherit": true, + "inheritRecipe": "rankine:alloying/tungsten_heavy_alloy_alloying", "pattern": [ "###", "#s#", diff --git a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__hoe.json b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_hoe.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__hoe.json rename to src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_hoe.json index 97e98783ea..ec1e90b090 100644 --- a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__hoe.json +++ b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_hoe.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_hoes", "inherit": true, + "inheritRecipe": "rankine:alloying/tungsten_heavy_alloy_alloying", "pattern": [ "##", " s", diff --git a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__knife.json b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_knife.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__knife.json rename to src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_knife.json index 2f16da159b..2ce997e0f6 100644 --- a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__knife.json +++ b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_knife.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_knives", "inherit": true, + "inheritRecipe": "rankine:alloying/tungsten_heavy_alloy_alloying", "pattern": [ " #", "s " diff --git a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__pickaxe.json b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_pickaxe.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__pickaxe.json rename to src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_pickaxe.json index a2ab0c4435..54c04ac6bb 100644 --- a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__pickaxe.json +++ b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_pickaxe.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_pickaxes", "inherit": true, + "inheritRecipe": "rankine:alloying/tungsten_heavy_alloy_alloying", "pattern": [ "###", " s ", diff --git a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__shovel.json b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_shovel.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__shovel.json rename to src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_shovel.json index 016e975480..a548115b00 100644 --- a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__shovel.json +++ b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_shovel.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_shovels", "inherit": true, + "inheritRecipe": "rankine:alloying/tungsten_heavy_alloy_alloying", "pattern": [ "#", "s", diff --git a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__spear.json b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_spear.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__spear.json rename to src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_spear.json index dbd1dab385..f9229985c4 100644 --- a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__spear.json +++ b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_spear.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_spears", "inherit": true, + "inheritRecipe": "rankine:alloying/tungsten_heavy_alloy_alloying", "pattern": [ " ##", " s#", diff --git a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__surf_rod.json b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__surf_rod.json rename to src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__sword.json b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_sword.json similarity index 87% rename from src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__sword.json rename to src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_sword.json index 6464562625..4f194fc8f8 100644 --- a/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy__sword.json +++ b/src/generated/resources/data/rankine/recipes/tungsten_heavy_alloy_sword.json @@ -2,6 +2,7 @@ "type": "rankine:alloy_crafting", "group": "rankine:alloy_swords", "inherit": true, + "inheritRecipe": "rankine:alloying/tungsten_heavy_alloy_alloying", "pattern": [ "#", "#", diff --git a/src/generated/resources/data/rankine/recipes/white_gold__axe.json b/src/generated/resources/data/rankine/recipes/white_gold_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/white_gold__axe.json rename to src/generated/resources/data/rankine/recipes/white_gold_axe.json diff --git a/src/generated/resources/data/rankine/recipes/white_gold__blunderbuss.json b/src/generated/resources/data/rankine/recipes/white_gold_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/white_gold__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/white_gold_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/white_gold__crowbar.json b/src/generated/resources/data/rankine/recipes/white_gold_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/white_gold__crowbar.json rename to src/generated/resources/data/rankine/recipes/white_gold_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/white_gold__hammer.json b/src/generated/resources/data/rankine/recipes/white_gold_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/white_gold__hammer.json rename to src/generated/resources/data/rankine/recipes/white_gold_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/white_gold__hoe.json b/src/generated/resources/data/rankine/recipes/white_gold_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/white_gold__hoe.json rename to src/generated/resources/data/rankine/recipes/white_gold_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/white_gold__knife.json b/src/generated/resources/data/rankine/recipes/white_gold_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/white_gold__knife.json rename to src/generated/resources/data/rankine/recipes/white_gold_knife.json diff --git a/src/generated/resources/data/rankine/recipes/white_gold__pickaxe.json b/src/generated/resources/data/rankine/recipes/white_gold_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/white_gold__pickaxe.json rename to src/generated/resources/data/rankine/recipes/white_gold_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/white_gold__shovel.json b/src/generated/resources/data/rankine/recipes/white_gold_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/white_gold__shovel.json rename to src/generated/resources/data/rankine/recipes/white_gold_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/white_gold__spear.json b/src/generated/resources/data/rankine/recipes/white_gold_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/white_gold__spear.json rename to src/generated/resources/data/rankine/recipes/white_gold_spear.json diff --git a/src/generated/resources/data/rankine/recipes/white_gold__surf_rod.json b/src/generated/resources/data/rankine/recipes/white_gold_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/white_gold__surf_rod.json rename to src/generated/resources/data/rankine/recipes/white_gold_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/white_gold__sword.json b/src/generated/resources/data/rankine/recipes/white_gold_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/white_gold__sword.json rename to src/generated/resources/data/rankine/recipes/white_gold_sword.json diff --git a/src/generated/resources/data/rankine/recipes/zirconium_alloy__axe.json b/src/generated/resources/data/rankine/recipes/zirconium_alloy_axe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/zirconium_alloy__axe.json rename to src/generated/resources/data/rankine/recipes/zirconium_alloy_axe.json diff --git a/src/generated/resources/data/rankine/recipes/zirconium_alloy__blunderbuss.json b/src/generated/resources/data/rankine/recipes/zirconium_alloy_blunderbuss.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/zirconium_alloy__blunderbuss.json rename to src/generated/resources/data/rankine/recipes/zirconium_alloy_blunderbuss.json diff --git a/src/generated/resources/data/rankine/recipes/zirconium_alloy__crowbar.json b/src/generated/resources/data/rankine/recipes/zirconium_alloy_crowbar.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/zirconium_alloy__crowbar.json rename to src/generated/resources/data/rankine/recipes/zirconium_alloy_crowbar.json diff --git a/src/generated/resources/data/rankine/recipes/zirconium_alloy__hammer.json b/src/generated/resources/data/rankine/recipes/zirconium_alloy_hammer.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/zirconium_alloy__hammer.json rename to src/generated/resources/data/rankine/recipes/zirconium_alloy_hammer.json diff --git a/src/generated/resources/data/rankine/recipes/zirconium_alloy__hoe.json b/src/generated/resources/data/rankine/recipes/zirconium_alloy_hoe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/zirconium_alloy__hoe.json rename to src/generated/resources/data/rankine/recipes/zirconium_alloy_hoe.json diff --git a/src/generated/resources/data/rankine/recipes/zirconium_alloy__knife.json b/src/generated/resources/data/rankine/recipes/zirconium_alloy_knife.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/zirconium_alloy__knife.json rename to src/generated/resources/data/rankine/recipes/zirconium_alloy_knife.json diff --git a/src/generated/resources/data/rankine/recipes/zirconium_alloy__pickaxe.json b/src/generated/resources/data/rankine/recipes/zirconium_alloy_pickaxe.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/zirconium_alloy__pickaxe.json rename to src/generated/resources/data/rankine/recipes/zirconium_alloy_pickaxe.json diff --git a/src/generated/resources/data/rankine/recipes/zirconium_alloy__shovel.json b/src/generated/resources/data/rankine/recipes/zirconium_alloy_shovel.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/zirconium_alloy__shovel.json rename to src/generated/resources/data/rankine/recipes/zirconium_alloy_shovel.json diff --git a/src/generated/resources/data/rankine/recipes/zirconium_alloy__spear.json b/src/generated/resources/data/rankine/recipes/zirconium_alloy_spear.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/zirconium_alloy__spear.json rename to src/generated/resources/data/rankine/recipes/zirconium_alloy_spear.json diff --git a/src/generated/resources/data/rankine/recipes/zirconium_alloy__surf_rod.json b/src/generated/resources/data/rankine/recipes/zirconium_alloy_surf_rod.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/zirconium_alloy__surf_rod.json rename to src/generated/resources/data/rankine/recipes/zirconium_alloy_surf_rod.json diff --git a/src/generated/resources/data/rankine/recipes/zirconium_alloy__sword.json b/src/generated/resources/data/rankine/recipes/zirconium_alloy_sword.json similarity index 100% rename from src/generated/resources/data/rankine/recipes/zirconium_alloy__sword.json rename to src/generated/resources/data/rankine/recipes/zirconium_alloy_sword.json diff --git a/src/main/java/com/cannolicatfish/rankine/compatibility/AlexMobs.java b/src/main/java/com/cannolicatfish/rankine/compatibility/AlexMobs.java new file mode 100644 index 0000000000..dbb747ec1a --- /dev/null +++ b/src/main/java/com/cannolicatfish/rankine/compatibility/AlexMobs.java @@ -0,0 +1,9 @@ +package com.cannolicatfish.rankine.compatibility; + +import net.minecraftforge.fml.ModList; + +public class AlexMobs { + public static boolean isInstalled() { + return ModList.get() != null && ModList.get().getModContainerById("alexsmobs").isPresent(); + } +} diff --git a/src/main/java/com/cannolicatfish/rankine/data/RankineLangProvider.java b/src/main/java/com/cannolicatfish/rankine/data/RankineLangProvider.java index 227e6f259a..8324e07804 100644 --- a/src/main/java/com/cannolicatfish/rankine/data/RankineLangProvider.java +++ b/src/main/java/com/cannolicatfish/rankine/data/RankineLangProvider.java @@ -632,6 +632,15 @@ protected void addTranslations() { add("entity.minecraft.villager.rankine.gem_cutter", "Gem Cutter"); add("entity.minecraft.villager.rankine.rock_collector", "Rock Collector"); + add("effect.rankine.mercury_poison", "Mercury Poisoning"); + add("item.minecraft.potion.effect.mercury_poison", "Potion of Mercury Poisoning"); + add("item.minecraft.splash_potion.effect.mercury_poison", "Splash Potion of Mercury Poisoning"); + add("item.minecraft.lingering_potion.effect.mercury_poison", "Lingering Potion of Mercury Poisoning"); + add("effect.rankine.conductive", "Conductive"); + add("item.minecraft.potion.effect.conductive", "Potion of Conductivity"); + add("item.minecraft.splash_potion.effect.conductive", "Splash Potion of Conductivity"); + add("item.minecraft.lingering_potion.effect.conductive", "Lingering Potion of Conductivity"); + add("enchantment.rankine.puncture", "Puncture"); add("enchantment.rankine.puncture.desc", "Deals extra armor-piercing damage on direct attacks."); add("enchantment.rankine.blast", "Blast"); @@ -1445,7 +1454,7 @@ protected void addTranslations() { add("rankine.journal.cat_tools.totems.name", "Totems"); add("rankine.journal.cat_tools.totems.text1", "Totems are relics derived from the natural magics of the world. While in the offhand, they provide various effects."); - add("rankine.journal.cat_tools.totems.totem_of_blazing", ""); + add("rankine.journal.cat_tools.totems.totem_of_blazing", "When on fire, deal 1.5x damage and lay fire at your feet. When health is less than 25% or you fall in lava, this totem disappears and provides Fire Resistance and a small amount of Regeneration."); add("rankine.journal.cat_tools.totems.totem_of_cobbling", "Internally stores all types of stones up to 8 stacks. Can be used to place cobblestone."); add("rankine.journal.cat_tools.totems.totem_of_enduring", "Increases the wearer's health capacity. Can be used every so often to apply regeneration."); add("rankine.journal.cat_tools.totems.totem_of_hastening", "Applies efficiency to your arms, allowing you to mine all blocks quicker."); diff --git a/src/main/java/com/cannolicatfish/rankine/data/RankineRecipesProvider.java b/src/main/java/com/cannolicatfish/rankine/data/RankineRecipesProvider.java index b9c88d1a38..d5654266ee 100644 --- a/src/main/java/com/cannolicatfish/rankine/data/RankineRecipesProvider.java +++ b/src/main/java/com/cannolicatfish/rankine/data/RankineRecipesProvider.java @@ -6,6 +6,7 @@ import com.cannolicatfish.rankine.init.RankineItems; import com.cannolicatfish.rankine.init.RankineLists; import com.cannolicatfish.rankine.init.RankineTags; +import com.cannolicatfish.rankine.items.alloys.AlloyItem; import com.cannolicatfish.rankine.recipe.JamRecipe; import net.minecraft.advancements.criterion.InventoryChangeTrigger; import net.minecraft.block.Block; @@ -379,6 +380,7 @@ protected void registerRecipes(Consumer consumer) { ShapedRecipeBuilder.shapedRecipe(RankineItems.TOTEM_OF_SOFTENING.get(), 1).patternLine("III").patternLine("IRI").patternLine("III").key('I', RankineTags.Items.INGOTS_PURPLE_GOLD).key('R', RankineTags.Items.STORAGE_BLOCKS_PEARL).addCriterion("has_ingredient", hasItem(RankineTags.Items.INGOTS_PURPLE_GOLD)).build(consumer); ShapedRecipeBuilder.shapedRecipe(RankineItems.TOTEM_OF_LEVITATING.get(), 1).patternLine("III").patternLine("IRI").patternLine("III").key('I', RankineTags.Items.INGOTS_OSMIRIDIUM).key('R', RankineTags.Items.STORAGE_BLOCKS_OPAL).addCriterion("has_ingredient", hasItem(RankineTags.Items.INGOTS_OSMIRIDIUM)).build(consumer); ShapedRecipeBuilder.shapedRecipe(RankineItems.TOTEM_OF_INVIGORATING.get(), 1).patternLine("III").patternLine("IRI").patternLine("III").key('I', RankineTags.Items.INGOTS_GREEN_GOLD).key('R', RankineTags.Items.STORAGE_BLOCKS_TOURMALINE).addCriterion("has_ingredient", hasItem(RankineTags.Items.INGOTS_GREEN_GOLD)).build(consumer); + ShapedRecipeBuilder.shapedRecipe(RankineItems.TOTEM_OF_BLAZING.get(), 1).patternLine("III").patternLine("IRI").patternLine("III").key('I', RankineTags.Items.INGOTS_FERROCERIUM).key('R', RankineTags.Items.STORAGE_BLOCKS_PERIDOT).addCriterion("has_ingredient", hasItem(RankineTags.Items.INGOTS_FERROCERIUM)).build(consumer); //ShapedRecipeBuilder.shapedRecipe(RankineItems.TOTEM_OF_INFUSING.get(), 1).patternLine("III").patternLine("IRI").patternLine("III").key('I', RankineTags.Items.INGOTS_MISCHMETAL).key('R', RankineTags.Items.STORAGE_BLOCKS_PERIDOT).addCriterion("has_ingredient", hasItem(RankineTags.Items.INGOTS_MISCHMETAL)).build(consumer); @@ -946,40 +948,40 @@ protected void registerRecipes(Consumer consumer) { CookingRecipeBuilder.cookingRecipe(Ingredient.fromItems(RankineItems.TUNA.get()), RankineItems.COOKED_TUNA.get(), 0.35F, 600, IRecipeSerializer.SMOKING).addCriterion("has_ingredient", hasItem(RankineItems.TUNA.get())).build(consumer, "rankine:cooked_tuna_smoking"); - defaultToolRecipes(consumer,RankineItems.PEWTER_INGOT.get(), 11711154, "item.rankine.pewter_alloying", false); - defaultToolRecipes(consumer,RankineItems.BRONZE_INGOT.get(), 15510384, "item.rankine.bronze_alloying", false); - defaultToolRecipes(consumer,RankineItems.INVAR_INGOT.get(), 13028546, "item.rankine.invar_alloying", false); - defaultToolRecipes(consumer,RankineItems.STEEL_INGOT.get(), 7634311, "item.rankine.steel_alloying", false); - defaultToolRecipes(consumer,RankineItems.STAINLESS_STEEL_INGOT.get(), 13292499, "item.rankine.stainless_steel_alloying", true); - defaultToolRecipes(consumer,RankineItems.NICKEL_SUPERALLOY_INGOT.get(), 12769246, "item.rankine.nickel_superalloy_alloying", true); - defaultToolRecipes(consumer,RankineItems.COBALT_SUPERALLOY_INGOT.get(), 6534878, "item.rankine.cobalt_superalloy_alloying", true); - defaultToolRecipes(consumer,RankineItems.TUNGSTEN_HEAVY_ALLOY_INGOT.get(), 11113071, "item.rankine.tungsten_heavy_alloy_alloying", true); - defaultToolRecipes(consumer,RankineItems.ROSE_GOLD_INGOT.get(), 16756647, "item.rankine.rose_gold_alloying", false); - defaultToolRecipes(consumer,RankineItems.WHITE_GOLD_INGOT.get(), 16777207, "item.rankine.white_gold_alloying", false); - defaultToolRecipes(consumer,RankineItems.GREEN_GOLD_INGOT.get(), 15728547, "item.rankine.green_gold_alloying", false); - defaultToolRecipes(consumer,RankineItems.BLUE_GOLD_INGOT.get(), 8695295, "item.rankine.blue_gold_alloying", false); - defaultToolRecipes(consumer,RankineItems.PURPLE_GOLD_INGOT.get(), 11836415, "item.rankine.purple_gold_alloying", false); - defaultToolRecipes(consumer,RankineItems.BLACK_GOLD_INGOT.get(), 3684408, "item.rankine.black_gold_alloying", false); - defaultToolRecipes(consumer,RankineItems.AMALGAM_INGOT.get(), 13881539, "item.rankine.amalgam_alloying", false); - defaultToolRecipes(consumer,RankineItems.ENDER_AMALGAM_INGOT.get(), 492385, "item.rankine.ender_amalgam_alloying", true); - defaultToolRecipes(consumer,RankineItems.OSMIRIDIUM_INGOT.get(), 13212593, "item.rankine.osmiridium_alloying", false); - defaultToolRecipes(consumer,RankineItems.TITANIUM_ALLOY_INGOT.get(), 13750746, "item.rankine.titanium_alloy_alloying", false); - defaultToolRecipes(consumer,RankineItems.NIOBIUM_ALLOY_INGOT.get(), 13750746, "item.rankine.niobium_alloy_alloying", false); - defaultToolRecipes(consumer,RankineItems.ZIRCONIUM_ALLOY_INGOT.get(), 13750746, "item.rankine.zirconium_alloy_alloying", false); - - mimicToolRecipes(consumer, RankineItems.BRASS_INGOT.get(), RankineItems.BRONZE_INGOT.get(), 15510384, "item.rankine.brass_alloying", false, "rankine:brass_"); - mimicToolRecipes(consumer, RankineItems.METEORIC_IRON.get(), RankineItems.INVAR_INGOT.get(), 13028546, "item.rankine.invar_alloying", false, "rankine:meteoric_iron_"); - mimicToolRecipes(consumer, RankineItems.NITINOL_INGOT.get(), RankineItems.TITANIUM_ALLOY_INGOT.get(), 12882104, "item.rankine.nitinol_alloying", false, "rankine:nitinol_"); - mimicToolRecipes(consumer, RankineItems.OSMIRIDIUM.get(), RankineItems.OSMIRIDIUM_INGOT.get(), 13212593, "item.rankine.osmiridium_alloying", false, "rankine:native_osmiridium_"); - - - alloyGear(consumer, RankineItems.ALLOY_GEAR.get(), new AlloyIngredient(Ingredient.fromItems(RankineItems.BRONZE_INGOT.get()), "", null, null, 16777215),RankineItems.BRONZE_INGOT.get(),2236962, "item.rankine.bronze_alloying", "rankine:bronze_"); - alloyGear(consumer, RankineItems.ALLOY_GEAR.get(), new AlloyIngredient(Ingredient.fromItems(RankineItems.CUPRONICKEL_INGOT.get()), "", null, null, 16777215),RankineItems.CUPRONICKEL_INGOT.get(),11946807, "item.rankine.cupronickel_alloying", "rankine:cupronickel_"); - - alloyRod(consumer, RankineItems.ALLOY_ROD.get(), new AlloyIngredient(Ingredient.fromItems(RankineItems.CAST_IRON_INGOT.get()), "", null, null, 16777215),RankineItems.CAST_IRON_INGOT.get(),2236962, "item.rankine.cast_iron_alloying", "rankine:cast_iron_"); - alloyRod(consumer, RankineItems.ALLOY_ROD.get(), new AlloyIngredient(Ingredient.fromItems(RankineItems.CUPRONICKEL_INGOT.get()), "", null, null, 16777215),RankineItems.CUPRONICKEL_INGOT.get(),11946807, "item.rankine.cupronickel_alloying", "rankine:cupronickel_"); - alloyRod(consumer, RankineItems.ALLOY_ROD.get(), new AlloyIngredient(Ingredient.fromItems(RankineItems.STEEL_INGOT.get()), "", null, null, 16777215),RankineItems.STEEL_INGOT.get(),7634311, "item.rankine.steel_alloying", "rankine:steel_"); - alloyRod(consumer, RankineItems.ALLOY_ROD.get(), new AlloyIngredient(Ingredient.fromItems(RankineItems.FERROCERIUM_INGOT.get()), "", null, null, 16777215),RankineItems.FERROCERIUM_INGOT.get(),7433071, "item.rankine.ferrocerium_alloying", "rankine:ferrocerium_"); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.PEWTER_INGOT.get(), 11711154, "item.rankine.pewter_alloying", false); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.BRONZE_INGOT.get(), 15510384, "item.rankine.bronze_alloying", false); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.INVAR_INGOT.get(), 13028546, "item.rankine.invar_alloying", false); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.STEEL_INGOT.get(), 7634311, "item.rankine.steel_alloying", false); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.STAINLESS_STEEL_INGOT.get(), 13292499, "item.rankine.stainless_steel_alloying", true); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.NICKEL_SUPERALLOY_INGOT.get(), 12769246, "item.rankine.nickel_superalloy_alloying", true); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.COBALT_SUPERALLOY_INGOT.get(), 6534878, "item.rankine.cobalt_superalloy_alloying", true); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.TUNGSTEN_HEAVY_ALLOY_INGOT.get(), 11113071, "item.rankine.tungsten_heavy_alloy_alloying", true); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.ROSE_GOLD_INGOT.get(), 16756647, "item.rankine.rose_gold_alloying", false); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.WHITE_GOLD_INGOT.get(), 16777207, "item.rankine.white_gold_alloying", false); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.GREEN_GOLD_INGOT.get(), 15728547, "item.rankine.green_gold_alloying", false); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.BLUE_GOLD_INGOT.get(), 8695295, "item.rankine.blue_gold_alloying", false); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.PURPLE_GOLD_INGOT.get(), 11836415, "item.rankine.purple_gold_alloying", false); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.BLACK_GOLD_INGOT.get(), 3684408, "item.rankine.black_gold_alloying", false); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.AMALGAM_INGOT.get(), 13881539, "item.rankine.amalgam_alloying", false); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.ENDER_AMALGAM_INGOT.get(), 492385, "item.rankine.ender_amalgam_alloying", true); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.OSMIRIDIUM_INGOT.get(), 13212593, "item.rankine.osmiridium_alloying", false); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.TITANIUM_ALLOY_INGOT.get(), 13750746, "item.rankine.titanium_alloy_alloying", false); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.NIOBIUM_ALLOY_INGOT.get(), 13750746, "item.rankine.niobium_alloy_alloying", false); + defaultToolRecipes(consumer, (AlloyItem) RankineItems.ZIRCONIUM_ALLOY_INGOT.get(), 13750746, "item.rankine.zirconium_alloy_alloying", false); + + mimicToolRecipes(consumer, (AlloyItem) RankineItems.BRASS_INGOT.get(), RankineItems.BRONZE_INGOT.get(), 15510384, "item.rankine.brass_alloying", false, "rankine:brass_"); + mimicToolRecipes(consumer, (AlloyItem) RankineItems.METEORIC_IRON.get(), RankineItems.INVAR_INGOT.get(), 13028546, "item.rankine.invar_alloying", false, "rankine:meteoric_iron_"); + mimicToolRecipes(consumer, (AlloyItem) RankineItems.NITINOL_INGOT.get(), RankineItems.TITANIUM_ALLOY_INGOT.get(), 12882104, "item.rankine.nitinol_alloying", false, "rankine:nitinol_"); + mimicToolRecipes(consumer, (AlloyItem) RankineItems.OSMIRIDIUM.get(), RankineItems.OSMIRIDIUM_INGOT.get(), 13212593, "item.rankine.osmiridium_alloying", false, "rankine:native_osmiridium_"); + + + alloyGear(consumer, RankineItems.ALLOY_GEAR.get(), new AlloyIngredient(Ingredient.fromItems(RankineItems.BRONZE_INGOT.get()), "", null, null, 16777215),RankineItems.BRONZE_INGOT.get(),2236962, "item.rankine.bronze_alloying", "rankine:bronze_",null); + alloyGear(consumer, RankineItems.ALLOY_GEAR.get(), new AlloyIngredient(Ingredient.fromItems(RankineItems.CUPRONICKEL_INGOT.get()), "", null, null, 16777215),RankineItems.CUPRONICKEL_INGOT.get(),11946807, "item.rankine.cupronickel_alloying", "rankine:cupronickel_",null); + + alloyRod(consumer, RankineItems.ALLOY_ROD.get(), new AlloyIngredient(Ingredient.fromItems(RankineItems.CAST_IRON_INGOT.get()), "", null, null, 16777215),RankineItems.CAST_IRON_INGOT.get(),2236962, "item.rankine.cast_iron_alloying", "rankine:cast_iron_",null); + alloyRod(consumer, RankineItems.ALLOY_ROD.get(), new AlloyIngredient(Ingredient.fromItems(RankineItems.CUPRONICKEL_INGOT.get()), "", null, null, 16777215),RankineItems.CUPRONICKEL_INGOT.get(),11946807, "item.rankine.cupronickel_alloying", "rankine:cupronickel_",null); + alloyRod(consumer, RankineItems.ALLOY_ROD.get(), new AlloyIngredient(Ingredient.fromItems(RankineItems.STEEL_INGOT.get()), "", null, null, 16777215),RankineItems.STEEL_INGOT.get(),7634311, "item.rankine.steel_alloying", "rankine:steel_",null); + alloyRod(consumer, RankineItems.ALLOY_ROD.get(), new AlloyIngredient(Ingredient.fromItems(RankineItems.FERROCERIUM_INGOT.get()), "", null, null, 16777215),RankineItems.FERROCERIUM_INGOT.get(),7433071, "item.rankine.ferrocerium_alloying", "rankine:ferrocerium_",null); } private void slab(Consumer consumer, Item output, Item input) { @@ -1250,7 +1252,7 @@ private void threeXthree(Consumer consumer, Item output, Item i } private void threeXthreeAlloy(Consumer consumer, Item output, Item input, int count, String triggerName, Item trigger, String name,int color,@Nullable String langName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, count,true,langName == null ? "" : langName, color) + AlloyCraftingRecipeBuilder.shapedRecipe(output, count,true,"",langName == null ? "" : langName, color) .patternLine("###") .patternLine("###") .patternLine("###") @@ -1260,7 +1262,7 @@ private void threeXthreeAlloy(Consumer consumer, Item output, I .build(consumer, new ResourceLocation("rankine",name)); } private void threeXthreeAlloy(Consumer consumer, Item output, Item input, int count, String triggerName, Item trigger,int color,@Nullable String langName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, count,true,langName == null ? "" : langName, color) + AlloyCraftingRecipeBuilder.shapedRecipe(output, count,true,"",langName == null ? "" : langName, color) .patternLine("###") .patternLine("###") .patternLine("###") @@ -1273,20 +1275,20 @@ private void threeXthreeAlloy(Consumer consumer, Item output, I private void alloyArmorRecipes(Consumer consumer, Item ingot, int alloyColor, ResourceLocation alloyRecipe, String alloyLang, String recipeName) { alloyHelmet(consumer, RankineItems.ALLOY_HELMET.get(), new AlloyIngredient(Ingredient.fromItems(ingot), "", alloyRecipe, alloyLang, alloyColor), - ingot, alloyColor, alloyLang, recipeName+"helmet"); + ingot, alloyColor, alloyLang, recipeName+"helmet",null); alloyChestplate(consumer, RankineItems.ALLOY_CHESTPLATE.get(), new AlloyIngredient(Ingredient.fromItems(ingot), "", alloyRecipe, alloyLang, alloyColor), - ingot, alloyColor, alloyLang, recipeName+"chestplate"); + ingot, alloyColor, alloyLang, recipeName+"chestplate",null); alloyLeggings(consumer, RankineItems.ALLOY_LEGGINGS.get(), new AlloyIngredient(Ingredient.fromItems(ingot), "", alloyRecipe, alloyLang, alloyColor), - ingot, alloyColor, alloyLang, recipeName+"leggings"); + ingot, alloyColor, alloyLang, recipeName+"leggings",null); alloyBoots(consumer, RankineItems.ALLOY_BOOTS.get(), new AlloyIngredient(Ingredient.fromItems(ingot), "", alloyRecipe, alloyLang, alloyColor), - ingot, alloyColor, alloyLang, recipeName+"boots"); + ingot, alloyColor, alloyLang, recipeName+"boots",null); } //private void defaultToolRecipes(Consumer consumer, Item ingot, int alloyColor, ResourceLocation alloyRecipe, String alloyLang) { - private void defaultToolRecipes(Consumer consumer, Item ingot, int alloyColor, String alloyLang, boolean steelRod) { + private void defaultToolRecipes(Consumer consumer, AlloyItem ingot, int alloyColor, String alloyLang, boolean steelRod) { String rs = ingot.getRegistryName().toString(); AlloyIngredient alloyIngot = new AlloyIngredient(Ingredient.fromItems(ingot), "", null, null, 16777215); AlloyIngredient rod = new AlloyIngredient(Ingredient.fromTag(Tags.Items.RODS_WOODEN), null, null, null, 16777215); @@ -1295,21 +1297,20 @@ private void defaultToolRecipes(Consumer consumer, Item ingot, } String recipeNamePart = "rankine:"+alloyLang.replace("item.rankine.","").replace("alloying",""); alloyArmorRecipes(consumer, ingot, alloyColor, null, alloyLang, recipeNamePart); - - alloyCrowbar(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","crowbar"))), alloyIngot, ingot, 16777215, null, recipeNamePart); - alloyHammer(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","hammer"))), alloyIngot, rod, ingot, 16777215, null, recipeNamePart); - alloyBlunderbuss(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","blunderbuss"))), alloyIngot, ingot, 16777215, null, recipeNamePart); - alloyPickaxe(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","pickaxe"))), alloyIngot, rod, ingot, 16777215, null, recipeNamePart); - alloyAxe(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","axe"))), alloyIngot, rod, ingot, 16777215, null, recipeNamePart); - alloyHoe(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","hoe"))), alloyIngot, rod, ingot, 16777215, null, recipeNamePart); - alloyShovel(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","shovel"))), alloyIngot, rod, ingot, 16777215, null, recipeNamePart); - alloySpear(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","spear"))), alloyIngot, rod, ingot, 16777215, null, recipeNamePart); - alloySword(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","sword"))), alloyIngot, rod, ingot, 16777215, null, recipeNamePart); - alloyKnife(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","knife"))), alloyIngot, rod, ingot, 16777215, null, recipeNamePart); - alloySurfRod(consumer, RankineItems.ALLOY_SURF_ROD.get(), alloyIngot, ingot, alloyColor, alloyLang, recipeNamePart); + alloyCrowbar(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","crowbar"))), alloyIngot, ingot, 16777215, null, null,null); + alloyHammer(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","hammer"))), alloyIngot, rod, ingot, 16777215, null, null,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloyBlunderbuss(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","blunderbuss"))), alloyIngot, ingot, 16777215, null, null,null); + alloyPickaxe(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","pickaxe"))), alloyIngot, rod, ingot, 16777215, null, null,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloyAxe(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","axe"))), alloyIngot, rod, ingot, 16777215, null, null,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloyHoe(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","hoe"))), alloyIngot, rod, ingot, 16777215, null, null,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloyShovel(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","shovel"))), alloyIngot, rod, ingot, 16777215, null, null,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloySpear(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","spear"))), alloyIngot, rod, ingot, 16777215, null, null,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloySword(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","sword"))), alloyIngot, rod, ingot, 16777215, null, null,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloyKnife(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","knife"))), alloyIngot, rod, ingot, 16777215, null, null,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloySurfRod(consumer, RankineItems.ALLOY_SURF_ROD.get(), alloyIngot, ingot, alloyColor, alloyLang, recipeNamePart,null); } - private void mimicToolRecipes(Consumer consumer, Item ingot, Item mimic, int alloyColor, String alloyLang, boolean steelRod, String recipeName) { + private void mimicToolRecipes(Consumer consumer, AlloyItem ingot, Item mimic, int alloyColor, String alloyLang, boolean steelRod, String recipeName) { String rs = mimic.getRegistryName().toString(); AlloyIngredient alloyIngot = new AlloyIngredient(Ingredient.fromItems(ingot), "", null, null, 16777215); AlloyIngredient rod = new AlloyIngredient(Ingredient.fromTag(Tags.Items.RODS_WOODEN), null, null, null, 16777215); @@ -1317,21 +1318,21 @@ private void mimicToolRecipes(Consumer consumer, Item ingot, It rod = new AlloyIngredient(Ingredient.fromItems(RankineItems.ALLOY_ROD.get()), null, ResourceLocation.tryCreate("rankine:alloying/steel_alloying"), "item.rankine.steel_alloying", 3291714); } alloyArmorRecipes(consumer, ingot, alloyColor, null, alloyLang, recipeName); - alloyCrowbar(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","crowbar"))), alloyIngot, ingot, 16777215, null, recipeName); - alloyHammer(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","hammer"))), alloyIngot, rod, ingot, 16777215, null, recipeName); - alloyBlunderbuss(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","blunderbuss"))), alloyIngot, ingot, 16777215, null, recipeName); - alloyPickaxe(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","pickaxe"))), alloyIngot, rod, ingot, 16777215, null, recipeName); - alloyAxe(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","axe"))), alloyIngot, rod, ingot, 16777215, null, recipeName); - alloyHoe(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","hoe"))), alloyIngot, rod, ingot, 16777215, null, recipeName); - alloyShovel(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","shovel"))), alloyIngot, rod, ingot, 16777215, null, recipeName); - alloySpear(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","spear"))), alloyIngot, rod, ingot, 16777215, null, recipeName); - alloySword(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","sword"))), alloyIngot, rod, ingot, 16777215, null, recipeName); - alloyKnife(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","knife"))), alloyIngot, rod, ingot, 16777215, null, recipeName); - alloySurfRod(consumer, RankineItems.ALLOY_SURF_ROD.get(), alloyIngot, ingot, alloyColor, alloyLang, recipeName); + alloyCrowbar(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","crowbar"))), alloyIngot, ingot, 16777215, null, recipeName,null); + alloyHammer(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","hammer"))), alloyIngot, rod, ingot, 16777215, null, recipeName,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloyBlunderbuss(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","blunderbuss"))), alloyIngot, ingot, 16777215, null, recipeName,null); + alloyPickaxe(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","pickaxe"))), alloyIngot, rod, ingot, 16777215, null, recipeName,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloyAxe(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","axe"))), alloyIngot, rod, ingot, 16777215, null, recipeName,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloyHoe(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","hoe"))), alloyIngot, rod, ingot, 16777215, null, recipeName,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloyShovel(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","shovel"))), alloyIngot, rod, ingot, 16777215, null, recipeName,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloySpear(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","spear"))), alloyIngot, rod, ingot, 16777215, null, recipeName,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloySword(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","sword"))), alloyIngot, rod, ingot, 16777215, null, recipeName,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloyKnife(consumer, ForgeRegistries.ITEMS.getValue(ResourceLocation.tryCreate(rs.replace("ingot","knife"))), alloyIngot, rod, ingot, 16777215, null, recipeName,steelRod ? ingot.getDefaultRecipe().toString() : null); + alloySurfRod(consumer, RankineItems.ALLOY_SURF_ROD.get(), alloyIngot, ingot, alloyColor, alloyLang, recipeName,null); } - private void alloyRod(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color, @Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 4,true,langName == null ? "" : langName, color) + private void alloyRod(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color, @Nullable String langName, String recipeName, String inheritRecipe) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 4,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) .patternLine(" #") .patternLine(" # ") .patternLine("# ") @@ -1341,8 +1342,8 @@ private void alloyRod(Consumer consumer, Item output, AlloyIngr .build(consumer,recipeName+"_rod"); } - private void alloyGear(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color, @Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) + private void alloyGear(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color, @Nullable String langName, String recipeName, String inheritRecipe) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) .patternLine(" # ") .patternLine("#R#") .patternLine(" # ") @@ -1353,8 +1354,8 @@ private void alloyGear(Consumer consumer, Item output, AlloyIng .build(consumer,recipeName+"_gear"); } - private void alloyHelmet(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color,@Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) + private void alloyHelmet(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color,@Nullable String langName, String recipeName, String inheritRecipe) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) .patternLine("###") .patternLine("# #") .patternLine(" ") @@ -1364,8 +1365,8 @@ private void alloyHelmet(Consumer consumer, Item output, AlloyI .build(consumer,recipeName); } - private void alloyChestplate(Consumer consumer, Item output, AlloyIngredient input, Item trigger,int color, @Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) + private void alloyChestplate(Consumer consumer, Item output, AlloyIngredient input, Item trigger,int color, @Nullable String langName, String recipeName, String inheritRecipe) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) .patternLine("# #") .patternLine("###") .patternLine("###") @@ -1375,8 +1376,8 @@ private void alloyChestplate(Consumer consumer, Item output, Al .build(consumer,recipeName); } - private void alloyLeggings(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color,@Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) + private void alloyLeggings(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color,@Nullable String langName, String recipeName, String inheritRecipe) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) .patternLine("###") .patternLine("# #") .patternLine("# #") @@ -1386,8 +1387,8 @@ private void alloyLeggings(Consumer consumer, Item output, Allo .build(consumer,recipeName); } - private void alloyBoots(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color, @Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) + private void alloyBoots(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color, @Nullable String langName, String recipeName, String inheritRecipe) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) .patternLine(" ") .patternLine("# #") .patternLine("# #") @@ -1397,137 +1398,278 @@ private void alloyBoots(Consumer consumer, Item output, AlloyIn .build(consumer,recipeName); } - private void alloyCrowbar(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color, @Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) - .patternLine(" ##") - .patternLine(" # ") - .patternLine("## ") - .directAlloyKey('#', input) - .setGroup("rankine:alloy_crowbars") - .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) - .build(consumer,recipeName+"_crowbar"); + private void alloyCrowbar(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color, @Nullable String langName, String recipeName, String inheritRecipe) { + if (recipeName == null) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine(" ##") + .patternLine(" # ") + .patternLine("## ") + .directAlloyKey('#', input) + .setGroup("rankine:alloy_crowbars") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer); + } else { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine(" ##") + .patternLine(" # ") + .patternLine("## ") + .directAlloyKey('#', input) + .setGroup("rankine:alloy_crowbars") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer,recipeName+"crowbar"); + } + } - private void alloySurfRod(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color, @Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) - .patternLine(" #") - .patternLine(" #s") - .patternLine("# s") - .directAlloyKey('#', input) - .key('s', Tags.Items.STRING) - .setGroup("rankine:alloy_surf_rods") - .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) - .build(consumer,recipeName+"_surf_rod"); + private void alloySurfRod(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color, @Nullable String langName, String recipeName, String inheritRecipe) { + if (recipeName == null) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine(" #") + .patternLine(" #s") + .patternLine("# s") + .directAlloyKey('#', input) + .key('s', Tags.Items.STRING) + .setGroup("rankine:alloy_surf_rods") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer); + } else { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine(" #") + .patternLine(" #s") + .patternLine("# s") + .directAlloyKey('#', input) + .key('s', Tags.Items.STRING) + .setGroup("rankine:alloy_surf_rods") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer,recipeName+"surf_rod"); + } + } - private void alloyBlunderbuss(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color, @Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) - .patternLine("##f") - .patternLine("ss#") - .patternLine(" s") - .directAlloyKey('#', input) - .key('s', RankineTags.Items.FIREPROOF_LOGS) - .key('f', Items.FLINT_AND_STEEL) - .setGroup("rankine:alloy_blunderbuss") - .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) - .build(consumer,recipeName+"_blunderbuss"); + private void alloyBlunderbuss(Consumer consumer, Item output, AlloyIngredient input, Item trigger, int color, @Nullable String langName, String recipeName, String inheritRecipe) { + if (recipeName == null) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine("##f") + .patternLine("ss#") + .patternLine(" s") + .directAlloyKey('#', input) + .key('s', RankineTags.Items.FIREPROOF_LOGS) + .key('f', Items.FLINT_AND_STEEL) + .setGroup("rankine:alloy_blunderbuss") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer); + } else { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine("##f") + .patternLine("ss#") + .patternLine(" s") + .directAlloyKey('#', input) + .key('s', RankineTags.Items.FIREPROOF_LOGS) + .key('f', Items.FLINT_AND_STEEL) + .setGroup("rankine:alloy_blunderbuss") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer,recipeName+"blunderbuss"); + } + } - private void alloyPickaxe(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) - .patternLine("###") - .patternLine(" s ") - .patternLine(" s ") - .directAlloyKey('#', input) - .directAlloyKey('s', rod) - .setGroup("rankine:alloy_pickaxes") - .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) - .build(consumer,recipeName+"_pickaxe"); + private void alloyPickaxe(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName, String inheritRecipe) { + if (recipeName == null) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine("###") + .patternLine(" s ") + .patternLine(" s ") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_pickaxes") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer); + } else { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine("###") + .patternLine(" s ") + .patternLine(" s ") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_pickaxes") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer,recipeName+"pickaxe"); + } + } - private void alloyHoe(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) - .patternLine("##") - .patternLine(" s") - .patternLine(" s") - .directAlloyKey('#', input) - .directAlloyKey('s', rod) - .setGroup("rankine:alloy_hoes") - .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) - .build(consumer,recipeName+"_hoe"); + private void alloyHoe(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName, String inheritRecipe) { + if (recipeName == null) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine("##") + .patternLine(" s") + .patternLine(" s") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_hoes") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer); + } else { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine("##") + .patternLine(" s") + .patternLine(" s") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_hoes") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer,recipeName+"hoe"); + } + } - private void alloyAxe(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) - .patternLine("##") - .patternLine("#s") - .patternLine(" s") - .directAlloyKey('#', input) - .directAlloyKey('s', rod) - .setGroup("rankine:alloy_axes") - .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) - .build(consumer,recipeName+"_axe"); + private void alloyAxe(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName, String inheritRecipe) { + if (recipeName == null) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine("##") + .patternLine("#s") + .patternLine(" s") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_axes") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer); + } else { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine("##") + .patternLine("#s") + .patternLine(" s") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_axes") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer,recipeName+"axe"); + } + } - private void alloyShovel(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) - .patternLine("#") - .patternLine("s") - .patternLine("s") - .directAlloyKey('#', input) - .directAlloyKey('s', rod) - .setGroup("rankine:alloy_shovels") - .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) - .build(consumer,recipeName+"_shovel"); + private void alloyShovel(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName, String inheritRecipe) { + if (recipeName == null) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine("#") + .patternLine("s") + .patternLine("s") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_shovels") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer); + } else { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine("#") + .patternLine("s") + .patternLine("s") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_shovels") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer,recipeName+"shovel"); + } + } - private void alloySword(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) - .patternLine("#") - .patternLine("#") - .patternLine("s") - .directAlloyKey('#', input) - .directAlloyKey('s', rod) - .setGroup("rankine:alloy_swords") - .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) - .build(consumer,recipeName+"_sword"); + private void alloySword(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName, String inheritRecipe) { + if (recipeName == null) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine("#") + .patternLine("#") + .patternLine("s") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_swords") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer); + } else { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine("#") + .patternLine("#") + .patternLine("s") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_swords") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer,recipeName+"sword"); + } + } - private void alloyHammer(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) - .patternLine("###") - .patternLine("#s#") - .patternLine(" s ") - .directAlloyKey('#', input) - .directAlloyKey('s', rod) - .setGroup("rankine:alloy_hammers") - .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) - .build(consumer,recipeName+"_hammer"); + private void alloyHammer(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName, String inheritRecipe) { + if (recipeName == null) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true, inheritRecipe == null ? "" : inheritRecipe, langName == null ? "" : langName, color) + .patternLine("###") + .patternLine("#s#") + .patternLine(" s ") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_hammers") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer); + } else { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true, inheritRecipe == null ? "" : inheritRecipe, langName == null ? "" : langName, color) + .patternLine("###") + .patternLine("#s#") + .patternLine(" s ") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_hammers") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer,recipeName+"hammer"); + } + } - private void alloyKnife(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) - .patternLine(" #") - .patternLine("s ") - .directAlloyKey('#', input) - .directAlloyKey('s', rod) - .setGroup("rankine:alloy_knives") - .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) - .build(consumer,recipeName+"_knife"); + private void alloyKnife(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName, String inheritRecipe) { + if (recipeName == null) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine(" #") + .patternLine("s ") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_knives") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer); + } else { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine(" #") + .patternLine("s ") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_knives") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer,recipeName+"knife"); + } + } - private void alloySpear(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName) { - AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,langName == null ? "" : langName, color) - .patternLine(" ##") - .patternLine(" s#") - .patternLine("s ") - .directAlloyKey('#', input) - .directAlloyKey('s', rod) - .setGroup("rankine:alloy_spears") - .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) - .build(consumer,recipeName+"_spear"); + private void alloySpear(Consumer consumer, Item output, AlloyIngredient input, AlloyIngredient rod, Item trigger, int color, @Nullable String langName, String recipeName, String inheritRecipe) { + if (recipeName == null) { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine(" ##") + .patternLine(" s#") + .patternLine("s ") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_spears") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer); + } else { + AlloyCraftingRecipeBuilder.shapedRecipe(output, 1,true,inheritRecipe == null ? "" : inheritRecipe,langName == null ? "" : langName, color) + .patternLine(" ##") + .patternLine(" s#") + .patternLine("s ") + .directAlloyKey('#', input) + .directAlloyKey('s', rod) + .setGroup("rankine:alloy_spears") + .addCriterion("has_alloy", InventoryChangeTrigger.Instance.forItems(trigger)) + .build(consumer,recipeName+"spear"); + } } private void twoXtwo(Consumer consumer, Item output, Item input, int count, String triggerName, Item trigger, String name) { diff --git a/src/main/java/com/cannolicatfish/rankine/data/builders/AlloyCraftingRecipeBuilder.java b/src/main/java/com/cannolicatfish/rankine/data/builders/AlloyCraftingRecipeBuilder.java index 66c646e0ff..48c3c2e319 100644 --- a/src/main/java/com/cannolicatfish/rankine/data/builders/AlloyCraftingRecipeBuilder.java +++ b/src/main/java/com/cannolicatfish/rankine/data/builders/AlloyCraftingRecipeBuilder.java @@ -36,6 +36,7 @@ public class AlloyCraftingRecipeBuilder { private final Item result; private final int count; private final boolean inherit; + private final String inheritRecipe; private final List pattern = Lists.newArrayList(); private final Map key = Maps.newLinkedHashMap(); private final Advancement.Builder advancementBuilder = Advancement.Builder.builder(); @@ -43,10 +44,11 @@ public class AlloyCraftingRecipeBuilder { private final String langName; private final int color; - public AlloyCraftingRecipeBuilder(IItemProvider resultIn, int countIn, boolean inheritIn, String langNameIn, int colorIn) { + public AlloyCraftingRecipeBuilder(IItemProvider resultIn, int countIn, boolean inheritIn, String inheritRecipeIn, String langNameIn, int colorIn) { this.result = resultIn.asItem(); this.count = countIn; this.inherit = inheritIn; + this.inheritRecipe = inheritRecipeIn; this.langName = langNameIn; this.color = colorIn; } @@ -62,19 +64,23 @@ public static AlloyCraftingRecipeBuilder shapedRecipe(IItemProvider resultIn) { * Creates a new builder for a shaped recipe. */ public static AlloyCraftingRecipeBuilder shapedRecipe(IItemProvider resultIn, int countIn) { - return shapedRecipe(resultIn, countIn, false, "", 16777215); + return shapedRecipe(resultIn, countIn, false, "","", 16777215); } public static AlloyCraftingRecipeBuilder shapedRecipe(IItemProvider resultIn, int countIn, boolean inheritIn) { - return new AlloyCraftingRecipeBuilder(resultIn, countIn, inheritIn, "", 16777215); + return new AlloyCraftingRecipeBuilder(resultIn, countIn, inheritIn, "","", 16777215); } - public static AlloyCraftingRecipeBuilder shapedRecipe(IItemProvider resultIn, int countIn, boolean inheritIn, String langNameIn) { - return new AlloyCraftingRecipeBuilder(resultIn, countIn, inheritIn, langNameIn, 16777215); + public static AlloyCraftingRecipeBuilder shapedRecipe(IItemProvider resultIn, int countIn, boolean inheritIn, String inheritRecipe) { + return new AlloyCraftingRecipeBuilder(resultIn, countIn, inheritIn, inheritRecipe, "", 16777215); } - public static AlloyCraftingRecipeBuilder shapedRecipe(IItemProvider resultIn, int countIn, boolean inheritIn, String langNameIn, int color) { - return new AlloyCraftingRecipeBuilder(resultIn, countIn, inheritIn, langNameIn, color); + public static AlloyCraftingRecipeBuilder shapedRecipe(IItemProvider resultIn, int countIn, boolean inheritIn, String inheritRecipe, String langNameIn) { + return new AlloyCraftingRecipeBuilder(resultIn, countIn, inheritIn, inheritRecipe, langNameIn, 16777215); + } + + public static AlloyCraftingRecipeBuilder shapedRecipe(IItemProvider resultIn, int countIn, boolean inheritIn, String inheritRecipe, String langNameIn, int color) { + return new AlloyCraftingRecipeBuilder(resultIn, countIn, inheritIn, inheritRecipe, langNameIn, color); } /** @@ -181,7 +187,7 @@ public void build(Consumer consumerIn, String save) { public void build(Consumer consumerIn, ResourceLocation id) { this.validate(id); this.advancementBuilder.withParentId(new ResourceLocation("recipes/root")).withCriterion("has_the_recipe", RecipeUnlockedTrigger.create(id)).withRewards(AdvancementRewards.Builder.recipe(id)).withRequirementsStrategy(IRequirementsStrategy.OR); - consumerIn.accept(new AlloyCraftingRecipeBuilder.Result(id, this.result, this.count, this.inherit,this.group == null ? "" : this.group, this.pattern, this.key, this.advancementBuilder, new ResourceLocation(id.getNamespace(), "recipes/" + this.result.getGroup().getPath() + "/" + id.getPath()),this.langName,this.color)); + consumerIn.accept(new AlloyCraftingRecipeBuilder.Result(id, this.result, this.count, this.inherit,this.inheritRecipe,this.group == null ? "" : this.group, this.pattern, this.key, this.advancementBuilder, new ResourceLocation(id.getNamespace(), "recipes/" + this.result.getGroup().getPath() + "/" + id.getPath()),this.langName,this.color)); } /** @@ -218,6 +224,7 @@ public class Result implements IFinishedRecipe { private final Item result; private final int count; private final boolean inherit; + private final String inheritRecipe; private final String group; private final List pattern; private final String langName; @@ -226,11 +233,12 @@ public class Result implements IFinishedRecipe { private final Advancement.Builder advancementBuilder; private final ResourceLocation advancementId; - public Result(ResourceLocation idIn, Item resultIn, int countIn, boolean inheritIn, String groupIn, List patternIn, Map keyIn, Advancement.Builder advancementBuilderIn, ResourceLocation advancementIdIn, String langNameIn, int colorIn) { + public Result(ResourceLocation idIn, Item resultIn, int countIn, boolean inheritIn, String inheritRecipeIn, String groupIn, List patternIn, Map keyIn, Advancement.Builder advancementBuilderIn, ResourceLocation advancementIdIn, String langNameIn, int colorIn) { this.id = idIn; this.result = resultIn; this.count = countIn; this.inherit = inheritIn; + this.inheritRecipe = inheritRecipeIn; this.group = groupIn; this.pattern = patternIn; this.key = keyIn; @@ -252,6 +260,10 @@ public void serialize(JsonObject json) { if(!this.langName.isEmpty()) { json.addProperty("langName", this.langName); } + + if(!this.inheritRecipe.isEmpty()) { + json.addProperty("inheritRecipe", this.inheritRecipe); + } JsonArray jsonarray = new JsonArray(); for(String s : this.pattern) { diff --git a/src/main/java/com/cannolicatfish/rankine/events/RankineEventHandler.java b/src/main/java/com/cannolicatfish/rankine/events/RankineEventHandler.java index b528d8a15e..c1b0041981 100644 --- a/src/main/java/com/cannolicatfish/rankine/events/RankineEventHandler.java +++ b/src/main/java/com/cannolicatfish/rankine/events/RankineEventHandler.java @@ -1293,6 +1293,10 @@ public static void onDamageEntity(LivingDamageEvent event) { } } + if ((player.getHeldItemMainhand().getItem().equals(RankineItems.TOTEM_OF_BLAZING.get()) || player.getHeldItemOffhand().getItem().equals(RankineItems.TOTEM_OF_BLAZING.get())) && !player.world.isRemote) { + float damage = event.getAmount() + event.getAmount() * 0.5f; + event.setAmount(damage); + } if (EnchantmentHelper.getEnchantmentLevel(RankineEnchantments.ENDOTOXIN,player.getHeldItem(Hand.MAIN_HAND)) >= 1 && !player.world.isRemote) { LivingEntity receiver = event.getEntityLiving(); if ((receiver instanceof EndermanEntity || receiver instanceof ShulkerEntity || receiver instanceof EndermiteEntity || receiver.getEntityWorld().getDimensionKey().equals(World.THE_END))) { diff --git a/src/main/java/com/cannolicatfish/rankine/init/RankineItems.java b/src/main/java/com/cannolicatfish/rankine/init/RankineItems.java index 7a71185b33..a485bc1309 100644 --- a/src/main/java/com/cannolicatfish/rankine/init/RankineItems.java +++ b/src/main/java/com/cannolicatfish/rankine/init/RankineItems.java @@ -3231,7 +3231,7 @@ public class RankineItems { public static final RegistryObject ICE_SKATES = REGISTRY.register("ice_skates", () -> new ArmorItem(ArmorMaterial.LEATHER, EquipmentSlotType.FEET, new Item.Properties().maxStackSize(1).group(ProjectRankine.setup.rankineTools))); public static final RegistryObject FINS = REGISTRY.register("fins", () -> new ArmorItem(RankineArmorMaterials.RUBBER, EquipmentSlotType.FEET, new Item.Properties().maxStackSize(1).group(ProjectRankine.setup.rankineTools))); - public static final RegistryObject TOTEM_OF_BLAZING = REGISTRY.register("totem_of_blazing", () -> new BlazingTotemItem(new Item.Properties().maxStackSize(1).rarity(Rarity.UNCOMMON).maxDamage(512))); + public static final RegistryObject TOTEM_OF_BLAZING = REGISTRY.register("totem_of_blazing", () -> new BlazingTotemItem(new Item.Properties().maxStackSize(1).rarity(Rarity.UNCOMMON).maxDamage(512).group(ProjectRankine.setup.rankineTools))); public static final RegistryObject TOTEM_OF_COBBLING = REGISTRY.register("totem_of_cobbling", () -> new CobblingTotemItem(new Item.Properties().maxStackSize(1).rarity(Rarity.UNCOMMON).maxDamage(512).group(ProjectRankine.setup.rankineTools))); public static final RegistryObject TOTEM_OF_ENDURING = REGISTRY.register("totem_of_enduring", () -> new EnduringTotemItem(new Item.Properties().maxStackSize(1).rarity(Rarity.UNCOMMON).group(ProjectRankine.setup.rankineTools))); public static final RegistryObject TOTEM_OF_HASTENING = REGISTRY.register("totem_of_hastening", () -> new HasteTotemItem(new Item.Properties().maxStackSize(1).rarity(Rarity.UNCOMMON).group(ProjectRankine.setup.rankineTools))); diff --git a/src/main/java/com/cannolicatfish/rankine/items/totems/BlazingTotemItem.java b/src/main/java/com/cannolicatfish/rankine/items/totems/BlazingTotemItem.java index 7945407eef..60fc21f6f3 100644 --- a/src/main/java/com/cannolicatfish/rankine/items/totems/BlazingTotemItem.java +++ b/src/main/java/com/cannolicatfish/rankine/items/totems/BlazingTotemItem.java @@ -1,20 +1,29 @@ package com.cannolicatfish.rankine.items.totems; import com.cannolicatfish.rankine.ProjectRankine; +import com.cannolicatfish.rankine.compatibility.AlexMobs; import com.cannolicatfish.rankine.init.Config; +import net.minecraft.block.AbstractFireBlock; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.enchantment.Enchantments; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; +import net.minecraft.potion.Effect; +import net.minecraft.potion.EffectInstance; +import net.minecraft.potion.Effects; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.registries.ForgeRegistries; import javax.annotation.Nullable; import java.util.List; @@ -53,4 +62,30 @@ public void fillItemGroup(ItemGroup group, NonNullList items) { public boolean hasEffect(ItemStack stack) { return false; } + + @Override + public void inventoryTick(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { + if (entityIn instanceof LivingEntity) { + LivingEntity living = ((LivingEntity) entityIn); + if (living.getFireTimer() > 0 && (living.getHeldItemMainhand().equals(stack) || living.getHeldItemOffhand().equals(stack))) { + worldIn.setBlockState(living.getPosition(), AbstractFireBlock.getFireForPlacement(worldIn, living.getPosition())); + if ((living.isInLava() && living.getActivePotionEffect(Effects.FIRE_RESISTANCE) == null) || living.getHealth() < living.getMaxHealth() * .25f) { + EffectInstance lavaSave = new EffectInstance(Effects.FIRE_RESISTANCE,500); + EffectInstance regen = new EffectInstance(Effects.REGENERATION,100,3); + if (AlexMobs.isInstalled()){ + Effect lavaVision = ForgeRegistries.POTIONS.getValue(new ResourceLocation("alexsmobs:lava_vision")); + if (lavaVision != null) { + EffectInstance lavaVisionEffect = new EffectInstance(lavaVision,500); + living.addPotionEffect(lavaVisionEffect); + } + } + living.addPotionEffect(lavaSave); + living.addPotionEffect(regen); + stack.shrink(1); + } + } + + } + super.inventoryTick(stack, worldIn, entityIn, itemSlot, isSelected); + } } diff --git a/src/main/java/com/cannolicatfish/rankine/world/gen/feature/WorldReplacerFeature.java b/src/main/java/com/cannolicatfish/rankine/world/gen/feature/WorldReplacerFeature.java index c14cdbd586..820d65571a 100644 --- a/src/main/java/com/cannolicatfish/rankine/world/gen/feature/WorldReplacerFeature.java +++ b/src/main/java/com/cannolicatfish/rankine/world/gen/feature/WorldReplacerFeature.java @@ -61,13 +61,14 @@ public boolean generate(ISeedReader reader, ChunkGenerator generator, Random ran BlockPos TARGET_POS = new BlockPos(x,y,z); BlockState TARGET_BS = reader.getBlockState(TARGET_POS); Block TARGET_BLOCK = TARGET_BS.getBlock(); - if (Config.MISC_WORLDGEN.REPLACE_VANILLA_ORES.get() && vanillaOre(TARGET_BLOCK) != Blocks.AIR.getDefaultState()) { - reader.setBlockState(TARGET_POS, vanillaOre(TARGET_BLOCK).with(RankineOreBlock.TYPE, WorldgenUtils.ORE_STONES.indexOf(StoneBS.getBlock())), 3); + int TARGET_INDEX = WorldgenUtils.ORE_STONES.indexOf(StoneBS.getBlock()); + reader.setBlockState(TARGET_POS, vanillaOre(TARGET_BLOCK).with(RankineOreBlock.TYPE, TARGET_INDEX == -1 ? 0 : TARGET_INDEX), 3); continue; } else if (TARGET_BLOCK instanceof RankineOreBlock && WorldgenUtils.ORE_STONES.contains(StoneBS.getBlock())) { if (TARGET_BS.get(RankineOreBlock.TYPE) != 67 && TARGET_BS.get(RankineOreBlock.TYPE) != 68 && TARGET_BS.get(RankineOreBlock.TYPE) != 69) { - reader.setBlockState(TARGET_POS, TARGET_BLOCK.getDefaultState().with(RankineOreBlock.TYPE, WorldgenUtils.ORE_STONES.indexOf(StoneBS.getBlock())), 3); + int TARGET_INDEX = WorldgenUtils.ORE_STONES.indexOf(StoneBS.getBlock()); + reader.setBlockState(TARGET_POS, TARGET_BLOCK.getDefaultState().with(RankineOreBlock.TYPE, TARGET_INDEX == -1 ? 0 : TARGET_INDEX), 3); } continue; } diff --git a/src/main/resources/data/rankine/recipes/elements/neptunium.json b/src/main/resources/data/rankine/recipes/elements/neptunium.json index 9964b7b32e..506c190fcc 100644 --- a/src/main/resources/data/rankine/recipes/elements/neptunium.json +++ b/src/main/resources/data/rankine/recipes/elements/neptunium.json @@ -1,10 +1,77 @@ { - "type": "rankine:element", - "name": "neptunium", - "symbol": "Np", - "color": 16777215, - "atomic": 93, - "potential": 0, - "items": ["T#forge:nuggets/neptunium","T#forge:ingots/neptunium","T#forge:storage_blocks/neptunium"], - "values": [1,9,81] - } \ No newline at end of file + "type": "rankine:element", + "name": "neptunium", + "symbol": "Np", + "color": 16777215, + "atomic": 93, + "potential": 0, + "items": ["T#forge:nuggets/neptunium","T#forge:ingots/neptunium","T#forge:storage_blocks/neptunium"], + "values": [1,9,81], + "durability": { + "breaks": [75,100], + "formulas": ["EXPONENTIAL","QUADRATIC"], + "a": [1.1,0.25], + "b": [0,0], + "modifiers": ["NONE","NONE"], + "limit": [0,0] + }, + "miningspeed": { + "breaks": [100], + "formulas": ["LINEAR"], + "a": [0.09], + "b": [0], + "modifiers": ["NONE"], + "limit": [0] + }, + "damage": { + "breaks": [100], + "formulas": ["LINEAR"], + "a": [0.01], + "b": [0], + "modifiers": ["NONE"], + "limit": [0] + }, + "mininglevel": { + "breaks": [15,45,95,100], + "formulas": ["CONSTANT","CONSTANT","CONSTANT","CONSTANT"], + "a": [0,1,2,3], + "b": [0,0,2,3], + "modifiers": ["NONE","NONE","NONE","NONE"], + "limit": [0,0,0,0] + }, + "enchantability": { + "breaks": [100], + "formulas": ["LINEAR"], + "a": [0.15], + "b": [0], + "modifiers": ["NONE"], + "limit": [0] + }, + "corrosionresist": { + "breaks": [100], + "formulas": ["LINEAR"], + "a": [0.02], + "b": [0], + "modifiers": ["MIN"], + "limit": [1] + }, + "heatresist": { + "breaks": [100], + "formulas": ["LINEAR"], + "a": [-0.02], + "b": [0], + "modifiers": ["MAX"], + "limit": [-1] + }, + "toughness": { + "breaks": [100], + "formulas": ["LINEAR"], + "a": [-0.005], + "b": [0.1], + "modifiers": ["NONE"], + "limit": [0] + }, + "enchantments": ["minecraft:smite"], + "enchantmentTypes": ["ALL"], + "enchantmentFactors": [0.2] +} \ No newline at end of file