From 5bae32897c083e97abcb90f64a915bf44269ea4f Mon Sep 17 00:00:00 2001 From: Mrbysco Date: Thu, 19 Sep 2024 01:15:35 +0200 Subject: [PATCH] WIP port to 1.21.1 --- .gitignore | 7 +- build.gradle | 140 +++++++++--------- gradle.properties | 20 +-- gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 31 ++-- gradlew.bat | 20 +-- settings.gradle | 10 +- .../tags/block}/storage_blocks/actinium.json | 0 .../tags/block}/storage_blocks/aluminum.json | 0 .../tags/block}/storage_blocks/barium.json | 0 .../tags/block}/storage_blocks/beryllium.json | 0 .../tags/block}/storage_blocks/bismuth.json | 0 .../tags/block}/storage_blocks/cadmium.json | 0 .../tags/block}/storage_blocks/calcium.json | 0 .../tags/block}/storage_blocks/cerium.json | 0 .../tags/block}/storage_blocks/cesium.json | 0 .../tags/block}/storage_blocks/chromium.json | 0 .../tags/block}/storage_blocks/cobalt.json | 0 .../block}/storage_blocks/dysprosium.json | 0 .../tags/block}/storage_blocks/erbium.json | 0 .../tags/block}/storage_blocks/europium.json | 0 .../tags/block}/storage_blocks/francium.json | 0 .../block}/storage_blocks/gadolinium.json | 0 .../tags/block}/storage_blocks/gallium.json | 0 .../tags/block}/storage_blocks/hafnium.json | 0 .../tags/block}/storage_blocks/holmium.json | 0 .../tags/block}/storage_blocks/indium.json | 0 .../tags/block}/storage_blocks/iridium.json | 0 .../tags/block}/storage_blocks/lanthanum.json | 0 .../tags/block}/storage_blocks/lead.json | 0 .../tags/block}/storage_blocks/lithium.json | 0 .../tags/block}/storage_blocks/lutetium.json | 0 .../tags/block}/storage_blocks/magnesium.json | 0 .../tags/block}/storage_blocks/manganese.json | 0 .../block}/storage_blocks/molybdenum.json | 0 .../tags/block}/storage_blocks/neodymium.json | 0 .../tags/block}/storage_blocks/nickel.json | 0 .../tags/block}/storage_blocks/niobium.json | 0 .../tags/block}/storage_blocks/osmium.json | 0 .../tags/block}/storage_blocks/palladium.json | 0 .../tags/block}/storage_blocks/platinum.json | 0 .../tags/block}/storage_blocks/polonium.json | 0 .../tags/block}/storage_blocks/potassium.json | 0 .../block}/storage_blocks/praseodymium.json | 0 .../block}/storage_blocks/protactinium.json | 0 .../tags/block}/storage_blocks/radium.json | 0 .../tags/block}/storage_blocks/rhenium.json | 0 .../tags/block}/storage_blocks/rhodium.json | 0 .../tags/block}/storage_blocks/rubidium.json | 0 .../tags/block}/storage_blocks/ruthenium.json | 0 .../tags/block}/storage_blocks/samarium.json | 0 .../tags/block}/storage_blocks/scandium.json | 0 .../tags/block}/storage_blocks/silver.json | 0 .../tags/block}/storage_blocks/sodium.json | 0 .../tags/block}/storage_blocks/strontium.json | 0 .../tags/block}/storage_blocks/tantalum.json | 0 .../tags/block}/storage_blocks/terbium.json | 0 .../tags/block}/storage_blocks/thallium.json | 0 .../tags/block}/storage_blocks/thorium.json | 0 .../tags/block}/storage_blocks/thulium.json | 0 .../tags/block}/storage_blocks/tin.json | 0 .../tags/block}/storage_blocks/titanium.json | 0 .../tags/block}/storage_blocks/tungsten.json | 0 .../tags/block}/storage_blocks/uranium.json | 0 .../tags/block}/storage_blocks/vanadium.json | 0 .../tags/block}/storage_blocks/ytterbium.json | 0 .../tags/block}/storage_blocks/yttrium.json | 0 .../tags/block}/storage_blocks/zinc.json | 0 .../tags/block}/storage_blocks/zirconium.json | 0 .../item}/dusts/acetylsalicylic_acid.json | 0 .../items => c/tags/item}/dusts/actinium.json | 0 .../items => c/tags/item}/dusts/aluminum.json | 0 .../tags/item}/dusts/aluminum_hydroxide.json | 0 .../tags/item}/dusts/aluminum_nitrate.json | 0 .../tags/item}/dusts/aluminum_oxide.json | 0 .../items => c/tags/item}/dusts/amide.json | 0 .../tags/item}/dusts/ammonium_chloride.json | 0 .../items => c/tags/item}/dusts/antimony.json | 0 .../tags/item}/dusts/antimony_trioxide.json | 0 .../tags/item}/dusts/antimony_trisulfide.json | 0 .../items => c/tags/item}/dusts/arsenic.json | 0 .../items => c/tags/item}/dusts/astatine.json | 0 .../items => c/tags/item}/dusts/barium.json | 0 .../tags/item}/dusts/barium_carbonate.json | 0 .../tags/item}/dusts/barium_chloride.json | 0 .../tags/item}/dusts/barium_hydroxide.json | 0 .../tags/item}/dusts/barium_nitrate.json | 0 .../tags/item}/dusts/barium_oxide.json | 0 .../tags/item}/dusts/barium_sulfide.json | 0 .../items => c/tags/item}/dusts/beryl.json | 0 .../tags/item}/dusts/beryllium.json | 0 .../tags/item}/dusts/beryllium_carbonate.json | 0 .../tags/item}/dusts/beryllium_chloride.json | 0 .../tags/item}/dusts/beryllium_hydroxide.json | 0 .../tags/item}/dusts/beryllium_nitrate.json | 0 .../tags/item}/dusts/beryllium_oxide.json | 0 .../tags/item}/dusts/beryllium_sulfate.json | 0 .../tags/item}/dusts/beta_carotene.json | 0 .../items => c/tags/item}/dusts/bismuth.json | 0 .../items => c/tags/item}/dusts/boron.json | 0 .../items => c/tags/item}/dusts/cadmium.json | 0 .../tags/item}/dusts/cadmium_carbonate.json | 0 .../tags/item}/dusts/cadmium_hydroxide.json | 0 .../tags/item}/dusts/cadmium_nitrate.json | 0 .../tags/item}/dusts/cadmium_sulfate.json | 0 .../tags/item}/dusts/cadmium_sulfide.json | 0 .../items => c/tags/item}/dusts/caffeine.json | 0 .../items => c/tags/item}/dusts/calcium.json | 0 .../tags/item}/dusts/calcium_carbonate.json | 0 .../tags/item}/dusts/calcium_chloride.json | 0 .../tags/item}/dusts/calcium_hydroxide.json | 0 .../tags/item}/dusts/calcium_nitrate.json | 0 .../tags/item}/dusts/calcium_oxide.json | 0 .../tags/item}/dusts/calcium_sulfate.json | 0 .../items => c/tags/item}/dusts/carbon.json | 0 .../tags/item}/dusts/carbonate.json | 0 .../tags/item}/dusts/cellulose.json | 0 .../items => c/tags/item}/dusts/cerium.json | 0 .../items => c/tags/item}/dusts/cesium.json | 0 .../tags/item}/dusts/cesium_carbonate.json | 0 .../tags/item}/dusts/cesium_chloride.json | 0 .../tags/item}/dusts/cesium_hydroxide.json | 0 .../tags/item}/dusts/cesium_nitrate.json | 0 .../tags/item}/dusts/cesium_sulfate.json | 0 .../items => c/tags/item}/dusts/chitin.json | 0 .../items => c/tags/item}/dusts/chromium.json | 0 .../tags/item}/dusts/chromium_oxide.json | 0 .../items => c/tags/item}/dusts/cinnabar.json | 0 .../items => c/tags/item}/dusts/cobalt.json | 0 .../tags/item}/dusts/cobalt_aluminate.json | 0 .../tags/item}/dusts/cobalt_carbonate.json | 0 .../tags/item}/dusts/cobalt_nitrate.json | 0 .../tags/item}/dusts/cobalt_sulfate.json | 0 .../items => c/tags/item}/dusts/copper.json | 0 .../tags/item}/dusts/copper_carbonate.json | 0 .../tags/item}/dusts/copper_i_oxide.json | 0 .../tags/item}/dusts/copper_i_sulfide.json | 0 .../tags/item}/dusts/copper_ii_hydroxide.json | 0 .../tags/item}/dusts/copper_ii_sulfate.json | 0 .../tags/item}/dusts/copper_nitrate.json | 0 .../tags/item}/dusts/cucurbitacin.json | 0 .../item}/dusts/diammonium_phosphate.json | 0 .../tags/item}/dusts/dysprosium.json | 0 .../items => c/tags/item}/dusts/erbium.json | 0 .../items => c/tags/item}/dusts/europium.json | 0 .../items => c/tags/item}/dusts/francium.json | 0 .../tags/item}/dusts/gadolinium.json | 0 .../items => c/tags/item}/dusts/gallium.json | 0 .../tags/item}/dusts/germanium.json | 0 .../items => c/tags/item}/dusts/gold.json | 0 .../items => c/tags/item}/dusts/graphite.json | 0 .../items => c/tags/item}/dusts/hafnium.json | 0 .../items => c/tags/item}/dusts/holmium.json | 0 .../tags/item}/dusts/hydroxide.json | 0 .../items => c/tags/item}/dusts/indium.json | 0 .../items => c/tags/item}/dusts/iodine.json | 0 .../items => c/tags/item}/dusts/iridium.json | 0 .../items => c/tags/item}/dusts/iron.json | 0 .../tags/item}/dusts/iron_carbonate.json | 0 .../tags/item}/dusts/iron_disulfide.json | 0 .../tags/item}/dusts/iron_ii_oxide.json | 0 .../tags/item}/dusts/iron_ii_sulfate.json | 0 .../tags/item}/dusts/iron_iii_nitrate.json | 0 .../tags/item}/dusts/iron_oxide.json | 0 .../items => c/tags/item}/dusts/keratin.json | 0 .../tags/item}/dusts/lanthanum.json | 0 .../items => c/tags/item}/dusts/lead.json | 0 .../tags/item}/dusts/lead_carbonate.json | 0 .../tags/item}/dusts/lead_nitrate.json | 0 .../tags/item}/dusts/lead_oxide.json | 0 .../tags/item}/dusts/lead_sulfate.json | 0 .../tags/item}/dusts/lead_sulfide.json | 0 .../items => c/tags/item}/dusts/lithium.json | 0 .../tags/item}/dusts/lithium_carbonate.json | 0 .../tags/item}/dusts/lithium_chloride.json | 0 .../tags/item}/dusts/lithium_hydroxide.json | 0 .../tags/item}/dusts/lithium_nitrate.json | 0 .../tags/item}/dusts/lithium_oxide.json | 0 .../tags/item}/dusts/lithium_sulfate.json | 0 .../items => c/tags/item}/dusts/lutetium.json | 0 .../tags/item}/dusts/magnesium.json | 0 .../tags/item}/dusts/magnesium_carbonate.json | 0 .../tags/item}/dusts/magnesium_chloride.json | 0 .../tags/item}/dusts/magnesium_hydroxide.json | 0 .../tags/item}/dusts/magnesium_nitrate.json | 0 .../tags/item}/dusts/magnesium_oxide.json | 0 .../tags/item}/dusts/manganese.json | 0 .../tags/item}/dusts/manganese_carbonate.json | 0 .../tags/item}/dusts/manganese_hydroxide.json | 0 .../tags/item}/dusts/manganese_nitrate.json | 0 .../tags/item}/dusts/manganese_oxide.json | 0 .../tags/item}/dusts/manganese_sulfate.json | 0 .../tags/item}/dusts/mercury_sulfide.json | 0 .../tags/item}/dusts/molybdenum.json | 0 .../items => c/tags/item}/dusts/mullite.json | 0 .../tags/item}/dusts/neodymium.json | 0 .../items => c/tags/item}/dusts/nickel.json | 0 .../tags/item}/dusts/nickel_carbonate.json | 0 .../tags/item}/dusts/nickel_chloride.json | 0 .../tags/item}/dusts/nickel_nitrate.json | 0 .../tags/item}/dusts/nickel_oxide.json | 0 .../tags/item}/dusts/nickel_sulfate.json | 0 .../tags/item}/dusts/nickel_sulfide.json | 0 .../items => c/tags/item}/dusts/niobium.json | 0 .../items => c/tags/item}/dusts/niter.json | 0 .../items => c/tags/item}/dusts/nitrate.json | 0 .../items => c/tags/item}/dusts/osmium.json | 0 .../tags/item}/dusts/palladium.json | 0 .../tags/item}/dusts/phosphate.json | 0 .../tags/item}/dusts/phosphoric_acid.json | 0 .../tags/item}/dusts/phosphorus.json | 0 .../items => c/tags/item}/dusts/platinum.json | 0 .../items => c/tags/item}/dusts/polonium.json | 0 .../tags/item}/dusts/polyvinyl_chloride.json | 0 .../tags/item}/dusts/potassium.json | 0 .../tags/item}/dusts/potassium_carbonate.json | 0 .../tags/item}/dusts/potassium_chloride.json | 0 .../tags/item}/dusts/potassium_cyanide.json | 0 .../item}/dusts/potassium_ethyl_xanthate.json | 0 .../tags/item}/dusts/potassium_hydroxide.json | 0 .../tags/item}/dusts/potassium_nitrate.json | 0 .../tags/item}/dusts/potassium_oxide.json | 0 .../tags/item}/dusts/potassium_sulfate.json | 0 .../tags/item}/dusts/praseodymium.json | 0 .../tags/item}/dusts/protactinium.json | 0 .../items => c/tags/item}/dusts/radium.json | 0 .../items => c/tags/item}/dusts/rhenium.json | 0 .../items => c/tags/item}/dusts/rhodium.json | 0 .../items => c/tags/item}/dusts/rubidium.json | 0 .../tags/item}/dusts/rubidium_carbonate.json | 0 .../tags/item}/dusts/rubidium_chloride.json | 0 .../tags/item}/dusts/rubidium_hydroxide.json | 0 .../tags/item}/dusts/rubidium_nitrate.json | 0 .../tags/item}/dusts/rubidium_oxide.json | 0 .../tags/item}/dusts/rubidium_sulfate.json | 0 .../tags/item}/dusts/ruthenium.json | 0 .../items => c/tags/item}/dusts/samarium.json | 0 .../items => c/tags/item}/dusts/scandium.json | 0 .../items => c/tags/item}/dusts/selenium.json | 0 .../items => c/tags/item}/dusts/silicon.json | 0 .../items => c/tags/item}/dusts/silver.json | 0 .../items => c/tags/item}/dusts/sodium.json | 0 .../tags/item}/dusts/sodium_bisulfate.json | 0 .../tags/item}/dusts/sodium_carbonate.json | 0 .../tags/item}/dusts/sodium_chloride.json | 0 .../tags/item}/dusts/sodium_hydroxide.json | 0 .../tags/item}/dusts/sodium_nitrate.json | 0 .../tags/item}/dusts/sodium_oxide.json | 0 .../tags/item}/dusts/sodium_sulfate.json | 0 .../items => c/tags/item}/dusts/starch.json | 0 .../tags/item}/dusts/strontium.json | 0 .../tags/item}/dusts/strontium_carbonate.json | 0 .../tags/item}/dusts/strontium_chloride.json | 0 .../tags/item}/dusts/strontium_hydroxide.json | 0 .../tags/item}/dusts/strontium_nitrate.json | 0 .../tags/item}/dusts/strontium_oxide.json | 0 .../tags/item}/dusts/strontium_sulfate.json | 0 .../items => c/tags/item}/dusts/sucrose.json | 0 .../items => c/tags/item}/dusts/sulfur.json | 0 .../items => c/tags/item}/dusts/tantalum.json | 0 .../tags/item}/dusts/tellurium.json | 0 .../items => c/tags/item}/dusts/terbium.json | 0 .../items => c/tags/item}/dusts/thallium.json | 0 .../items => c/tags/item}/dusts/thorium.json | 0 .../items => c/tags/item}/dusts/thulium.json | 0 .../tags/items => c/tags/item}/dusts/tin.json | 0 .../tags/item}/dusts/tin_oxide.json | 0 .../tags/item}/dusts/tin_sulfate.json | 0 .../items => c/tags/item}/dusts/titanium.json | 0 .../tags/item}/dusts/triglyceride.json | 0 .../items => c/tags/item}/dusts/tungsten.json | 0 .../items => c/tags/item}/dusts/uranium.json | 0 .../items => c/tags/item}/dusts/urea.json | 0 .../items => c/tags/item}/dusts/vanadium.json | 0 .../tags/item}/dusts/ytterbium.json | 0 .../items => c/tags/item}/dusts/yttrium.json | 0 .../items => c/tags/item}/dusts/zinc.json | 0 .../tags/item}/dusts/zinc_carbonate.json | 0 .../tags/item}/dusts/zinc_hydroxide.json | 0 .../tags/item}/dusts/zinc_nitrate.json | 0 .../tags/item}/dusts/zinc_oxide.json | 0 .../tags/item}/dusts/zinc_sulfate.json | 0 .../tags/item}/dusts/zinc_sulfide.json | 0 .../tags/item}/dusts/zirconium.json | 0 .../tags/item}/ingots/actinium.json | 0 .../tags/item}/ingots/aluminum.json | 0 .../items => c/tags/item}/ingots/barium.json | 0 .../tags/item}/ingots/beryllium.json | 0 .../items => c/tags/item}/ingots/bismuth.json | 0 .../items => c/tags/item}/ingots/cadmium.json | 0 .../items => c/tags/item}/ingots/calcium.json | 0 .../items => c/tags/item}/ingots/cerium.json | 0 .../items => c/tags/item}/ingots/cesium.json | 0 .../tags/item}/ingots/chromium.json | 0 .../items => c/tags/item}/ingots/cobalt.json | 0 .../tags/item}/ingots/dysprosium.json | 0 .../items => c/tags/item}/ingots/erbium.json | 0 .../tags/item}/ingots/europium.json | 0 .../tags/item}/ingots/francium.json | 0 .../tags/item}/ingots/gadolinium.json | 0 .../items => c/tags/item}/ingots/gallium.json | 0 .../items => c/tags/item}/ingots/hafnium.json | 0 .../items => c/tags/item}/ingots/holmium.json | 0 .../items => c/tags/item}/ingots/indium.json | 0 .../items => c/tags/item}/ingots/iridium.json | 0 .../tags/item}/ingots/lanthanum.json | 0 .../items => c/tags/item}/ingots/lead.json | 0 .../items => c/tags/item}/ingots/lithium.json | 0 .../tags/item}/ingots/lutetium.json | 0 .../tags/item}/ingots/magnesium.json | 0 .../tags/item}/ingots/manganese.json | 0 .../tags/item}/ingots/molybdenum.json | 0 .../tags/item}/ingots/neodymium.json | 0 .../items => c/tags/item}/ingots/nickel.json | 0 .../items => c/tags/item}/ingots/niobium.json | 0 .../items => c/tags/item}/ingots/osmium.json | 0 .../tags/item}/ingots/palladium.json | 0 .../tags/item}/ingots/platinum.json | 0 .../tags/item}/ingots/polonium.json | 0 .../tags/item}/ingots/potassium.json | 0 .../tags/item}/ingots/praseodymium.json | 0 .../tags/item}/ingots/protactinium.json | 0 .../items => c/tags/item}/ingots/radium.json | 0 .../items => c/tags/item}/ingots/rhenium.json | 0 .../items => c/tags/item}/ingots/rhodium.json | 0 .../tags/item}/ingots/rubidium.json | 0 .../tags/item}/ingots/ruthenium.json | 0 .../tags/item}/ingots/samarium.json | 0 .../tags/item}/ingots/scandium.json | 0 .../items => c/tags/item}/ingots/silver.json | 0 .../items => c/tags/item}/ingots/sodium.json | 0 .../tags/item}/ingots/strontium.json | 0 .../tags/item}/ingots/tantalum.json | 0 .../items => c/tags/item}/ingots/terbium.json | 0 .../tags/item}/ingots/thallium.json | 0 .../items => c/tags/item}/ingots/thorium.json | 0 .../items => c/tags/item}/ingots/thulium.json | 0 .../items => c/tags/item}/ingots/tin.json | 0 .../tags/item}/ingots/titanium.json | 0 .../tags/item}/ingots/tungsten.json | 0 .../items => c/tags/item}/ingots/uranium.json | 0 .../tags/item}/ingots/vanadium.json | 0 .../tags/item}/ingots/ytterbium.json | 0 .../items => c/tags/item}/ingots/yttrium.json | 0 .../items => c/tags/item}/ingots/zinc.json | 0 .../tags/item}/ingots/zirconium.json | 0 .../tags/item}/nuggets/actinium.json | 0 .../tags/item}/nuggets/aluminum.json | 0 .../items => c/tags/item}/nuggets/barium.json | 0 .../tags/item}/nuggets/beryllium.json | 0 .../tags/item}/nuggets/bismuth.json | 0 .../tags/item}/nuggets/cadmium.json | 0 .../tags/item}/nuggets/calcium.json | 0 .../items => c/tags/item}/nuggets/cerium.json | 0 .../items => c/tags/item}/nuggets/cesium.json | 0 .../tags/item}/nuggets/chromium.json | 0 .../items => c/tags/item}/nuggets/cobalt.json | 0 .../tags/item}/nuggets/dysprosium.json | 0 .../items => c/tags/item}/nuggets/erbium.json | 0 .../tags/item}/nuggets/europium.json | 0 .../tags/item}/nuggets/francium.json | 0 .../tags/item}/nuggets/gadolinium.json | 0 .../tags/item}/nuggets/gallium.json | 0 .../tags/item}/nuggets/hafnium.json | 0 .../tags/item}/nuggets/holmium.json | 0 .../items => c/tags/item}/nuggets/indium.json | 0 .../tags/item}/nuggets/iridium.json | 0 .../tags/item}/nuggets/lanthanum.json | 0 .../items => c/tags/item}/nuggets/lead.json | 0 .../tags/item}/nuggets/lithium.json | 0 .../tags/item}/nuggets/lutetium.json | 0 .../tags/item}/nuggets/magnesium.json | 0 .../tags/item}/nuggets/manganese.json | 0 .../tags/item}/nuggets/molybdenum.json | 0 .../tags/item}/nuggets/neodymium.json | 0 .../items => c/tags/item}/nuggets/nickel.json | 0 .../tags/item}/nuggets/niobium.json | 0 .../items => c/tags/item}/nuggets/osmium.json | 0 .../tags/item}/nuggets/palladium.json | 0 .../tags/item}/nuggets/platinum.json | 0 .../tags/item}/nuggets/polonium.json | 0 .../tags/item}/nuggets/potassium.json | 0 .../tags/item}/nuggets/praseodymium.json | 0 .../tags/item}/nuggets/protactinium.json | 0 .../items => c/tags/item}/nuggets/radium.json | 0 .../tags/item}/nuggets/rhenium.json | 0 .../tags/item}/nuggets/rhodium.json | 0 .../tags/item}/nuggets/rubidium.json | 0 .../tags/item}/nuggets/ruthenium.json | 0 .../tags/item}/nuggets/samarium.json | 0 .../tags/item}/nuggets/scandium.json | 0 .../items => c/tags/item}/nuggets/silver.json | 0 .../items => c/tags/item}/nuggets/sodium.json | 0 .../tags/item}/nuggets/strontium.json | 0 .../tags/item}/nuggets/tantalum.json | 0 .../tags/item}/nuggets/terbium.json | 0 .../tags/item}/nuggets/thallium.json | 0 .../tags/item}/nuggets/thorium.json | 0 .../tags/item}/nuggets/thulium.json | 0 .../items => c/tags/item}/nuggets/tin.json | 0 .../tags/item}/nuggets/titanium.json | 0 .../tags/item}/nuggets/tungsten.json | 0 .../tags/item}/nuggets/uranium.json | 0 .../tags/item}/nuggets/vanadium.json | 0 .../tags/item}/nuggets/ytterbium.json | 0 .../tags/item}/nuggets/yttrium.json | 0 .../items => c/tags/item}/nuggets/zinc.json | 0 .../tags/item}/nuggets/zirconium.json | 0 .../tags/item}/plates/actinium.json | 0 .../tags/item}/plates/aluminum.json | 0 .../items => c/tags/item}/plates/barium.json | 0 .../tags/item}/plates/beryllium.json | 0 .../items => c/tags/item}/plates/bismuth.json | 0 .../items => c/tags/item}/plates/cadmium.json | 0 .../items => c/tags/item}/plates/calcium.json | 0 .../items => c/tags/item}/plates/cerium.json | 0 .../items => c/tags/item}/plates/cesium.json | 0 .../tags/item}/plates/chromium.json | 0 .../items => c/tags/item}/plates/cobalt.json | 0 .../items => c/tags/item}/plates/copper.json | 0 .../tags/item}/plates/dysprosium.json | 0 .../items => c/tags/item}/plates/erbium.json | 0 .../tags/item}/plates/europium.json | 0 .../tags/item}/plates/francium.json | 0 .../tags/item}/plates/gadolinium.json | 0 .../items => c/tags/item}/plates/gallium.json | 0 .../items => c/tags/item}/plates/gold.json | 0 .../items => c/tags/item}/plates/hafnium.json | 0 .../items => c/tags/item}/plates/holmium.json | 0 .../items => c/tags/item}/plates/indium.json | 0 .../items => c/tags/item}/plates/iridium.json | 0 .../items => c/tags/item}/plates/iron.json | 0 .../tags/item}/plates/lanthanum.json | 0 .../items => c/tags/item}/plates/lead.json | 0 .../items => c/tags/item}/plates/lithium.json | 0 .../tags/item}/plates/lutetium.json | 0 .../tags/item}/plates/magnesium.json | 0 .../tags/item}/plates/manganese.json | 0 .../tags/item}/plates/molybdenum.json | 0 .../tags/item}/plates/neodymium.json | 0 .../items => c/tags/item}/plates/nickel.json | 0 .../items => c/tags/item}/plates/niobium.json | 0 .../items => c/tags/item}/plates/osmium.json | 0 .../tags/item}/plates/palladium.json | 0 .../tags/item}/plates/platinum.json | 0 .../tags/item}/plates/polonium.json | 0 .../tags/item}/plates/polyvinyl_chloride.json | 0 .../tags/item}/plates/potassium.json | 0 .../tags/item}/plates/praseodymium.json | 0 .../tags/item}/plates/protactinium.json | 0 .../items => c/tags/item}/plates/radium.json | 0 .../items => c/tags/item}/plates/rhenium.json | 0 .../items => c/tags/item}/plates/rhodium.json | 0 .../tags/item}/plates/rubidium.json | 0 .../tags/item}/plates/ruthenium.json | 0 .../tags/item}/plates/samarium.json | 0 .../tags/item}/plates/scandium.json | 0 .../items => c/tags/item}/plates/silver.json | 0 .../items => c/tags/item}/plates/sodium.json | 0 .../tags/item}/plates/strontium.json | 0 .../tags/item}/plates/tantalum.json | 0 .../items => c/tags/item}/plates/terbium.json | 0 .../tags/item}/plates/thallium.json | 0 .../items => c/tags/item}/plates/thorium.json | 0 .../items => c/tags/item}/plates/thulium.json | 0 .../items => c/tags/item}/plates/tin.json | 0 .../tags/item}/plates/titanium.json | 0 .../tags/item}/plates/tungsten.json | 0 .../items => c/tags/item}/plates/uranium.json | 0 .../tags/item}/plates/vanadium.json | 0 .../tags/item}/plates/ytterbium.json | 0 .../items => c/tags/item}/plates/yttrium.json | 0 .../items => c/tags/item}/plates/zinc.json | 0 .../tags/item}/plates/zirconium.json | 0 .../tags/items => c/tags/item}/sawdust.json | 0 .../tags/item}/storage_blocks/actinium.json | 0 .../tags/item}/storage_blocks/aluminum.json | 0 .../tags/item}/storage_blocks/barium.json | 0 .../tags/item}/storage_blocks/beryllium.json | 0 .../tags/item}/storage_blocks/bismuth.json | 0 .../tags/item}/storage_blocks/cadmium.json | 0 .../tags/item}/storage_blocks/calcium.json | 0 .../tags/item}/storage_blocks/cerium.json | 0 .../tags/item}/storage_blocks/cesium.json | 0 .../tags/item}/storage_blocks/chromium.json | 0 .../tags/item}/storage_blocks/cobalt.json | 0 .../tags/item}/storage_blocks/dysprosium.json | 0 .../tags/item}/storage_blocks/erbium.json | 0 .../tags/item}/storage_blocks/europium.json | 0 .../tags/item}/storage_blocks/francium.json | 0 .../tags/item}/storage_blocks/gadolinium.json | 0 .../tags/item}/storage_blocks/gallium.json | 0 .../tags/item}/storage_blocks/hafnium.json | 0 .../tags/item}/storage_blocks/holmium.json | 0 .../tags/item}/storage_blocks/indium.json | 0 .../tags/item}/storage_blocks/iridium.json | 0 .../tags/item}/storage_blocks/lanthanum.json | 0 .../tags/item}/storage_blocks/lead.json | 0 .../tags/item}/storage_blocks/lithium.json | 0 .../tags/item}/storage_blocks/lutetium.json | 0 .../tags/item}/storage_blocks/magnesium.json | 0 .../tags/item}/storage_blocks/manganese.json | 0 .../tags/item}/storage_blocks/molybdenum.json | 0 .../tags/item}/storage_blocks/neodymium.json | 0 .../tags/item}/storage_blocks/nickel.json | 0 .../tags/item}/storage_blocks/niobium.json | 0 .../tags/item}/storage_blocks/osmium.json | 0 .../tags/item}/storage_blocks/palladium.json | 0 .../tags/item}/storage_blocks/platinum.json | 0 .../tags/item}/storage_blocks/polonium.json | 0 .../tags/item}/storage_blocks/potassium.json | 0 .../item}/storage_blocks/praseodymium.json | 0 .../item}/storage_blocks/protactinium.json | 0 .../tags/item}/storage_blocks/radium.json | 0 .../tags/item}/storage_blocks/rhenium.json | 0 .../tags/item}/storage_blocks/rhodium.json | 0 .../tags/item}/storage_blocks/rubidium.json | 0 .../tags/item}/storage_blocks/ruthenium.json | 0 .../tags/item}/storage_blocks/samarium.json | 0 .../tags/item}/storage_blocks/scandium.json | 0 .../tags/item}/storage_blocks/silver.json | 0 .../tags/item}/storage_blocks/sodium.json | 0 .../tags/item}/storage_blocks/strontium.json | 0 .../tags/item}/storage_blocks/tantalum.json | 0 .../tags/item}/storage_blocks/terbium.json | 0 .../tags/item}/storage_blocks/thallium.json | 0 .../tags/item}/storage_blocks/thorium.json | 0 .../tags/item}/storage_blocks/thulium.json | 0 .../tags/item}/storage_blocks/tin.json | 0 .../tags/item}/storage_blocks/titanium.json | 0 .../tags/item}/storage_blocks/tungsten.json | 0 .../tags/item}/storage_blocks/uranium.json | 0 .../tags/item}/storage_blocks/vanadium.json | 0 .../tags/item}/storage_blocks/ytterbium.json | 0 .../tags/item}/storage_blocks/yttrium.json | 0 .../tags/item}/storage_blocks/zinc.json | 0 .../tags/item}/storage_blocks/zirconium.json | 0 .../recipes/misc/actinium_block_to_ingot.json | 10 +- ...ium_ingot_from_blasting_actinium_dust.json | 10 +- ...ium_ingot_from_smelting_actinium_dust.json | 10 +- .../recipes/misc/actinium_ingot_to_block.json | 10 +- .../misc/actinium_ingot_to_nugget.json | 10 +- .../misc/actinium_nugget_to_ingot.json | 10 +- .../recipes/misc/aluminum_block_to_ingot.json | 10 +- ...num_ingot_from_blasting_aluminum_dust.json | 10 +- ...num_ingot_from_smelting_aluminum_dust.json | 10 +- .../recipes/misc/aluminum_ingot_to_block.json | 10 +- .../misc/aluminum_ingot_to_nugget.json | 10 +- .../misc/aluminum_nugget_to_ingot.json | 10 +- .../recipes/misc/argon_lamp_block.json | 10 +- .../recipes/misc/barium_block_to_ingot.json | 10 +- ...arium_ingot_from_blasting_barium_dust.json | 10 +- ...arium_ingot_from_smelting_barium_dust.json | 10 +- .../recipes/misc/barium_ingot_to_block.json | 10 +- .../recipes/misc/barium_ingot_to_nugget.json | 10 +- .../recipes/misc/barium_nugget_to_ingot.json | 10 +- .../misc/beryllium_block_to_ingot.json | 10 +- ...um_ingot_from_blasting_beryllium_dust.json | 10 +- ...um_ingot_from_smelting_beryllium_dust.json | 10 +- .../misc/beryllium_ingot_to_block.json | 10 +- .../misc/beryllium_ingot_to_nugget.json | 10 +- .../misc/beryllium_nugget_to_ingot.json | 10 +- .../recipes/misc/bismuth_block_to_ingot.json | 10 +- ...muth_ingot_from_blasting_bismuth_dust.json | 10 +- ...muth_ingot_from_smelting_bismuth_dust.json | 10 +- .../recipes/misc/bismuth_ingot_to_block.json | 10 +- .../recipes/misc/bismuth_ingot_to_nugget.json | 10 +- .../recipes/misc/bismuth_nugget_to_ingot.json | 10 +- .../recipes/misc/cadmium_block_to_ingot.json | 10 +- ...mium_ingot_from_blasting_cadmium_dust.json | 10 +- ...mium_ingot_from_smelting_cadmium_dust.json | 10 +- .../recipes/misc/cadmium_ingot_to_block.json | 10 +- .../recipes/misc/cadmium_ingot_to_nugget.json | 10 +- .../recipes/misc/cadmium_nugget_to_ingot.json | 10 +- .../recipes/misc/calcium_block_to_ingot.json | 10 +- ...cium_ingot_from_blasting_calcium_dust.json | 10 +- ...cium_ingot_from_smelting_calcium_dust.json | 10 +- .../recipes/misc/calcium_ingot_to_block.json | 10 +- .../recipes/misc/calcium_ingot_to_nugget.json | 10 +- .../recipes/misc/calcium_nugget_to_ingot.json | 10 +- .../recipes/misc/cerium_block_to_ingot.json | 10 +- ...erium_ingot_from_blasting_cerium_dust.json | 10 +- ...erium_ingot_from_smelting_cerium_dust.json | 10 +- .../recipes/misc/cerium_ingot_to_block.json | 10 +- .../recipes/misc/cerium_ingot_to_nugget.json | 10 +- .../recipes/misc/cerium_nugget_to_ingot.json | 10 +- .../recipes/misc/cesium_block_to_ingot.json | 10 +- ...esium_ingot_from_blasting_cesium_dust.json | 10 +- ...esium_ingot_from_smelting_cesium_dust.json | 10 +- .../recipes/misc/cesium_ingot_to_block.json | 10 +- .../recipes/misc/cesium_ingot_to_nugget.json | 10 +- .../recipes/misc/cesium_nugget_to_ingot.json | 10 +- .../recipes/misc/chromium_block_to_ingot.json | 10 +- ...ium_ingot_from_blasting_chromium_dust.json | 10 +- ...ium_ingot_from_smelting_chromium_dust.json | 10 +- .../recipes/misc/chromium_ingot_to_block.json | 10 +- .../misc/chromium_ingot_to_nugget.json | 10 +- .../misc/chromium_nugget_to_ingot.json | 10 +- .../recipes/misc/cobalt_block_to_ingot.json | 10 +- ...obalt_ingot_from_blasting_cobalt_dust.json | 10 +- ...obalt_ingot_from_smelting_cobalt_dust.json | 10 +- .../recipes/misc/cobalt_ingot_to_block.json | 10 +- .../recipes/misc/cobalt_ingot_to_nugget.json | 10 +- .../recipes/misc/cobalt_nugget_to_ingot.json | 10 +- ...opper_ingot_from_blasting_copper_dust.json | 8 +- ...opper_ingot_from_smelting_copper_dust.json | 8 +- .../misc/dysprosium_block_to_ingot.json | 10 +- ...m_ingot_from_blasting_dysprosium_dust.json | 10 +- ...m_ingot_from_smelting_dysprosium_dust.json | 10 +- .../misc/dysprosium_ingot_to_block.json | 10 +- .../misc/dysprosium_ingot_to_nugget.json | 10 +- .../misc/dysprosium_nugget_to_ingot.json | 10 +- .../recipes/misc/erbium_block_to_ingot.json | 10 +- ...rbium_ingot_from_blasting_erbium_dust.json | 10 +- ...rbium_ingot_from_smelting_erbium_dust.json | 10 +- .../recipes/misc/erbium_ingot_to_block.json | 10 +- .../recipes/misc/erbium_ingot_to_nugget.json | 10 +- .../recipes/misc/erbium_nugget_to_ingot.json | 10 +- .../recipes/misc/europium_block_to_ingot.json | 10 +- ...ium_ingot_from_blasting_europium_dust.json | 10 +- ...ium_ingot_from_smelting_europium_dust.json | 10 +- .../recipes/misc/europium_ingot_to_block.json | 10 +- .../misc/europium_ingot_to_nugget.json | 10 +- .../misc/europium_nugget_to_ingot.json | 10 +- .../recipes/misc/francium_block_to_ingot.json | 10 +- ...ium_ingot_from_blasting_francium_dust.json | 10 +- ...ium_ingot_from_smelting_francium_dust.json | 10 +- .../recipes/misc/francium_ingot_to_block.json | 10 +- .../misc/francium_ingot_to_nugget.json | 10 +- .../misc/francium_nugget_to_ingot.json | 10 +- .../misc/gadolinium_block_to_ingot.json | 10 +- ...m_ingot_from_blasting_gadolinium_dust.json | 10 +- ...m_ingot_from_smelting_gadolinium_dust.json | 10 +- .../misc/gadolinium_ingot_to_block.json | 10 +- .../misc/gadolinium_ingot_to_nugget.json | 10 +- .../misc/gadolinium_nugget_to_ingot.json | 10 +- .../recipes/misc/gallium_block_to_ingot.json | 10 +- ...lium_ingot_from_blasting_gallium_dust.json | 10 +- ...lium_ingot_from_smelting_gallium_dust.json | 10 +- .../recipes/misc/gallium_ingot_to_block.json | 10 +- .../recipes/misc/gallium_ingot_to_nugget.json | 10 +- .../recipes/misc/gallium_nugget_to_ingot.json | 10 +- .../gold_ingot_from_blasting_gold_dust.json | 8 +- .../gold_ingot_from_smelting_gold_dust.json | 8 +- .../recipes/misc/hafnium_block_to_ingot.json | 10 +- ...nium_ingot_from_blasting_hafnium_dust.json | 10 +- ...nium_ingot_from_smelting_hafnium_dust.json | 10 +- .../recipes/misc/hafnium_ingot_to_block.json | 10 +- .../recipes/misc/hafnium_ingot_to_nugget.json | 10 +- .../recipes/misc/hafnium_nugget_to_ingot.json | 10 +- .../recipes/misc/helium_lamp_block.json | 10 +- .../recipes/misc/holmium_block_to_ingot.json | 10 +- ...mium_ingot_from_blasting_holmium_dust.json | 10 +- ...mium_ingot_from_smelting_holmium_dust.json | 10 +- .../recipes/misc/holmium_ingot_to_block.json | 10 +- .../recipes/misc/holmium_ingot_to_nugget.json | 10 +- .../recipes/misc/holmium_nugget_to_ingot.json | 10 +- .../recipes/misc/indium_block_to_ingot.json | 10 +- ...ndium_ingot_from_blasting_indium_dust.json | 10 +- ...ndium_ingot_from_smelting_indium_dust.json | 10 +- .../recipes/misc/indium_ingot_to_block.json | 10 +- .../recipes/misc/indium_ingot_to_nugget.json | 10 +- .../recipes/misc/indium_nugget_to_ingot.json | 10 +- .../recipes/misc/iridium_block_to_ingot.json | 10 +- ...dium_ingot_from_blasting_iridium_dust.json | 10 +- ...dium_ingot_from_smelting_iridium_dust.json | 10 +- .../recipes/misc/iridium_ingot_to_block.json | 10 +- .../recipes/misc/iridium_ingot_to_nugget.json | 10 +- .../recipes/misc/iridium_nugget_to_ingot.json | 10 +- .../iron_ingot_from_blasting_iron_dust.json | 8 +- .../iron_ingot_from_smelting_iron_dust.json | 8 +- .../recipes/misc/krypton_lamp_block.json | 10 +- .../misc/lanthanum_block_to_ingot.json | 10 +- ...um_ingot_from_blasting_lanthanum_dust.json | 10 +- ...um_ingot_from_smelting_lanthanum_dust.json | 10 +- .../misc/lanthanum_ingot_to_block.json | 10 +- .../misc/lanthanum_ingot_to_nugget.json | 10 +- .../misc/lanthanum_nugget_to_ingot.json | 10 +- .../recipes/misc/lead_block_to_ingot.json | 10 +- .../lead_ingot_from_blasting_lead_dust.json | 10 +- .../lead_ingot_from_smelting_lead_dust.json | 10 +- .../recipes/misc/lead_ingot_to_block.json | 10 +- .../recipes/misc/lead_ingot_to_nugget.json | 10 +- .../recipes/misc/lead_nugget_to_ingot.json | 10 +- .../recipes/misc/lithium_block_to_ingot.json | 10 +- ...hium_ingot_from_blasting_lithium_dust.json | 10 +- ...hium_ingot_from_smelting_lithium_dust.json | 10 +- .../recipes/misc/lithium_ingot_to_block.json | 10 +- .../recipes/misc/lithium_ingot_to_nugget.json | 10 +- .../recipes/misc/lithium_nugget_to_ingot.json | 10 +- .../recipes/misc/lutetium_block_to_ingot.json | 10 +- ...ium_ingot_from_blasting_lutetium_dust.json | 10 +- ...ium_ingot_from_smelting_lutetium_dust.json | 10 +- .../recipes/misc/lutetium_ingot_to_block.json | 10 +- .../misc/lutetium_ingot_to_nugget.json | 10 +- .../misc/lutetium_nugget_to_ingot.json | 10 +- .../misc/magnesium_block_to_ingot.json | 10 +- ...um_ingot_from_blasting_magnesium_dust.json | 10 +- ...um_ingot_from_smelting_magnesium_dust.json | 10 +- .../misc/magnesium_ingot_to_block.json | 10 +- .../misc/magnesium_ingot_to_nugget.json | 10 +- .../misc/magnesium_nugget_to_ingot.json | 10 +- .../misc/manganese_block_to_ingot.json | 10 +- ...se_ingot_from_blasting_manganese_dust.json | 10 +- ...se_ingot_from_smelting_manganese_dust.json | 10 +- .../misc/manganese_ingot_to_block.json | 10 +- .../misc/manganese_ingot_to_nugget.json | 10 +- .../misc/manganese_nugget_to_ingot.json | 10 +- .../misc/molybdenum_block_to_ingot.json | 10 +- ...m_ingot_from_blasting_molybdenum_dust.json | 10 +- ...m_ingot_from_smelting_molybdenum_dust.json | 10 +- .../misc/molybdenum_ingot_to_block.json | 10 +- .../misc/molybdenum_ingot_to_nugget.json | 10 +- .../misc/molybdenum_nugget_to_ingot.json | 10 +- .../misc/neodymium_block_to_ingot.json | 10 +- ...um_ingot_from_blasting_neodymium_dust.json | 10 +- ...um_ingot_from_smelting_neodymium_dust.json | 10 +- .../misc/neodymium_ingot_to_block.json | 10 +- .../misc/neodymium_ingot_to_nugget.json | 10 +- .../misc/neodymium_nugget_to_ingot.json | 10 +- .../recipes/misc/neon_lamp_block.json | 10 +- .../recipes/misc/nickel_block_to_ingot.json | 10 +- ...ickel_ingot_from_blasting_nickel_dust.json | 10 +- ...ickel_ingot_from_smelting_nickel_dust.json | 10 +- .../recipes/misc/nickel_ingot_to_block.json | 10 +- .../recipes/misc/nickel_ingot_to_nugget.json | 10 +- .../recipes/misc/nickel_nugget_to_ingot.json | 10 +- .../recipes/misc/niobium_block_to_ingot.json | 10 +- ...bium_ingot_from_blasting_niobium_dust.json | 10 +- ...bium_ingot_from_smelting_niobium_dust.json | 10 +- .../recipes/misc/niobium_ingot_to_block.json | 10 +- .../recipes/misc/niobium_ingot_to_nugget.json | 10 +- .../recipes/misc/niobium_nugget_to_ingot.json | 10 +- .../recipes/misc/osmium_block_to_ingot.json | 10 +- ...smium_ingot_from_blasting_osmium_dust.json | 10 +- ...smium_ingot_from_smelting_osmium_dust.json | 10 +- .../recipes/misc/osmium_ingot_to_block.json | 10 +- .../recipes/misc/osmium_ingot_to_nugget.json | 10 +- .../recipes/misc/osmium_nugget_to_ingot.json | 10 +- .../misc/palladium_block_to_ingot.json | 10 +- ...um_ingot_from_blasting_palladium_dust.json | 10 +- ...um_ingot_from_smelting_palladium_dust.json | 10 +- .../misc/palladium_ingot_to_block.json | 10 +- .../misc/palladium_ingot_to_nugget.json | 10 +- .../misc/palladium_nugget_to_ingot.json | 10 +- .../recipes/misc/periodic_table.json | 8 +- .../recipes/misc/platinum_block_to_ingot.json | 10 +- ...num_ingot_from_blasting_platinum_dust.json | 10 +- ...num_ingot_from_smelting_platinum_dust.json | 10 +- .../recipes/misc/platinum_ingot_to_block.json | 10 +- .../misc/platinum_ingot_to_nugget.json | 10 +- .../misc/platinum_nugget_to_ingot.json | 10 +- .../recipes/misc/polonium_block_to_ingot.json | 10 +- ...ium_ingot_from_blasting_polonium_dust.json | 10 +- ...ium_ingot_from_smelting_polonium_dust.json | 10 +- .../recipes/misc/polonium_ingot_to_block.json | 10 +- .../misc/polonium_ingot_to_nugget.json | 10 +- .../misc/polonium_nugget_to_ingot.json | 10 +- .../misc/potassium_block_to_ingot.json | 10 +- ...um_ingot_from_blasting_potassium_dust.json | 10 +- ...um_ingot_from_smelting_potassium_dust.json | 10 +- .../misc/potassium_ingot_to_block.json | 10 +- .../misc/potassium_ingot_to_nugget.json | 10 +- .../misc/potassium_nugget_to_ingot.json | 10 +- .../misc/praseodymium_block_to_ingot.json | 10 +- ...ingot_from_blasting_praseodymium_dust.json | 10 +- ...ingot_from_smelting_praseodymium_dust.json | 10 +- .../misc/praseodymium_ingot_to_block.json | 10 +- .../misc/praseodymium_ingot_to_nugget.json | 10 +- .../misc/praseodymium_nugget_to_ingot.json | 10 +- .../misc/protactinium_block_to_ingot.json | 10 +- ...ingot_from_blasting_protactinium_dust.json | 10 +- ...ingot_from_smelting_protactinium_dust.json | 10 +- .../misc/protactinium_ingot_to_block.json | 10 +- .../misc/protactinium_ingot_to_nugget.json | 10 +- .../misc/protactinium_nugget_to_ingot.json | 10 +- .../recipes/misc/radium_block_to_ingot.json | 10 +- ...adium_ingot_from_blasting_radium_dust.json | 10 +- ...adium_ingot_from_smelting_radium_dust.json | 10 +- .../recipes/misc/radium_ingot_to_block.json | 10 +- .../recipes/misc/radium_ingot_to_nugget.json | 10 +- .../recipes/misc/radium_nugget_to_ingot.json | 10 +- .../recipes/misc/radon_lamp_block.json | 10 +- .../recipes/misc/rhenium_block_to_ingot.json | 10 +- ...nium_ingot_from_blasting_rhenium_dust.json | 10 +- ...nium_ingot_from_smelting_rhenium_dust.json | 10 +- .../recipes/misc/rhenium_ingot_to_block.json | 10 +- .../recipes/misc/rhenium_ingot_to_nugget.json | 10 +- .../recipes/misc/rhenium_nugget_to_ingot.json | 10 +- .../recipes/misc/rhodium_block_to_ingot.json | 10 +- ...dium_ingot_from_blasting_rhodium_dust.json | 10 +- ...dium_ingot_from_smelting_rhodium_dust.json | 10 +- .../recipes/misc/rhodium_ingot_to_block.json | 10 +- .../recipes/misc/rhodium_ingot_to_nugget.json | 10 +- .../recipes/misc/rhodium_nugget_to_ingot.json | 10 +- .../recipes/misc/rubidium_block_to_ingot.json | 10 +- ...ium_ingot_from_blasting_rubidium_dust.json | 10 +- ...ium_ingot_from_smelting_rubidium_dust.json | 10 +- .../recipes/misc/rubidium_ingot_to_block.json | 10 +- .../misc/rubidium_ingot_to_nugget.json | 10 +- .../misc/rubidium_nugget_to_ingot.json | 10 +- .../misc/ruthenium_block_to_ingot.json | 10 +- ...um_ingot_from_blasting_ruthenium_dust.json | 10 +- ...um_ingot_from_smelting_ruthenium_dust.json | 10 +- .../misc/ruthenium_ingot_to_block.json | 10 +- .../misc/ruthenium_ingot_to_nugget.json | 10 +- .../misc/ruthenium_nugget_to_ingot.json | 10 +- .../recipes/misc/samarium_block_to_ingot.json | 10 +- ...ium_ingot_from_blasting_samarium_dust.json | 10 +- ...ium_ingot_from_smelting_samarium_dust.json | 10 +- .../recipes/misc/samarium_ingot_to_block.json | 10 +- .../misc/samarium_ingot_to_nugget.json | 10 +- .../misc/samarium_nugget_to_ingot.json | 10 +- .../recipes/misc/scandium_block_to_ingot.json | 10 +- ...ium_ingot_from_blasting_scandium_dust.json | 10 +- ...ium_ingot_from_smelting_scandium_dust.json | 10 +- .../recipes/misc/scandium_ingot_to_block.json | 10 +- .../misc/scandium_ingot_to_nugget.json | 10 +- .../misc/scandium_nugget_to_ingot.json | 10 +- .../recipes/misc/silver_block_to_ingot.json | 10 +- ...ilver_ingot_from_blasting_silver_dust.json | 10 +- ...ilver_ingot_from_smelting_silver_dust.json | 10 +- .../recipes/misc/silver_ingot_to_block.json | 10 +- .../recipes/misc/silver_ingot_to_nugget.json | 10 +- .../recipes/misc/silver_nugget_to_ingot.json | 10 +- .../recipes/misc/sodium_block_to_ingot.json | 10 +- ...odium_ingot_from_blasting_sodium_dust.json | 10 +- ...odium_ingot_from_smelting_sodium_dust.json | 10 +- .../recipes/misc/sodium_ingot_to_block.json | 10 +- .../recipes/misc/sodium_ingot_to_nugget.json | 10 +- .../recipes/misc/sodium_nugget_to_ingot.json | 10 +- .../misc/strontium_block_to_ingot.json | 10 +- ...um_ingot_from_blasting_strontium_dust.json | 10 +- ...um_ingot_from_smelting_strontium_dust.json | 10 +- .../misc/strontium_ingot_to_block.json | 10 +- .../misc/strontium_ingot_to_nugget.json | 10 +- .../misc/strontium_nugget_to_ingot.json | 10 +- .../recipes/misc/tantalum_block_to_ingot.json | 10 +- ...lum_ingot_from_blasting_tantalum_dust.json | 10 +- ...lum_ingot_from_smelting_tantalum_dust.json | 10 +- .../recipes/misc/tantalum_ingot_to_block.json | 10 +- .../misc/tantalum_ingot_to_nugget.json | 10 +- .../misc/tantalum_nugget_to_ingot.json | 10 +- .../recipes/misc/terbium_block_to_ingot.json | 10 +- ...bium_ingot_from_blasting_terbium_dust.json | 10 +- ...bium_ingot_from_smelting_terbium_dust.json | 10 +- .../recipes/misc/terbium_ingot_to_block.json | 10 +- .../recipes/misc/terbium_ingot_to_nugget.json | 10 +- .../recipes/misc/terbium_nugget_to_ingot.json | 10 +- .../recipes/misc/thallium_block_to_ingot.json | 10 +- ...ium_ingot_from_blasting_thallium_dust.json | 10 +- ...ium_ingot_from_smelting_thallium_dust.json | 10 +- .../recipes/misc/thallium_ingot_to_block.json | 10 +- .../misc/thallium_ingot_to_nugget.json | 10 +- .../misc/thallium_nugget_to_ingot.json | 10 +- .../recipes/misc/thorium_block_to_ingot.json | 22 ++- ...rium_ingot_from_blasting_thorium_dust.json | 22 ++- ...rium_ingot_from_smelting_thorium_dust.json | 22 ++- .../recipes/misc/thorium_ingot_to_block.json | 22 ++- .../recipes/misc/thorium_ingot_to_nugget.json | 22 ++- .../recipes/misc/thorium_nugget_to_ingot.json | 22 ++- .../recipes/misc/thulium_block_to_ingot.json | 22 ++- ...lium_ingot_from_blasting_thulium_dust.json | 22 ++- ...lium_ingot_from_smelting_thulium_dust.json | 22 ++- .../recipes/misc/thulium_ingot_to_block.json | 22 ++- .../recipes/misc/thulium_ingot_to_nugget.json | 22 ++- .../recipes/misc/thulium_nugget_to_ingot.json | 22 ++- .../recipes/misc/tin_block_to_ingot.json | 22 ++- .../tin_ingot_from_blasting_tin_dust.json | 22 ++- .../tin_ingot_from_smelting_tin_dust.json | 22 ++- .../recipes/misc/tin_ingot_to_block.json | 22 ++- .../recipes/misc/tin_ingot_to_nugget.json | 22 ++- .../recipes/misc/tin_nugget_to_ingot.json | 22 ++- .../recipes/misc/titanium_block_to_ingot.json | 22 ++- ...ium_ingot_from_blasting_titanium_dust.json | 22 ++- ...ium_ingot_from_smelting_titanium_dust.json | 22 ++- .../recipes/misc/titanium_ingot_to_block.json | 22 ++- .../misc/titanium_ingot_to_nugget.json | 22 ++- .../misc/titanium_nugget_to_ingot.json | 22 ++- .../recipes/misc/tungsten_block_to_ingot.json | 22 ++- ...ten_ingot_from_blasting_tungsten_dust.json | 22 ++- ...ten_ingot_from_smelting_tungsten_dust.json | 22 ++- .../recipes/misc/tungsten_ingot_to_block.json | 22 ++- .../misc/tungsten_ingot_to_nugget.json | 22 ++- .../misc/tungsten_nugget_to_ingot.json | 22 ++- .../recipes/misc/uranium_block_to_ingot.json | 22 ++- ...nium_ingot_from_blasting_uranium_dust.json | 22 ++- ...nium_ingot_from_smelting_uranium_dust.json | 22 ++- .../recipes/misc/uranium_ingot_to_block.json | 22 ++- .../recipes/misc/uranium_ingot_to_nugget.json | 22 ++- .../recipes/misc/uranium_nugget_to_ingot.json | 22 ++- .../recipes/misc/vanadium_block_to_ingot.json | 22 ++- ...ium_ingot_from_blasting_vanadium_dust.json | 22 ++- ...ium_ingot_from_smelting_vanadium_dust.json | 22 ++- .../recipes/misc/vanadium_ingot_to_block.json | 22 ++- .../misc/vanadium_ingot_to_nugget.json | 22 ++- .../misc/vanadium_nugget_to_ingot.json | 22 ++- .../recipes/misc/xenon_lamp_block.json | 22 ++- .../misc/ytterbium_block_to_ingot.json | 22 ++- ...um_ingot_from_blasting_ytterbium_dust.json | 22 ++- ...um_ingot_from_smelting_ytterbium_dust.json | 22 ++- .../misc/ytterbium_ingot_to_block.json | 22 ++- .../misc/ytterbium_ingot_to_nugget.json | 22 ++- .../misc/ytterbium_nugget_to_ingot.json | 22 ++- .../recipes/misc/yttrium_block_to_ingot.json | 22 ++- ...rium_ingot_from_blasting_yttrium_dust.json | 22 ++- ...rium_ingot_from_smelting_yttrium_dust.json | 22 ++- .../recipes/misc/yttrium_ingot_to_block.json | 22 ++- .../recipes/misc/yttrium_ingot_to_nugget.json | 22 ++- .../recipes/misc/yttrium_nugget_to_ingot.json | 22 ++- .../recipes/misc/zinc_block_to_ingot.json | 22 ++- .../zinc_ingot_from_blasting_zinc_dust.json | 22 ++- .../zinc_ingot_from_smelting_zinc_dust.json | 22 ++- .../recipes/misc/zinc_ingot_to_block.json | 22 ++- .../recipes/misc/zinc_ingot_to_nugget.json | 22 ++- .../recipes/misc/zinc_nugget_to_ingot.json | 22 ++- .../misc/zirconium_block_to_ingot.json | 22 ++- ...um_ingot_from_blasting_zirconium_dust.json | 22 ++- ...um_ingot_from_smelting_zirconium_dust.json | 22 ++- .../misc/zirconium_ingot_to_block.json | 22 ++- .../misc/zirconium_ingot_to_nugget.json | 22 ++- .../misc/zirconium_nugget_to_ingot.json | 22 ++- .../blocks/actinium_metal_block.json | 3 +- .../blocks/aluminum_metal_block.json | 3 +- .../blocks/argon_lamp_block.json | 3 +- .../blocks/barium_metal_block.json | 3 +- .../blocks/beryllium_metal_block.json | 3 +- .../blocks/bismuth_metal_block.json | 3 +- .../blocks/cadmium_metal_block.json | 3 +- .../blocks/calcium_metal_block.json | 3 +- .../blocks/cerium_metal_block.json | 3 +- .../blocks/cesium_metal_block.json | 3 +- .../blocks/chromium_metal_block.json | 3 +- .../blocks/cobalt_metal_block.json | 3 +- .../blocks/dysprosium_metal_block.json | 3 +- .../blocks/erbium_metal_block.json | 3 +- .../blocks/europium_metal_block.json | 3 +- .../blocks/francium_metal_block.json | 3 +- .../blocks/gadolinium_metal_block.json | 3 +- .../blocks/gallium_metal_block.json | 3 +- .../blocks/hafnium_metal_block.json | 3 +- .../blocks/helium_lamp_block.json | 3 +- .../blocks/holmium_metal_block.json | 3 +- .../blocks/indium_metal_block.json | 3 +- .../blocks/iridium_metal_block.json | 3 +- .../blocks/krypton_lamp_block.json | 3 +- .../blocks/lanthanum_metal_block.json | 3 +- .../blocks/lead_metal_block.json | 3 +- .../blocks/lithium_metal_block.json | 3 +- .../blocks/lutetium_metal_block.json | 3 +- .../blocks/magnesium_metal_block.json | 3 +- .../blocks/manganese_metal_block.json | 3 +- .../blocks/molybdenum_metal_block.json | 3 +- .../blocks/neodymium_metal_block.json | 3 +- .../blocks/neon_lamp_block.json | 3 +- .../blocks/nickel_metal_block.json | 3 +- .../blocks/niobium_metal_block.json | 3 +- .../blocks/osmium_metal_block.json | 3 +- .../blocks/palladium_metal_block.json | 3 +- .../blocks/platinum_metal_block.json | 3 +- .../blocks/polonium_metal_block.json | 3 +- .../blocks/potassium_metal_block.json | 3 +- .../blocks/praseodymium_metal_block.json | 3 +- .../blocks/protactinium_metal_block.json | 3 +- .../blocks/radium_metal_block.json | 3 +- .../blocks/radon_lamp_block.json | 3 +- .../blocks/rhenium_metal_block.json | 3 +- .../blocks/rhodium_metal_block.json | 3 +- .../blocks/rubidium_metal_block.json | 3 +- .../blocks/ruthenium_metal_block.json | 3 +- .../blocks/samarium_metal_block.json | 3 +- .../blocks/scandium_metal_block.json | 3 +- .../blocks/silver_metal_block.json | 3 +- .../blocks/sodium_metal_block.json | 3 +- .../blocks/strontium_metal_block.json | 3 +- .../blocks/tantalum_metal_block.json | 3 +- .../blocks/terbium_metal_block.json | 3 +- .../blocks/thallium_metal_block.json | 3 +- .../blocks/thorium_metal_block.json | 3 +- .../blocks/thulium_metal_block.json | 3 +- .../blocks/tin_metal_block.json | 3 +- .../blocks/titanium_metal_block.json | 3 +- .../blocks/tungsten_metal_block.json | 3 +- .../blocks/uranium_metal_block.json | 3 +- .../blocks/vanadium_metal_block.json | 3 +- .../blocks/xenon_lamp_block.json | 3 +- .../blocks/ytterbium_metal_block.json | 3 +- .../blocks/yttrium_metal_block.json | 3 +- .../blocks/zinc_metal_block.json | 3 +- .../blocks/zirconium_metal_block.json | 3 +- .../actinium_block_to_ingot.json | 2 +- ...ium_ingot_from_blasting_actinium_dust.json | 5 +- ...ium_ingot_from_smelting_actinium_dust.json | 5 +- .../actinium_ingot_to_block.json | 3 +- .../actinium_ingot_to_nugget.json | 2 +- .../actinium_nugget_to_ingot.json | 3 +- .../aluminum_block_to_ingot.json | 2 +- ...num_ingot_from_blasting_aluminum_dust.json | 5 +- ...num_ingot_from_smelting_aluminum_dust.json | 5 +- .../aluminum_ingot_to_block.json | 3 +- .../aluminum_ingot_to_nugget.json | 2 +- .../aluminum_nugget_to_ingot.json | 3 +- .../{recipes => recipe}/argon_lamp_block.json | 5 +- .../barium_block_to_ingot.json | 2 +- ...arium_ingot_from_blasting_barium_dust.json | 5 +- ...arium_ingot_from_smelting_barium_dust.json | 5 +- .../barium_ingot_to_block.json | 3 +- .../barium_ingot_to_nugget.json | 2 +- .../barium_nugget_to_ingot.json | 3 +- .../beryllium_block_to_ingot.json | 2 +- ...um_ingot_from_blasting_beryllium_dust.json | 5 +- ...um_ingot_from_smelting_beryllium_dust.json | 5 +- .../beryllium_ingot_to_block.json | 3 +- .../beryllium_ingot_to_nugget.json | 2 +- .../beryllium_nugget_to_ingot.json | 3 +- .../bismuth_block_to_ingot.json | 2 +- ...muth_ingot_from_blasting_bismuth_dust.json | 5 +- ...muth_ingot_from_smelting_bismuth_dust.json | 5 +- .../bismuth_ingot_to_block.json | 3 +- .../bismuth_ingot_to_nugget.json | 2 +- .../bismuth_nugget_to_ingot.json | 3 +- .../cadmium_block_to_ingot.json | 2 +- ...mium_ingot_from_blasting_cadmium_dust.json | 5 +- ...mium_ingot_from_smelting_cadmium_dust.json | 5 +- .../cadmium_ingot_to_block.json | 3 +- .../cadmium_ingot_to_nugget.json | 2 +- .../cadmium_nugget_to_ingot.json | 3 +- .../calcium_block_to_ingot.json | 2 +- ...cium_ingot_from_blasting_calcium_dust.json | 5 +- ...cium_ingot_from_smelting_calcium_dust.json | 5 +- .../calcium_ingot_to_block.json | 3 +- .../calcium_ingot_to_nugget.json | 2 +- .../calcium_nugget_to_ingot.json | 3 +- .../cerium_block_to_ingot.json | 2 +- ...erium_ingot_from_blasting_cerium_dust.json | 5 +- ...erium_ingot_from_smelting_cerium_dust.json | 5 +- .../cerium_ingot_to_block.json | 3 +- .../cerium_ingot_to_nugget.json | 2 +- .../cerium_nugget_to_ingot.json | 3 +- .../cesium_block_to_ingot.json | 2 +- ...esium_ingot_from_blasting_cesium_dust.json | 5 +- ...esium_ingot_from_smelting_cesium_dust.json | 5 +- .../cesium_ingot_to_block.json | 3 +- .../cesium_ingot_to_nugget.json | 2 +- .../cesium_nugget_to_ingot.json | 3 +- .../chromium_block_to_ingot.json | 2 +- ...ium_ingot_from_blasting_chromium_dust.json | 5 +- ...ium_ingot_from_smelting_chromium_dust.json | 5 +- .../chromium_ingot_to_block.json | 3 +- .../chromium_ingot_to_nugget.json | 2 +- .../chromium_nugget_to_ingot.json | 3 +- .../cobalt_block_to_ingot.json | 2 +- ...obalt_ingot_from_blasting_cobalt_dust.json | 5 +- ...obalt_ingot_from_smelting_cobalt_dust.json | 5 +- .../cobalt_ingot_to_block.json | 3 +- .../cobalt_ingot_to_nugget.json | 2 +- .../cobalt_nugget_to_ingot.json | 3 +- ...opper_ingot_from_blasting_copper_dust.json | 5 +- ...opper_ingot_from_smelting_copper_dust.json | 5 +- .../dysprosium_block_to_ingot.json | 2 +- ...m_ingot_from_blasting_dysprosium_dust.json | 5 +- ...m_ingot_from_smelting_dysprosium_dust.json | 5 +- .../dysprosium_ingot_to_block.json | 3 +- .../dysprosium_ingot_to_nugget.json | 2 +- .../dysprosium_nugget_to_ingot.json | 3 +- .../erbium_block_to_ingot.json | 2 +- ...rbium_ingot_from_blasting_erbium_dust.json | 5 +- ...rbium_ingot_from_smelting_erbium_dust.json | 5 +- .../erbium_ingot_to_block.json | 3 +- .../erbium_ingot_to_nugget.json | 2 +- .../erbium_nugget_to_ingot.json | 3 +- .../europium_block_to_ingot.json | 2 +- ...ium_ingot_from_blasting_europium_dust.json | 5 +- ...ium_ingot_from_smelting_europium_dust.json | 5 +- .../europium_ingot_to_block.json | 3 +- .../europium_ingot_to_nugget.json | 2 +- .../europium_nugget_to_ingot.json | 3 +- .../francium_block_to_ingot.json | 2 +- ...ium_ingot_from_blasting_francium_dust.json | 5 +- ...ium_ingot_from_smelting_francium_dust.json | 5 +- .../francium_ingot_to_block.json | 3 +- .../francium_ingot_to_nugget.json | 2 +- .../francium_nugget_to_ingot.json | 3 +- .../gadolinium_block_to_ingot.json | 2 +- ...m_ingot_from_blasting_gadolinium_dust.json | 5 +- ...m_ingot_from_smelting_gadolinium_dust.json | 5 +- .../gadolinium_ingot_to_block.json | 3 +- .../gadolinium_ingot_to_nugget.json | 2 +- .../gadolinium_nugget_to_ingot.json | 3 +- .../gallium_block_to_ingot.json | 2 +- ...lium_ingot_from_blasting_gallium_dust.json | 5 +- ...lium_ingot_from_smelting_gallium_dust.json | 5 +- .../gallium_ingot_to_block.json | 3 +- .../gallium_ingot_to_nugget.json | 2 +- .../gallium_nugget_to_ingot.json | 3 +- .../gold_ingot_from_blasting_gold_dust.json | 5 +- .../gold_ingot_from_smelting_gold_dust.json | 5 +- .../hafnium_block_to_ingot.json | 2 +- ...nium_ingot_from_blasting_hafnium_dust.json | 5 +- ...nium_ingot_from_smelting_hafnium_dust.json | 5 +- .../hafnium_ingot_to_block.json | 3 +- .../hafnium_ingot_to_nugget.json | 2 +- .../hafnium_nugget_to_ingot.json | 3 +- .../helium_lamp_block.json | 5 +- .../holmium_block_to_ingot.json | 2 +- ...mium_ingot_from_blasting_holmium_dust.json | 5 +- ...mium_ingot_from_smelting_holmium_dust.json | 5 +- .../holmium_ingot_to_block.json | 3 +- .../holmium_ingot_to_nugget.json | 2 +- .../holmium_nugget_to_ingot.json | 3 +- .../indium_block_to_ingot.json | 2 +- ...ndium_ingot_from_blasting_indium_dust.json | 5 +- ...ndium_ingot_from_smelting_indium_dust.json | 5 +- .../indium_ingot_to_block.json | 3 +- .../indium_ingot_to_nugget.json | 2 +- .../indium_nugget_to_ingot.json | 3 +- .../iridium_block_to_ingot.json | 2 +- ...dium_ingot_from_blasting_iridium_dust.json | 5 +- ...dium_ingot_from_smelting_iridium_dust.json | 5 +- .../iridium_ingot_to_block.json | 3 +- .../iridium_ingot_to_nugget.json | 2 +- .../iridium_nugget_to_ingot.json | 3 +- .../iron_ingot_from_blasting_iron_dust.json | 5 +- .../iron_ingot_from_smelting_iron_dust.json | 5 +- .../krypton_lamp_block.json | 5 +- .../lanthanum_block_to_ingot.json | 2 +- ...um_ingot_from_blasting_lanthanum_dust.json | 5 +- ...um_ingot_from_smelting_lanthanum_dust.json | 5 +- .../lanthanum_ingot_to_block.json | 3 +- .../lanthanum_ingot_to_nugget.json | 2 +- .../lanthanum_nugget_to_ingot.json | 3 +- .../lead_block_to_ingot.json | 2 +- .../lead_ingot_from_blasting_lead_dust.json | 5 +- .../lead_ingot_from_smelting_lead_dust.json | 5 +- .../lead_ingot_to_block.json | 3 +- .../lead_ingot_to_nugget.json | 2 +- .../lead_nugget_to_ingot.json | 3 +- .../lithium_block_to_ingot.json | 2 +- ...hium_ingot_from_blasting_lithium_dust.json | 5 +- ...hium_ingot_from_smelting_lithium_dust.json | 5 +- .../lithium_ingot_to_block.json | 3 +- .../lithium_ingot_to_nugget.json | 2 +- .../lithium_nugget_to_ingot.json | 3 +- .../lutetium_block_to_ingot.json | 2 +- ...ium_ingot_from_blasting_lutetium_dust.json | 5 +- ...ium_ingot_from_smelting_lutetium_dust.json | 5 +- .../lutetium_ingot_to_block.json | 3 +- .../lutetium_ingot_to_nugget.json | 2 +- .../lutetium_nugget_to_ingot.json | 3 +- .../magnesium_block_to_ingot.json | 2 +- ...um_ingot_from_blasting_magnesium_dust.json | 5 +- ...um_ingot_from_smelting_magnesium_dust.json | 5 +- .../magnesium_ingot_to_block.json | 3 +- .../magnesium_ingot_to_nugget.json | 2 +- .../magnesium_nugget_to_ingot.json | 3 +- .../manganese_block_to_ingot.json | 2 +- ...se_ingot_from_blasting_manganese_dust.json | 5 +- ...se_ingot_from_smelting_manganese_dust.json | 5 +- .../manganese_ingot_to_block.json | 3 +- .../manganese_ingot_to_nugget.json | 2 +- .../manganese_nugget_to_ingot.json | 3 +- .../molybdenum_block_to_ingot.json | 2 +- ...m_ingot_from_blasting_molybdenum_dust.json | 5 +- ...m_ingot_from_smelting_molybdenum_dust.json | 5 +- .../molybdenum_ingot_to_block.json | 3 +- .../molybdenum_ingot_to_nugget.json | 2 +- .../molybdenum_nugget_to_ingot.json | 3 +- .../neodymium_block_to_ingot.json | 2 +- ...um_ingot_from_blasting_neodymium_dust.json | 5 +- ...um_ingot_from_smelting_neodymium_dust.json | 5 +- .../neodymium_ingot_to_block.json | 3 +- .../neodymium_ingot_to_nugget.json | 2 +- .../neodymium_nugget_to_ingot.json | 3 +- .../{recipes => recipe}/neon_lamp_block.json | 5 +- .../nickel_block_to_ingot.json | 2 +- ...ickel_ingot_from_blasting_nickel_dust.json | 5 +- ...ickel_ingot_from_smelting_nickel_dust.json | 5 +- .../nickel_ingot_to_block.json | 3 +- .../nickel_ingot_to_nugget.json | 2 +- .../nickel_nugget_to_ingot.json | 3 +- .../niobium_block_to_ingot.json | 2 +- ...bium_ingot_from_blasting_niobium_dust.json | 5 +- ...bium_ingot_from_smelting_niobium_dust.json | 5 +- .../niobium_ingot_to_block.json | 3 +- .../niobium_ingot_to_nugget.json | 2 +- .../niobium_nugget_to_ingot.json | 3 +- .../osmium_block_to_ingot.json | 2 +- ...smium_ingot_from_blasting_osmium_dust.json | 5 +- ...smium_ingot_from_smelting_osmium_dust.json | 5 +- .../osmium_ingot_to_block.json | 3 +- .../osmium_ingot_to_nugget.json | 2 +- .../osmium_nugget_to_ingot.json | 3 +- .../palladium_block_to_ingot.json | 2 +- ...um_ingot_from_blasting_palladium_dust.json | 5 +- ...um_ingot_from_smelting_palladium_dust.json | 5 +- .../palladium_ingot_to_block.json | 3 +- .../palladium_ingot_to_nugget.json | 2 +- .../palladium_nugget_to_ingot.json | 3 +- .../{recipes => recipe}/periodic_table.json | 3 +- .../platinum_block_to_ingot.json | 2 +- ...num_ingot_from_blasting_platinum_dust.json | 5 +- ...num_ingot_from_smelting_platinum_dust.json | 5 +- .../platinum_ingot_to_block.json | 3 +- .../platinum_ingot_to_nugget.json | 2 +- .../platinum_nugget_to_ingot.json | 3 +- .../polonium_block_to_ingot.json | 2 +- ...ium_ingot_from_blasting_polonium_dust.json | 5 +- ...ium_ingot_from_smelting_polonium_dust.json | 5 +- .../polonium_ingot_to_block.json | 3 +- .../polonium_ingot_to_nugget.json | 2 +- .../polonium_nugget_to_ingot.json | 3 +- .../potassium_block_to_ingot.json | 2 +- ...um_ingot_from_blasting_potassium_dust.json | 5 +- ...um_ingot_from_smelting_potassium_dust.json | 5 +- .../potassium_ingot_to_block.json | 3 +- .../potassium_ingot_to_nugget.json | 2 +- .../potassium_nugget_to_ingot.json | 3 +- .../praseodymium_block_to_ingot.json | 2 +- ...ingot_from_blasting_praseodymium_dust.json | 5 +- ...ingot_from_smelting_praseodymium_dust.json | 5 +- .../praseodymium_ingot_to_block.json | 3 +- .../praseodymium_ingot_to_nugget.json | 2 +- .../praseodymium_nugget_to_ingot.json | 3 +- .../protactinium_block_to_ingot.json | 2 +- ...ingot_from_blasting_protactinium_dust.json | 5 +- ...ingot_from_smelting_protactinium_dust.json | 5 +- .../protactinium_ingot_to_block.json | 3 +- .../protactinium_ingot_to_nugget.json | 2 +- .../protactinium_nugget_to_ingot.json | 3 +- .../radium_block_to_ingot.json | 2 +- ...adium_ingot_from_blasting_radium_dust.json | 5 +- ...adium_ingot_from_smelting_radium_dust.json | 5 +- .../radium_ingot_to_block.json | 3 +- .../radium_ingot_to_nugget.json | 2 +- .../radium_nugget_to_ingot.json | 3 +- .../{recipes => recipe}/radon_lamp_block.json | 5 +- .../rhenium_block_to_ingot.json | 2 +- ...nium_ingot_from_blasting_rhenium_dust.json | 5 +- ...nium_ingot_from_smelting_rhenium_dust.json | 5 +- .../rhenium_ingot_to_block.json | 3 +- .../rhenium_ingot_to_nugget.json | 2 +- .../rhenium_nugget_to_ingot.json | 3 +- .../rhodium_block_to_ingot.json | 2 +- ...dium_ingot_from_blasting_rhodium_dust.json | 5 +- ...dium_ingot_from_smelting_rhodium_dust.json | 5 +- .../rhodium_ingot_to_block.json | 3 +- .../rhodium_ingot_to_nugget.json | 2 +- .../rhodium_nugget_to_ingot.json | 3 +- .../rubidium_block_to_ingot.json | 2 +- ...ium_ingot_from_blasting_rubidium_dust.json | 5 +- ...ium_ingot_from_smelting_rubidium_dust.json | 5 +- .../rubidium_ingot_to_block.json | 3 +- .../rubidium_ingot_to_nugget.json | 2 +- .../rubidium_nugget_to_ingot.json | 3 +- .../ruthenium_block_to_ingot.json | 2 +- ...um_ingot_from_blasting_ruthenium_dust.json | 5 +- ...um_ingot_from_smelting_ruthenium_dust.json | 5 +- .../ruthenium_ingot_to_block.json | 3 +- .../ruthenium_ingot_to_nugget.json | 2 +- .../ruthenium_nugget_to_ingot.json | 3 +- .../samarium_block_to_ingot.json | 2 +- ...ium_ingot_from_blasting_samarium_dust.json | 5 +- ...ium_ingot_from_smelting_samarium_dust.json | 5 +- .../samarium_ingot_to_block.json | 3 +- .../samarium_ingot_to_nugget.json | 2 +- .../samarium_nugget_to_ingot.json | 3 +- .../scandium_block_to_ingot.json | 2 +- ...ium_ingot_from_blasting_scandium_dust.json | 5 +- ...ium_ingot_from_smelting_scandium_dust.json | 5 +- .../scandium_ingot_to_block.json | 3 +- .../scandium_ingot_to_nugget.json | 2 +- .../scandium_nugget_to_ingot.json | 3 +- .../silver_block_to_ingot.json | 2 +- ...ilver_ingot_from_blasting_silver_dust.json | 5 +- ...ilver_ingot_from_smelting_silver_dust.json | 5 +- .../silver_ingot_to_block.json | 3 +- .../silver_ingot_to_nugget.json | 2 +- .../silver_nugget_to_ingot.json | 3 +- .../sodium_block_to_ingot.json | 2 +- ...odium_ingot_from_blasting_sodium_dust.json | 5 +- ...odium_ingot_from_smelting_sodium_dust.json | 5 +- .../sodium_ingot_to_block.json | 3 +- .../sodium_ingot_to_nugget.json | 2 +- .../sodium_nugget_to_ingot.json | 3 +- .../strontium_block_to_ingot.json | 2 +- ...um_ingot_from_blasting_strontium_dust.json | 5 +- ...um_ingot_from_smelting_strontium_dust.json | 5 +- .../strontium_ingot_to_block.json | 3 +- .../strontium_ingot_to_nugget.json | 2 +- .../strontium_nugget_to_ingot.json | 3 +- .../tantalum_block_to_ingot.json | 2 +- ...lum_ingot_from_blasting_tantalum_dust.json | 5 +- ...lum_ingot_from_smelting_tantalum_dust.json | 5 +- .../tantalum_ingot_to_block.json | 3 +- .../tantalum_ingot_to_nugget.json | 2 +- .../tantalum_nugget_to_ingot.json | 3 +- .../terbium_block_to_ingot.json | 2 +- ...bium_ingot_from_blasting_terbium_dust.json | 5 +- ...bium_ingot_from_smelting_terbium_dust.json | 5 +- .../terbium_ingot_to_block.json | 3 +- .../terbium_ingot_to_nugget.json | 2 +- .../terbium_nugget_to_ingot.json | 3 +- .../thallium_block_to_ingot.json | 2 +- ...ium_ingot_from_blasting_thallium_dust.json | 5 +- ...ium_ingot_from_smelting_thallium_dust.json | 5 +- .../thallium_ingot_to_block.json | 3 +- .../thallium_ingot_to_nugget.json | 2 +- .../thallium_nugget_to_ingot.json | 3 +- .../thorium_block_to_ingot.json | 2 +- ...rium_ingot_from_blasting_thorium_dust.json | 5 +- ...rium_ingot_from_smelting_thorium_dust.json | 5 +- .../thorium_ingot_to_block.json | 3 +- .../thorium_ingot_to_nugget.json | 2 +- .../thorium_nugget_to_ingot.json | 3 +- .../thulium_block_to_ingot.json | 2 +- ...lium_ingot_from_blasting_thulium_dust.json | 5 +- ...lium_ingot_from_smelting_thulium_dust.json | 5 +- .../thulium_ingot_to_block.json | 3 +- .../thulium_ingot_to_nugget.json | 2 +- .../thulium_nugget_to_ingot.json | 3 +- .../tin_block_to_ingot.json | 2 +- .../tin_ingot_from_blasting_tin_dust.json | 5 +- .../tin_ingot_from_smelting_tin_dust.json | 5 +- .../tin_ingot_to_block.json | 3 +- .../tin_ingot_to_nugget.json | 2 +- .../tin_nugget_to_ingot.json | 3 +- .../titanium_block_to_ingot.json | 2 +- ...ium_ingot_from_blasting_titanium_dust.json | 5 +- ...ium_ingot_from_smelting_titanium_dust.json | 5 +- .../titanium_ingot_to_block.json | 3 +- .../titanium_ingot_to_nugget.json | 2 +- .../titanium_nugget_to_ingot.json | 3 +- .../tungsten_block_to_ingot.json | 2 +- ...ten_ingot_from_blasting_tungsten_dust.json | 5 +- ...ten_ingot_from_smelting_tungsten_dust.json | 5 +- .../tungsten_ingot_to_block.json | 3 +- .../tungsten_ingot_to_nugget.json | 2 +- .../tungsten_nugget_to_ingot.json | 3 +- .../uranium_block_to_ingot.json | 2 +- ...nium_ingot_from_blasting_uranium_dust.json | 5 +- ...nium_ingot_from_smelting_uranium_dust.json | 5 +- .../uranium_ingot_to_block.json | 3 +- .../uranium_ingot_to_nugget.json | 2 +- .../uranium_nugget_to_ingot.json | 3 +- .../vanadium_block_to_ingot.json | 2 +- ...ium_ingot_from_blasting_vanadium_dust.json | 5 +- ...ium_ingot_from_smelting_vanadium_dust.json | 5 +- .../vanadium_ingot_to_block.json | 3 +- .../vanadium_ingot_to_nugget.json | 2 +- .../vanadium_nugget_to_ingot.json | 3 +- .../{recipes => recipe}/xenon_lamp_block.json | 5 +- .../ytterbium_block_to_ingot.json | 2 +- ...um_ingot_from_blasting_ytterbium_dust.json | 5 +- ...um_ingot_from_smelting_ytterbium_dust.json | 5 +- .../ytterbium_ingot_to_block.json | 3 +- .../ytterbium_ingot_to_nugget.json | 2 +- .../ytterbium_nugget_to_ingot.json | 3 +- .../yttrium_block_to_ingot.json | 2 +- ...rium_ingot_from_blasting_yttrium_dust.json | 5 +- ...rium_ingot_from_smelting_yttrium_dust.json | 5 +- .../yttrium_ingot_to_block.json | 3 +- .../yttrium_ingot_to_nugget.json | 2 +- .../yttrium_nugget_to_ingot.json | 3 +- .../zinc_block_to_ingot.json | 2 +- .../zinc_ingot_from_blasting_zinc_dust.json | 5 +- .../zinc_ingot_from_smelting_zinc_dust.json | 5 +- .../zinc_ingot_to_block.json | 3 +- .../zinc_ingot_to_nugget.json | 2 +- .../zinc_nugget_to_ingot.json | 3 +- .../zirconium_block_to_ingot.json | 2 +- ...um_ingot_from_blasting_zirconium_dust.json | 5 +- ...um_ingot_from_smelting_zirconium_dust.json | 5 +- .../zirconium_ingot_to_block.json | 3 +- .../zirconium_ingot_to_nugget.json | 2 +- .../zirconium_nugget_to_ingot.json | 3 +- .../{blocks => block}/mineable/pickaxe.json | 0 .../{blocks => block}/needs_stone_tool.json | 0 .../com/smashingmods/chemlib/ChemLib.java | 25 ++-- .../java/com/smashingmods/chemlib/Config.java | 28 ++-- .../smashingmods/chemlib/api/Chemical.java | 9 +- .../utility/FluidEffectsTooltipUtility.java | 129 ++++++++-------- .../chemlib/client/AbbreviationRenderer.java | 22 ++- .../chemlib/client/PeriodicTableScreen.java | 10 +- .../client/events/ClientEventHandler.java | 31 ++-- ...Handler.java => NeoForgeEventHandler.java} | 24 +-- .../chemlib/client/jei/JEIPlugin.java | 2 +- .../chemlib/common/blocks/ChemicalBlock.java | 4 +- .../common/blocks/ChemicalLiquidBlock.java | 3 +- .../common/items/ChemicalBlockItem.java | 14 +- .../chemlib/common/items/ChemicalItem.java | 26 ++-- .../chemlib/common/items/CompoundItem.java | 18 +-- .../chemlib/common/items/ElementItem.java | 22 ++- .../common/items/PeriodicTableItem.java | 4 +- .../chemlib/datagen/BlockLootTables.java | 26 ++-- .../chemlib/datagen/BlockStateGenerator.java | 8 +- .../chemlib/datagen/BlockTagGenerator.java | 13 +- .../chemlib/datagen/DataGenerators.java | 14 +- .../chemlib/datagen/FluidTagGenerator.java | 2 +- .../chemlib/datagen/ItemModelGenerator.java | 8 +- .../chemlib/datagen/ItemTagGenerator.java | 25 ++-- .../datagen/LocalizationGenerator.java | 6 +- .../chemlib/datagen/LootTableGenerator.java | 6 +- .../chemlib/datagen/RecipeGenerator.java | 40 ++--- .../chemlib/registry/BlockRegistry.java | 11 +- .../chemlib/registry/ChemicalRegistry.java | 28 ++-- .../chemlib/registry/FluidRegistry.java | 95 ++++++------ .../chemlib/registry/ItemRegistry.java | 66 +++++---- .../chemlib/registry/PaintingsRegistry.java | 10 +- .../chemlib/registry/Registry.java | 2 +- .../chemlib/registry/TabsRegistry.java | 22 ++- .../{mods.toml => neoforge.mods.toml} | 4 +- src/main/resources/pack.mcmeta | 2 +- 1413 files changed, 3487 insertions(+), 3650 deletions(-) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/actinium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/aluminum.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/barium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/beryllium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/bismuth.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/cadmium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/calcium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/cerium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/cesium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/chromium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/cobalt.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/dysprosium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/erbium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/europium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/francium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/gadolinium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/gallium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/hafnium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/holmium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/indium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/iridium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/lanthanum.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/lead.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/lithium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/lutetium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/magnesium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/manganese.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/molybdenum.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/neodymium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/nickel.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/niobium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/osmium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/palladium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/platinum.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/polonium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/potassium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/praseodymium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/protactinium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/radium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/rhenium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/rhodium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/rubidium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/ruthenium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/samarium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/scandium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/silver.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/sodium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/strontium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/tantalum.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/terbium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/thallium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/thorium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/thulium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/tin.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/titanium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/tungsten.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/uranium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/vanadium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/ytterbium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/yttrium.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/zinc.json (100%) rename src/generated/resources/data/{forge/tags/blocks => c/tags/block}/storage_blocks/zirconium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/acetylsalicylic_acid.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/actinium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/aluminum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/aluminum_hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/aluminum_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/aluminum_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/amide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/ammonium_chloride.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/antimony.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/antimony_trioxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/antimony_trisulfide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/arsenic.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/astatine.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/barium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/barium_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/barium_chloride.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/barium_hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/barium_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/barium_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/barium_sulfide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/beryl.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/beryllium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/beryllium_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/beryllium_chloride.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/beryllium_hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/beryllium_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/beryllium_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/beryllium_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/beta_carotene.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/bismuth.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/boron.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cadmium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cadmium_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cadmium_hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cadmium_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cadmium_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cadmium_sulfide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/caffeine.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/calcium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/calcium_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/calcium_chloride.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/calcium_hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/calcium_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/calcium_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/calcium_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/carbon.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cellulose.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cerium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cesium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cesium_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cesium_chloride.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cesium_hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cesium_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cesium_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/chitin.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/chromium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/chromium_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cinnabar.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cobalt.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cobalt_aluminate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cobalt_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cobalt_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cobalt_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/copper.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/copper_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/copper_i_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/copper_i_sulfide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/copper_ii_hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/copper_ii_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/copper_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/cucurbitacin.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/diammonium_phosphate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/dysprosium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/erbium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/europium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/francium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/gadolinium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/gallium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/germanium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/gold.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/graphite.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/hafnium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/holmium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/indium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/iodine.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/iridium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/iron.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/iron_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/iron_disulfide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/iron_ii_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/iron_ii_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/iron_iii_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/iron_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/keratin.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/lanthanum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/lead.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/lead_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/lead_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/lead_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/lead_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/lead_sulfide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/lithium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/lithium_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/lithium_chloride.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/lithium_hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/lithium_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/lithium_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/lithium_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/lutetium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/magnesium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/magnesium_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/magnesium_chloride.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/magnesium_hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/magnesium_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/magnesium_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/manganese.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/manganese_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/manganese_hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/manganese_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/manganese_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/manganese_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/mercury_sulfide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/molybdenum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/mullite.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/neodymium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/nickel.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/nickel_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/nickel_chloride.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/nickel_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/nickel_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/nickel_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/nickel_sulfide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/niobium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/niter.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/osmium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/palladium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/phosphate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/phosphoric_acid.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/phosphorus.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/platinum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/polonium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/polyvinyl_chloride.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/potassium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/potassium_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/potassium_chloride.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/potassium_cyanide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/potassium_ethyl_xanthate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/potassium_hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/potassium_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/potassium_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/potassium_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/praseodymium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/protactinium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/radium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/rhenium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/rhodium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/rubidium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/rubidium_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/rubidium_chloride.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/rubidium_hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/rubidium_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/rubidium_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/rubidium_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/ruthenium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/samarium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/scandium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/selenium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/silicon.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/silver.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/sodium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/sodium_bisulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/sodium_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/sodium_chloride.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/sodium_hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/sodium_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/sodium_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/sodium_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/starch.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/strontium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/strontium_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/strontium_chloride.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/strontium_hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/strontium_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/strontium_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/strontium_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/sucrose.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/sulfur.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/tantalum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/tellurium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/terbium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/thallium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/thorium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/thulium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/tin.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/tin_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/tin_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/titanium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/triglyceride.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/tungsten.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/uranium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/urea.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/vanadium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/ytterbium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/yttrium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/zinc.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/zinc_carbonate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/zinc_hydroxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/zinc_nitrate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/zinc_oxide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/zinc_sulfate.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/zinc_sulfide.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/dusts/zirconium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/actinium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/aluminum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/barium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/beryllium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/bismuth.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/cadmium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/calcium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/cerium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/cesium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/chromium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/cobalt.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/dysprosium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/erbium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/europium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/francium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/gadolinium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/gallium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/hafnium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/holmium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/indium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/iridium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/lanthanum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/lead.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/lithium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/lutetium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/magnesium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/manganese.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/molybdenum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/neodymium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/nickel.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/niobium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/osmium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/palladium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/platinum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/polonium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/potassium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/praseodymium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/protactinium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/radium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/rhenium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/rhodium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/rubidium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/ruthenium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/samarium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/scandium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/silver.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/sodium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/strontium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/tantalum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/terbium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/thallium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/thorium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/thulium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/tin.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/titanium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/tungsten.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/uranium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/vanadium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/ytterbium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/yttrium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/zinc.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/ingots/zirconium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/actinium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/aluminum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/barium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/beryllium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/bismuth.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/cadmium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/calcium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/cerium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/cesium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/chromium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/cobalt.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/dysprosium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/erbium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/europium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/francium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/gadolinium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/gallium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/hafnium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/holmium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/indium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/iridium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/lanthanum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/lead.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/lithium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/lutetium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/magnesium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/manganese.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/molybdenum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/neodymium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/nickel.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/niobium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/osmium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/palladium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/platinum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/polonium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/potassium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/praseodymium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/protactinium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/radium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/rhenium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/rhodium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/rubidium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/ruthenium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/samarium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/scandium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/silver.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/sodium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/strontium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/tantalum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/terbium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/thallium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/thorium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/thulium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/tin.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/titanium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/tungsten.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/uranium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/vanadium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/ytterbium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/yttrium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/zinc.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/nuggets/zirconium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/actinium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/aluminum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/barium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/beryllium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/bismuth.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/cadmium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/calcium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/cerium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/cesium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/chromium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/cobalt.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/copper.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/dysprosium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/erbium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/europium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/francium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/gadolinium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/gallium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/gold.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/hafnium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/holmium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/indium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/iridium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/iron.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/lanthanum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/lead.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/lithium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/lutetium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/magnesium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/manganese.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/molybdenum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/neodymium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/nickel.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/niobium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/osmium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/palladium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/platinum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/polonium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/polyvinyl_chloride.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/potassium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/praseodymium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/protactinium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/radium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/rhenium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/rhodium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/rubidium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/ruthenium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/samarium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/scandium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/silver.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/sodium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/strontium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/tantalum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/terbium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/thallium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/thorium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/thulium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/tin.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/titanium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/tungsten.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/uranium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/vanadium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/ytterbium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/yttrium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/zinc.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/plates/zirconium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/sawdust.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/actinium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/aluminum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/barium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/beryllium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/bismuth.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/cadmium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/calcium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/cerium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/cesium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/chromium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/cobalt.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/dysprosium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/erbium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/europium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/francium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/gadolinium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/gallium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/hafnium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/holmium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/indium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/iridium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/lanthanum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/lead.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/lithium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/lutetium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/magnesium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/manganese.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/molybdenum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/neodymium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/nickel.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/niobium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/osmium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/palladium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/platinum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/polonium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/potassium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/praseodymium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/protactinium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/radium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/rhenium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/rhodium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/rubidium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/ruthenium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/samarium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/scandium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/silver.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/sodium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/strontium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/tantalum.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/terbium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/thallium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/thorium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/thulium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/tin.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/titanium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/tungsten.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/uranium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/vanadium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/ytterbium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/yttrium.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/zinc.json (100%) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/storage_blocks/zirconium.json (100%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/actinium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/actinium_ingot_from_blasting_actinium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/actinium_ingot_from_smelting_actinium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/actinium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/actinium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/actinium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/aluminum_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/aluminum_ingot_from_blasting_aluminum_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/aluminum_ingot_from_smelting_aluminum_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/aluminum_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/aluminum_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/aluminum_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/argon_lamp_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/barium_block_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/barium_ingot_from_blasting_barium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/barium_ingot_from_smelting_barium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/barium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/barium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/barium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/beryllium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/beryllium_ingot_from_blasting_beryllium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/beryllium_ingot_from_smelting_beryllium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/beryllium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/beryllium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/beryllium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/bismuth_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/bismuth_ingot_from_blasting_bismuth_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/bismuth_ingot_from_smelting_bismuth_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/bismuth_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/bismuth_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/bismuth_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cadmium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cadmium_ingot_from_blasting_cadmium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cadmium_ingot_from_smelting_cadmium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cadmium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cadmium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cadmium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/calcium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/calcium_ingot_from_blasting_calcium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/calcium_ingot_from_smelting_calcium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/calcium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/calcium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/calcium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cerium_block_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cerium_ingot_from_blasting_cerium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cerium_ingot_from_smelting_cerium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cerium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cerium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cerium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cesium_block_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cesium_ingot_from_blasting_cesium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cesium_ingot_from_smelting_cesium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cesium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cesium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cesium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/chromium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/chromium_ingot_from_blasting_chromium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/chromium_ingot_from_smelting_chromium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/chromium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/chromium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/chromium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cobalt_block_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cobalt_ingot_from_blasting_cobalt_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cobalt_ingot_from_smelting_cobalt_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cobalt_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cobalt_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/cobalt_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/copper_ingot_from_blasting_copper_dust.json (81%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/copper_ingot_from_smelting_copper_dust.json (81%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/dysprosium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/dysprosium_ingot_from_blasting_dysprosium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/dysprosium_ingot_from_smelting_dysprosium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/dysprosium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/dysprosium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/dysprosium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/erbium_block_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/erbium_ingot_from_blasting_erbium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/erbium_ingot_from_smelting_erbium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/erbium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/erbium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/erbium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/europium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/europium_ingot_from_blasting_europium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/europium_ingot_from_smelting_europium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/europium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/europium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/europium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/francium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/francium_ingot_from_blasting_francium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/francium_ingot_from_smelting_francium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/francium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/francium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/francium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/gadolinium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/gadolinium_ingot_from_blasting_gadolinium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/gadolinium_ingot_from_smelting_gadolinium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/gadolinium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/gadolinium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/gadolinium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/gallium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/gallium_ingot_from_blasting_gallium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/gallium_ingot_from_smelting_gallium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/gallium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/gallium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/gallium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/gold_ingot_from_blasting_gold_dust.json (82%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/gold_ingot_from_smelting_gold_dust.json (82%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/hafnium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/hafnium_ingot_from_blasting_hafnium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/hafnium_ingot_from_smelting_hafnium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/hafnium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/hafnium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/hafnium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/helium_lamp_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/holmium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/holmium_ingot_from_blasting_holmium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/holmium_ingot_from_smelting_holmium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/holmium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/holmium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/holmium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/indium_block_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/indium_ingot_from_blasting_indium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/indium_ingot_from_smelting_indium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/indium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/indium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/indium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/iridium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/iridium_ingot_from_blasting_iridium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/iridium_ingot_from_smelting_iridium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/iridium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/iridium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/iridium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/iron_ingot_from_blasting_iron_dust.json (82%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/iron_ingot_from_smelting_iron_dust.json (82%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/krypton_lamp_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lanthanum_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lanthanum_ingot_from_blasting_lanthanum_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lanthanum_ingot_from_smelting_lanthanum_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lanthanum_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lanthanum_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lanthanum_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lead_block_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lead_ingot_from_blasting_lead_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lead_ingot_from_smelting_lead_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lead_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lead_ingot_to_nugget.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lead_nugget_to_ingot.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lithium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lithium_ingot_from_blasting_lithium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lithium_ingot_from_smelting_lithium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lithium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lithium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lithium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lutetium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lutetium_ingot_from_blasting_lutetium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lutetium_ingot_from_smelting_lutetium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lutetium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lutetium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/lutetium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/magnesium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/magnesium_ingot_from_blasting_magnesium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/magnesium_ingot_from_smelting_magnesium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/magnesium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/magnesium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/magnesium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/manganese_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/manganese_ingot_from_blasting_manganese_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/manganese_ingot_from_smelting_manganese_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/manganese_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/manganese_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/manganese_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/molybdenum_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/molybdenum_ingot_from_blasting_molybdenum_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/molybdenum_ingot_from_smelting_molybdenum_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/molybdenum_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/molybdenum_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/molybdenum_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/neodymium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/neodymium_ingot_from_blasting_neodymium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/neodymium_ingot_from_smelting_neodymium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/neodymium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/neodymium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/neodymium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/neon_lamp_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/nickel_block_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/nickel_ingot_from_blasting_nickel_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/nickel_ingot_from_smelting_nickel_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/nickel_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/nickel_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/nickel_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/niobium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/niobium_ingot_from_blasting_niobium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/niobium_ingot_from_smelting_niobium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/niobium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/niobium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/niobium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/osmium_block_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/osmium_ingot_from_blasting_osmium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/osmium_ingot_from_smelting_osmium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/osmium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/osmium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/osmium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/palladium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/palladium_ingot_from_blasting_palladium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/palladium_ingot_from_smelting_palladium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/palladium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/palladium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/palladium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/periodic_table.json (80%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/platinum_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/platinum_ingot_from_blasting_platinum_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/platinum_ingot_from_smelting_platinum_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/platinum_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/platinum_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/platinum_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/polonium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/polonium_ingot_from_blasting_polonium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/polonium_ingot_from_smelting_polonium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/polonium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/polonium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/polonium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/potassium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/potassium_ingot_from_blasting_potassium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/potassium_ingot_from_smelting_potassium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/potassium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/potassium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/potassium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/praseodymium_block_to_ingot.json (76%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/praseodymium_ingot_from_blasting_praseodymium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/praseodymium_ingot_from_smelting_praseodymium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/praseodymium_ingot_to_block.json (76%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/praseodymium_ingot_to_nugget.json (76%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/praseodymium_nugget_to_ingot.json (76%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/protactinium_block_to_ingot.json (76%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/protactinium_ingot_from_blasting_protactinium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/protactinium_ingot_from_smelting_protactinium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/protactinium_ingot_to_block.json (76%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/protactinium_ingot_to_nugget.json (76%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/protactinium_nugget_to_ingot.json (76%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/radium_block_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/radium_ingot_from_blasting_radium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/radium_ingot_from_smelting_radium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/radium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/radium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/radium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/radon_lamp_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rhenium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rhenium_ingot_from_blasting_rhenium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rhenium_ingot_from_smelting_rhenium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rhenium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rhenium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rhenium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rhodium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rhodium_ingot_from_blasting_rhodium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rhodium_ingot_from_smelting_rhodium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rhodium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rhodium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rhodium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rubidium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rubidium_ingot_from_blasting_rubidium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rubidium_ingot_from_smelting_rubidium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rubidium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rubidium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/rubidium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/ruthenium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/ruthenium_ingot_from_blasting_ruthenium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/ruthenium_ingot_from_smelting_ruthenium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/ruthenium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/ruthenium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/ruthenium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/samarium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/samarium_ingot_from_blasting_samarium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/samarium_ingot_from_smelting_samarium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/samarium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/samarium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/samarium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/scandium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/scandium_ingot_from_blasting_scandium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/scandium_ingot_from_smelting_scandium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/scandium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/scandium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/scandium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/silver_block_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/silver_ingot_from_blasting_silver_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/silver_ingot_from_smelting_silver_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/silver_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/silver_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/silver_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/sodium_block_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/sodium_ingot_from_blasting_sodium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/sodium_ingot_from_smelting_sodium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/sodium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/sodium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/sodium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/strontium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/strontium_ingot_from_blasting_strontium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/strontium_ingot_from_smelting_strontium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/strontium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/strontium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/strontium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tantalum_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tantalum_ingot_from_blasting_tantalum_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tantalum_ingot_from_smelting_tantalum_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tantalum_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tantalum_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tantalum_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/terbium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/terbium_ingot_from_blasting_terbium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/terbium_ingot_from_smelting_terbium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/terbium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/terbium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/terbium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thallium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thallium_ingot_from_blasting_thallium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thallium_ingot_from_smelting_thallium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thallium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thallium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thallium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thorium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thorium_ingot_from_blasting_thorium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thorium_ingot_from_smelting_thorium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thorium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thorium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thorium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thulium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thulium_ingot_from_blasting_thulium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thulium_ingot_from_smelting_thulium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thulium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thulium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/thulium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tin_block_to_ingot.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tin_ingot_from_blasting_tin_dust.json (80%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tin_ingot_from_smelting_tin_dust.json (80%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tin_ingot_to_block.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tin_ingot_to_nugget.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tin_nugget_to_ingot.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/titanium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/titanium_ingot_from_blasting_titanium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/titanium_ingot_from_smelting_titanium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/titanium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/titanium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/titanium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tungsten_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tungsten_ingot_from_blasting_tungsten_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tungsten_ingot_from_smelting_tungsten_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tungsten_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tungsten_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/tungsten_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/uranium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/uranium_ingot_from_blasting_uranium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/uranium_ingot_from_smelting_uranium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/uranium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/uranium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/uranium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/vanadium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/vanadium_ingot_from_blasting_vanadium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/vanadium_ingot_from_smelting_vanadium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/vanadium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/vanadium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/vanadium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/xenon_lamp_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/ytterbium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/ytterbium_ingot_from_blasting_ytterbium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/ytterbium_ingot_from_smelting_ytterbium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/ytterbium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/ytterbium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/ytterbium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/yttrium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/yttrium_ingot_from_blasting_yttrium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/yttrium_ingot_from_smelting_yttrium_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/yttrium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/yttrium_ingot_to_nugget.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/yttrium_nugget_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/zinc_block_to_ingot.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/zinc_ingot_from_blasting_zinc_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/zinc_ingot_from_smelting_zinc_dust.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/zinc_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/zinc_ingot_to_nugget.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/zinc_nugget_to_ingot.json (79%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/zirconium_block_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/zirconium_ingot_from_blasting_zirconium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/zirconium_ingot_from_smelting_zirconium_dust.json (78%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/zirconium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/zirconium_ingot_to_nugget.json (77%) rename src/generated/resources/data/chemlib/{advancements => advancement}/recipes/misc/zirconium_nugget_to_ingot.json (77%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/actinium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/aluminum_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/argon_lamp_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/barium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/beryllium_metal_block.json (83%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/bismuth_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/cadmium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/calcium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/cerium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/cesium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/chromium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/cobalt_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/dysprosium_metal_block.json (83%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/erbium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/europium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/francium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/gadolinium_metal_block.json (83%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/gallium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/hafnium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/helium_lamp_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/holmium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/indium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/iridium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/krypton_lamp_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/lanthanum_metal_block.json (83%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/lead_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/lithium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/lutetium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/magnesium_metal_block.json (83%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/manganese_metal_block.json (83%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/molybdenum_metal_block.json (83%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/neodymium_metal_block.json (83%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/neon_lamp_block.json (85%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/nickel_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/niobium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/osmium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/palladium_metal_block.json (83%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/platinum_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/polonium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/potassium_metal_block.json (83%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/praseodymium_metal_block.json (83%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/protactinium_metal_block.json (83%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/radium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/radon_lamp_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/rhenium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/rhodium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/rubidium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/ruthenium_metal_block.json (83%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/samarium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/scandium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/silver_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/sodium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/strontium_metal_block.json (83%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/tantalum_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/terbium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/thallium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/thorium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/thulium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/tin_metal_block.json (85%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/titanium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/tungsten_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/uranium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/vanadium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/xenon_lamp_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/ytterbium_metal_block.json (83%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/yttrium_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/zinc_metal_block.json (84%) rename src/generated/resources/data/chemlib/{loot_tables => loot_table}/blocks/zirconium_metal_block.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/actinium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/actinium_ingot_from_blasting_actinium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/actinium_ingot_from_smelting_actinium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/actinium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/actinium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/actinium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/aluminum_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/aluminum_ingot_from_blasting_aluminum_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/aluminum_ingot_from_smelting_aluminum_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/aluminum_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/aluminum_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/aluminum_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/argon_lamp_block.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/barium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/barium_ingot_from_blasting_barium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/barium_ingot_from_smelting_barium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/barium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/barium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/barium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/beryllium_block_to_ingot.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/beryllium_ingot_from_blasting_beryllium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/beryllium_ingot_from_smelting_beryllium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/beryllium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/beryllium_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/beryllium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/bismuth_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/bismuth_ingot_from_blasting_bismuth_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/bismuth_ingot_from_smelting_bismuth_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/bismuth_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/bismuth_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/bismuth_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cadmium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cadmium_ingot_from_blasting_cadmium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cadmium_ingot_from_smelting_cadmium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cadmium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cadmium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cadmium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/calcium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/calcium_ingot_from_blasting_calcium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/calcium_ingot_from_smelting_calcium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/calcium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/calcium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/calcium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cerium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cerium_ingot_from_blasting_cerium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cerium_ingot_from_smelting_cerium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cerium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cerium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cerium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cesium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cesium_ingot_from_blasting_cesium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cesium_ingot_from_smelting_cesium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cesium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cesium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cesium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/chromium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/chromium_ingot_from_blasting_chromium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/chromium_ingot_from_smelting_chromium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/chromium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/chromium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/chromium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cobalt_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cobalt_ingot_from_blasting_cobalt_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cobalt_ingot_from_smelting_cobalt_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cobalt_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cobalt_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/cobalt_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/copper_ingot_from_blasting_copper_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/copper_ingot_from_smelting_copper_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/dysprosium_block_to_ingot.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/dysprosium_ingot_from_blasting_dysprosium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/dysprosium_ingot_from_smelting_dysprosium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/dysprosium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{recipes => recipe}/dysprosium_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/dysprosium_nugget_to_ingot.json (79%) rename src/generated/resources/data/chemlib/{recipes => recipe}/erbium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/erbium_ingot_from_blasting_erbium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/erbium_ingot_from_smelting_erbium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/erbium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/erbium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/erbium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/europium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/europium_ingot_from_blasting_europium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/europium_ingot_from_smelting_europium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/europium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/europium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/europium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/francium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/francium_ingot_from_blasting_francium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/francium_ingot_from_smelting_francium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/francium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/francium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/francium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/gadolinium_block_to_ingot.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/gadolinium_ingot_from_blasting_gadolinium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/gadolinium_ingot_from_smelting_gadolinium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/gadolinium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{recipes => recipe}/gadolinium_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/gadolinium_nugget_to_ingot.json (79%) rename src/generated/resources/data/chemlib/{recipes => recipe}/gallium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/gallium_ingot_from_blasting_gallium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/gallium_ingot_from_smelting_gallium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/gallium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/gallium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/gallium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/gold_ingot_from_blasting_gold_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/gold_ingot_from_smelting_gold_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/hafnium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/hafnium_ingot_from_blasting_hafnium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/hafnium_ingot_from_smelting_hafnium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/hafnium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/hafnium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/hafnium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/helium_lamp_block.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/holmium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/holmium_ingot_from_blasting_holmium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/holmium_ingot_from_smelting_holmium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/holmium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/holmium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/holmium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/indium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/indium_ingot_from_blasting_indium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/indium_ingot_from_smelting_indium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/indium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/indium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/indium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/iridium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/iridium_ingot_from_blasting_iridium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/iridium_ingot_from_smelting_iridium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/iridium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/iridium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/iridium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/iron_ingot_from_blasting_iron_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/iron_ingot_from_smelting_iron_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/krypton_lamp_block.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lanthanum_block_to_ingot.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lanthanum_ingot_from_blasting_lanthanum_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lanthanum_ingot_from_smelting_lanthanum_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lanthanum_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lanthanum_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lanthanum_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lead_block_to_ingot.json (84%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lead_ingot_from_blasting_lead_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lead_ingot_from_smelting_lead_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lead_ingot_to_block.json (79%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lead_ingot_to_nugget.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lead_nugget_to_ingot.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lithium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lithium_ingot_from_blasting_lithium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lithium_ingot_from_smelting_lithium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lithium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lithium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lithium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lutetium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lutetium_ingot_from_blasting_lutetium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lutetium_ingot_from_smelting_lutetium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lutetium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lutetium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/lutetium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/magnesium_block_to_ingot.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/magnesium_ingot_from_blasting_magnesium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/magnesium_ingot_from_smelting_magnesium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/magnesium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/magnesium_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/magnesium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/manganese_block_to_ingot.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/manganese_ingot_from_blasting_manganese_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/manganese_ingot_from_smelting_manganese_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/manganese_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/manganese_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/manganese_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/molybdenum_block_to_ingot.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/molybdenum_ingot_from_blasting_molybdenum_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/molybdenum_ingot_from_smelting_molybdenum_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/molybdenum_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{recipes => recipe}/molybdenum_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/molybdenum_nugget_to_ingot.json (79%) rename src/generated/resources/data/chemlib/{recipes => recipe}/neodymium_block_to_ingot.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/neodymium_ingot_from_blasting_neodymium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/neodymium_ingot_from_smelting_neodymium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/neodymium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/neodymium_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/neodymium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/neon_lamp_block.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/nickel_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/nickel_ingot_from_blasting_nickel_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/nickel_ingot_from_smelting_nickel_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/nickel_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/nickel_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/nickel_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/niobium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/niobium_ingot_from_blasting_niobium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/niobium_ingot_from_smelting_niobium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/niobium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/niobium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/niobium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/osmium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/osmium_ingot_from_blasting_osmium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/osmium_ingot_from_smelting_osmium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/osmium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/osmium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/osmium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/palladium_block_to_ingot.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/palladium_ingot_from_blasting_palladium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/palladium_ingot_from_smelting_palladium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/palladium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/palladium_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/palladium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/periodic_table.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/platinum_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/platinum_ingot_from_blasting_platinum_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/platinum_ingot_from_smelting_platinum_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/platinum_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/platinum_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/platinum_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/polonium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/polonium_ingot_from_blasting_polonium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/polonium_ingot_from_smelting_polonium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/polonium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/polonium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/polonium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/potassium_block_to_ingot.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/potassium_ingot_from_blasting_potassium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/potassium_ingot_from_smelting_potassium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/potassium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/potassium_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/potassium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/praseodymium_block_to_ingot.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/praseodymium_ingot_from_blasting_praseodymium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/praseodymium_ingot_from_smelting_praseodymium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/praseodymium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{recipes => recipe}/praseodymium_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/praseodymium_nugget_to_ingot.json (79%) rename src/generated/resources/data/chemlib/{recipes => recipe}/protactinium_block_to_ingot.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/protactinium_ingot_from_blasting_protactinium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/protactinium_ingot_from_smelting_protactinium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/protactinium_ingot_to_block.json (77%) rename src/generated/resources/data/chemlib/{recipes => recipe}/protactinium_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/protactinium_nugget_to_ingot.json (79%) rename src/generated/resources/data/chemlib/{recipes => recipe}/radium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/radium_ingot_from_blasting_radium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/radium_ingot_from_smelting_radium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/radium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/radium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/radium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/radon_lamp_block.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rhenium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rhenium_ingot_from_blasting_rhenium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rhenium_ingot_from_smelting_rhenium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rhenium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rhenium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rhenium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rhodium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rhodium_ingot_from_blasting_rhodium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rhodium_ingot_from_smelting_rhodium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rhodium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rhodium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rhodium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rubidium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rubidium_ingot_from_blasting_rubidium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rubidium_ingot_from_smelting_rubidium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rubidium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rubidium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/rubidium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/ruthenium_block_to_ingot.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/ruthenium_ingot_from_blasting_ruthenium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/ruthenium_ingot_from_smelting_ruthenium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/ruthenium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/ruthenium_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/ruthenium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/samarium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/samarium_ingot_from_blasting_samarium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/samarium_ingot_from_smelting_samarium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/samarium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/samarium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/samarium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/scandium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/scandium_ingot_from_blasting_scandium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/scandium_ingot_from_smelting_scandium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/scandium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/scandium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/scandium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/silver_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/silver_ingot_from_blasting_silver_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/silver_ingot_from_smelting_silver_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/silver_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/silver_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/silver_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/sodium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/sodium_ingot_from_blasting_sodium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/sodium_ingot_from_smelting_sodium_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/sodium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/sodium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/sodium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/strontium_block_to_ingot.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/strontium_ingot_from_blasting_strontium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/strontium_ingot_from_smelting_strontium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/strontium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/strontium_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/strontium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tantalum_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tantalum_ingot_from_blasting_tantalum_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tantalum_ingot_from_smelting_tantalum_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tantalum_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tantalum_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tantalum_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/terbium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/terbium_ingot_from_blasting_terbium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/terbium_ingot_from_smelting_terbium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/terbium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/terbium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/terbium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thallium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thallium_ingot_from_blasting_thallium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thallium_ingot_from_smelting_thallium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thallium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thallium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thallium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thorium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thorium_ingot_from_blasting_thorium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thorium_ingot_from_smelting_thorium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thorium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thorium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thorium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thulium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thulium_ingot_from_blasting_thulium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thulium_ingot_from_smelting_thulium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thulium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thulium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/thulium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tin_block_to_ingot.json (84%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tin_ingot_from_blasting_tin_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tin_ingot_from_smelting_tin_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tin_ingot_to_block.json (79%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tin_ingot_to_nugget.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tin_nugget_to_ingot.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/titanium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/titanium_ingot_from_blasting_titanium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/titanium_ingot_from_smelting_titanium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/titanium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/titanium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/titanium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tungsten_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tungsten_ingot_from_blasting_tungsten_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tungsten_ingot_from_smelting_tungsten_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tungsten_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tungsten_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/tungsten_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/uranium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/uranium_ingot_from_blasting_uranium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/uranium_ingot_from_smelting_uranium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/uranium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/uranium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/uranium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/vanadium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/vanadium_ingot_from_blasting_vanadium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/vanadium_ingot_from_smelting_vanadium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/vanadium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/vanadium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/vanadium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/xenon_lamp_block.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/ytterbium_block_to_ingot.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/ytterbium_ingot_from_blasting_ytterbium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/ytterbium_ingot_from_smelting_ytterbium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/ytterbium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/ytterbium_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/ytterbium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/yttrium_block_to_ingot.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/yttrium_ingot_from_blasting_yttrium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/yttrium_ingot_from_smelting_yttrium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/yttrium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/yttrium_ingot_to_nugget.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/yttrium_nugget_to_ingot.json (80%) rename src/generated/resources/data/chemlib/{recipes => recipe}/zinc_block_to_ingot.json (84%) rename src/generated/resources/data/chemlib/{recipes => recipe}/zinc_ingot_from_blasting_zinc_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/zinc_ingot_from_smelting_zinc_dust.json (70%) rename src/generated/resources/data/chemlib/{recipes => recipe}/zinc_ingot_to_block.json (79%) rename src/generated/resources/data/chemlib/{recipes => recipe}/zinc_ingot_to_nugget.json (83%) rename src/generated/resources/data/chemlib/{recipes => recipe}/zinc_nugget_to_ingot.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/zirconium_block_to_ingot.json (82%) rename src/generated/resources/data/chemlib/{recipes => recipe}/zirconium_ingot_from_blasting_zirconium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/zirconium_ingot_from_smelting_zirconium_dust.json (69%) rename src/generated/resources/data/chemlib/{recipes => recipe}/zirconium_ingot_to_block.json (78%) rename src/generated/resources/data/chemlib/{recipes => recipe}/zirconium_ingot_to_nugget.json (81%) rename src/generated/resources/data/chemlib/{recipes => recipe}/zirconium_nugget_to_ingot.json (80%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/mineable/pickaxe.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/needs_stone_tool.json (100%) rename src/main/java/com/smashingmods/chemlib/client/events/{ForgeEventHandler.java => NeoForgeEventHandler.java} (57%) rename src/main/resources/META-INF/{mods.toml => neoforge.mods.toml} (88%) diff --git a/.gitignore b/.gitignore index 4b5db03b..f78db8e0 100644 --- a/.gitignore +++ b/.gitignore @@ -20,10 +20,11 @@ build # other eclipse run +runs +run-data -# Files from Forge MDK -forge*changelog.txt +repo # Project secrets.properties -**/.cache +**/.cache \ No newline at end of file diff --git a/build.gradle b/build.gradle index 28f2712e..19d45c4a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,69 +1,61 @@ plugins { - id 'java' + id 'java-library' id 'idea' - id 'net.minecraftforge.gradle' version '[6.0,6.2)' - id 'org.parchmentmc.librarian.forgegradle' version '1.+' + id 'maven-publish' + id 'net.neoforged.gradle.userdev' version '7.0.163' id 'com.matthewprenger.cursegradle' version '1.4.0' } -apply plugin: 'net.minecraftforge.gradle' -apply plugin: 'org.parchmentmc.librarian.forgegradle' -apply plugin: 'maven-publish' - version = "$minecraft_version-$mod_version" group = 'com.smashingmods' -archivesBaseName = 'chemlib' - -java.toolchain.languageVersion = JavaLanguageVersion.of(17) - -minecraft { - mappings channel: mapping_channel, version: "$mapping_version-1.20.1" - copyIdeResources = true - runs { - client { - workingDirectory project.file('run') - property 'forge.logging.markers', 'REGISTRIES' - property 'forge.logging.console.level', 'debug' - jvmArgs '-XX:+AllowEnhancedClassRedefinition' - - mods { - chemlib { - source sourceSets.main - } - } - } +base { + archivesName = 'chemlib' +} - server { - workingDirectory project.file('run') - property 'forge.logging.markers', 'REGISTRIES' - property 'forge.logging.console.level', 'debug' - jvmArgs '-XX:+AllowEnhancedClassRedefinition' +java.toolchain.languageVersion = JavaLanguageVersion.of(21) - mods { - chemlib { - source sourceSets.main - } - } - } +//minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg') +//minecraft.accessTransformers.entry public net.minecraft.client.Minecraft textureManager # textureManager - data { - workingDirectory project.file('run') - property 'forge.logging.markers', 'REGISTRIES' - property 'forge.logging.console.level', 'debug' - jvmArgs '-XX:+AllowEnhancedClassRedefinition' - args '--mod', "$archivesBaseName", '--all', '--output', file('src/generated/resources'), '--existing', file('src/main/resources') - - mods { - chemlib { - source sourceSets.main - } - } +runs { + configureEach { net.neoforged.gradle.dsl.common.runs.run.Run run -> + systemProperty 'forge.logging.markers', 'REGISTRIES' + + systemProperty 'forge.logging.console.level', 'debug' + + if (run.project.javaToolchains.launcherFor(java.toolchain).map { it.metadata.vendor }.getOrElse("").contains("JetBrains")) { + run.jvmArgument("-XX:+AllowEnhancedClassRedefinition") } + + modSource project.sourceSets.main + } + + client { + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + systemProperty 'forge.enabledGameTestNamespaces', "${mod_id}" + } + + server { + systemProperty 'forge.enabledGameTestNamespaces', "${mod_id}" + programArgument '--nogui' + } + + gameTestServer { + systemProperty 'forge.enabledGameTestNamespaces', "${mod_id}" + } + + data { + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + programArguments.addAll '--mod', "${mod_id}", '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() } } sourceSets.main.resources { srcDir 'src/generated/resources' } +configurations { + runtimeClasspath.extendsFrom localRuntime +} + repositories { maven { url "https://maven.blamejared.com/" } maven { @@ -75,24 +67,30 @@ repositories { } dependencies { - minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - implementation fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}") - runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}") + implementation "net.neoforged:neoforge:${neo_version}" + + compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_version}" + compileOnly "mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}" + localRuntime "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}" } -def resourceTargets = ['META-INF/mods.toml', 'pack.mcmeta'] -def replaceProperties = [ - minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, - forge_version: forge_version, forge_version_range: forge_version_range, - loader_version_range: loader_version_range, - mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, - mod_authors: mod_authors, mod_description: mod_description -] -processResources { +tasks.withType(ProcessResources).configureEach { + var replaceProperties = [ + minecraft_version : minecraft_version, + minecraft_version_range: minecraft_version_range, + neo_version : neo_version, + neo_version_range : neo_version_range, + loader_version_range : loader_version_range, + mod_id : mod_id, + mod_name : mod_name, + mod_license : mod_license, + mod_version : mod_version, + mod_authors : mod_authors, + mod_description : mod_description + ] inputs.properties replaceProperties - replaceProperties.put 'project', project - filesMatching(resourceTargets) { + filesMatching(['META-INF/neoforge.mods.toml']) { expand replaceProperties } } @@ -100,7 +98,7 @@ processResources { jar { manifest { attributes([ - "Specification-Title" : "$archivesBaseName", + "Specification-Title" : "${mod_id}", "Specification-Vendor" : "SmashingMods", "Specification-Version" : "1", "Implementation-Title" : project.name, @@ -125,8 +123,6 @@ fileTree("secrets").matching { } } -jar.finalizedBy('reobfJar') - java { withSourcesJar() withJavadocJar() @@ -134,7 +130,7 @@ java { publishing { publications { - mavenJava(MavenPublication) { + register('mavenJava', MavenPublication) { afterEvaluate { artifact project.jar artifact project.sourcesJar @@ -176,4 +172,12 @@ curseforge { tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' +} + +// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior. +idea { + module { + downloadSources = true + downloadJavadoc = true + } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 78d7dd9d..a3962e8f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,15 @@ -org.gradle.jvmargs=-Xmx3G +org.gradle.jvmargs=-Xmx1G org.gradle.daemon=false +org.gradle.debug=false -minecraft_version=1.20.1 -minecraft_version_range=[1.20,1.21) -forge_version=47.1.3 -forge_version_range=[47,) -loader_version_range=[47,) -mapping_channel=parchment -mapping_version=2023.09.03 +minecraft_version=1.21.1 +minecraft_version_range=[1.21.1,1.22) +neo_version=21.1.47 +neo_version_range=[21,) +loader_version_range=[4,) +neogradle.subsystems.parchment.minecraftVersion=1.21 +neogradle.subsystems.parchment.mappingsVersion=2024.07.28 +neogradle.subsystems.conventions.runs.create-default-run-per-type=false mod_id=chemlib mod_name=ChemLib @@ -17,4 +19,4 @@ mod_group_id=com.smashingmods.chemlib mod_authors=DarkArcana mod_description=ChemLib provides all of the elements of the periodic table and many compounds of those elements. It also includes some items based on the elements and compounds such as ingots and lamps.\nCredits:\n- Andrea Hazard, creator of 'Enhanced Bohr Model' images. Their work is shared under the Creative Commons Attribution-Share Alike 4.0 International license. Read more about the license here: https://creativecommons.org/licenses/by-sa/4.0/deed.en -jei_version=15.2.0.22 \ No newline at end of file +jei_version=19.18.3.205 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..e6441136f3d4ba8a0da8d277868979cfbc8ad796 100644 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 ScNgau(U?ep-K_E5zy1%ZQTdPn diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d3..a4413138 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d..b740cf13 100644 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,10 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f..25da30db 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/settings.gradle b/settings.gradle index 2fb68052..b03169b5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,11 +1,13 @@ pluginManagement { repositories { gradlePluginPortal() - maven { url = 'https://files.minecraftforge.net/maven' } - maven { url = 'https://maven.parchmentmc.org' } + maven { + name = 'Official NeoForge Maven' + url = 'https://maven.neoforged.net/releases' + } } } plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' -} \ No newline at end of file + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/actinium.json b/src/generated/resources/data/c/tags/block/storage_blocks/actinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/actinium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/actinium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/aluminum.json b/src/generated/resources/data/c/tags/block/storage_blocks/aluminum.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/aluminum.json rename to src/generated/resources/data/c/tags/block/storage_blocks/aluminum.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/barium.json b/src/generated/resources/data/c/tags/block/storage_blocks/barium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/barium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/barium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/beryllium.json b/src/generated/resources/data/c/tags/block/storage_blocks/beryllium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/beryllium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/beryllium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/bismuth.json b/src/generated/resources/data/c/tags/block/storage_blocks/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/bismuth.json rename to src/generated/resources/data/c/tags/block/storage_blocks/bismuth.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/cadmium.json b/src/generated/resources/data/c/tags/block/storage_blocks/cadmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/cadmium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/cadmium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/calcium.json b/src/generated/resources/data/c/tags/block/storage_blocks/calcium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/calcium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/calcium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/cerium.json b/src/generated/resources/data/c/tags/block/storage_blocks/cerium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/cerium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/cerium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/cesium.json b/src/generated/resources/data/c/tags/block/storage_blocks/cesium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/cesium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/cesium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/chromium.json b/src/generated/resources/data/c/tags/block/storage_blocks/chromium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/chromium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/chromium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/cobalt.json b/src/generated/resources/data/c/tags/block/storage_blocks/cobalt.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/cobalt.json rename to src/generated/resources/data/c/tags/block/storage_blocks/cobalt.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/dysprosium.json b/src/generated/resources/data/c/tags/block/storage_blocks/dysprosium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/dysprosium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/dysprosium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/erbium.json b/src/generated/resources/data/c/tags/block/storage_blocks/erbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/erbium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/erbium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/europium.json b/src/generated/resources/data/c/tags/block/storage_blocks/europium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/europium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/europium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/francium.json b/src/generated/resources/data/c/tags/block/storage_blocks/francium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/francium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/francium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/gadolinium.json b/src/generated/resources/data/c/tags/block/storage_blocks/gadolinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/gadolinium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/gadolinium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/gallium.json b/src/generated/resources/data/c/tags/block/storage_blocks/gallium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/gallium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/gallium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/hafnium.json b/src/generated/resources/data/c/tags/block/storage_blocks/hafnium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/hafnium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/hafnium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/holmium.json b/src/generated/resources/data/c/tags/block/storage_blocks/holmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/holmium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/holmium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/indium.json b/src/generated/resources/data/c/tags/block/storage_blocks/indium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/indium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/indium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/iridium.json b/src/generated/resources/data/c/tags/block/storage_blocks/iridium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/iridium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/iridium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/lanthanum.json b/src/generated/resources/data/c/tags/block/storage_blocks/lanthanum.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/lanthanum.json rename to src/generated/resources/data/c/tags/block/storage_blocks/lanthanum.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/lead.json b/src/generated/resources/data/c/tags/block/storage_blocks/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/lead.json rename to src/generated/resources/data/c/tags/block/storage_blocks/lead.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/lithium.json b/src/generated/resources/data/c/tags/block/storage_blocks/lithium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/lithium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/lithium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/lutetium.json b/src/generated/resources/data/c/tags/block/storage_blocks/lutetium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/lutetium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/lutetium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/magnesium.json b/src/generated/resources/data/c/tags/block/storage_blocks/magnesium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/magnesium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/magnesium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/manganese.json b/src/generated/resources/data/c/tags/block/storage_blocks/manganese.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/manganese.json rename to src/generated/resources/data/c/tags/block/storage_blocks/manganese.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/molybdenum.json b/src/generated/resources/data/c/tags/block/storage_blocks/molybdenum.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/molybdenum.json rename to src/generated/resources/data/c/tags/block/storage_blocks/molybdenum.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/neodymium.json b/src/generated/resources/data/c/tags/block/storage_blocks/neodymium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/neodymium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/neodymium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/nickel.json b/src/generated/resources/data/c/tags/block/storage_blocks/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/nickel.json rename to src/generated/resources/data/c/tags/block/storage_blocks/nickel.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/niobium.json b/src/generated/resources/data/c/tags/block/storage_blocks/niobium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/niobium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/niobium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/osmium.json b/src/generated/resources/data/c/tags/block/storage_blocks/osmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/osmium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/osmium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/palladium.json b/src/generated/resources/data/c/tags/block/storage_blocks/palladium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/palladium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/palladium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/platinum.json b/src/generated/resources/data/c/tags/block/storage_blocks/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/platinum.json rename to src/generated/resources/data/c/tags/block/storage_blocks/platinum.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/polonium.json b/src/generated/resources/data/c/tags/block/storage_blocks/polonium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/polonium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/polonium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/potassium.json b/src/generated/resources/data/c/tags/block/storage_blocks/potassium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/potassium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/potassium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/praseodymium.json b/src/generated/resources/data/c/tags/block/storage_blocks/praseodymium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/praseodymium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/praseodymium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/protactinium.json b/src/generated/resources/data/c/tags/block/storage_blocks/protactinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/protactinium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/protactinium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/radium.json b/src/generated/resources/data/c/tags/block/storage_blocks/radium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/radium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/radium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/rhenium.json b/src/generated/resources/data/c/tags/block/storage_blocks/rhenium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/rhenium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/rhenium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/rhodium.json b/src/generated/resources/data/c/tags/block/storage_blocks/rhodium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/rhodium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/rhodium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/rubidium.json b/src/generated/resources/data/c/tags/block/storage_blocks/rubidium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/rubidium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/rubidium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/ruthenium.json b/src/generated/resources/data/c/tags/block/storage_blocks/ruthenium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/ruthenium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/ruthenium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/samarium.json b/src/generated/resources/data/c/tags/block/storage_blocks/samarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/samarium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/samarium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/scandium.json b/src/generated/resources/data/c/tags/block/storage_blocks/scandium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/scandium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/scandium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/silver.json b/src/generated/resources/data/c/tags/block/storage_blocks/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/silver.json rename to src/generated/resources/data/c/tags/block/storage_blocks/silver.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/sodium.json b/src/generated/resources/data/c/tags/block/storage_blocks/sodium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/sodium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/sodium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/strontium.json b/src/generated/resources/data/c/tags/block/storage_blocks/strontium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/strontium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/strontium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/tantalum.json b/src/generated/resources/data/c/tags/block/storage_blocks/tantalum.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/tantalum.json rename to src/generated/resources/data/c/tags/block/storage_blocks/tantalum.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/terbium.json b/src/generated/resources/data/c/tags/block/storage_blocks/terbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/terbium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/terbium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/thallium.json b/src/generated/resources/data/c/tags/block/storage_blocks/thallium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/thallium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/thallium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/thorium.json b/src/generated/resources/data/c/tags/block/storage_blocks/thorium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/thorium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/thorium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/thulium.json b/src/generated/resources/data/c/tags/block/storage_blocks/thulium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/thulium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/thulium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/tin.json b/src/generated/resources/data/c/tags/block/storage_blocks/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/tin.json rename to src/generated/resources/data/c/tags/block/storage_blocks/tin.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/titanium.json b/src/generated/resources/data/c/tags/block/storage_blocks/titanium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/titanium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/titanium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/tungsten.json b/src/generated/resources/data/c/tags/block/storage_blocks/tungsten.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/tungsten.json rename to src/generated/resources/data/c/tags/block/storage_blocks/tungsten.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/uranium.json b/src/generated/resources/data/c/tags/block/storage_blocks/uranium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/uranium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/uranium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/vanadium.json b/src/generated/resources/data/c/tags/block/storage_blocks/vanadium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/vanadium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/vanadium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/ytterbium.json b/src/generated/resources/data/c/tags/block/storage_blocks/ytterbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/ytterbium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/ytterbium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/yttrium.json b/src/generated/resources/data/c/tags/block/storage_blocks/yttrium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/yttrium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/yttrium.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/zinc.json b/src/generated/resources/data/c/tags/block/storage_blocks/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/zinc.json rename to src/generated/resources/data/c/tags/block/storage_blocks/zinc.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/zirconium.json b/src/generated/resources/data/c/tags/block/storage_blocks/zirconium.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/zirconium.json rename to src/generated/resources/data/c/tags/block/storage_blocks/zirconium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/acetylsalicylic_acid.json b/src/generated/resources/data/c/tags/item/dusts/acetylsalicylic_acid.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/acetylsalicylic_acid.json rename to src/generated/resources/data/c/tags/item/dusts/acetylsalicylic_acid.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/actinium.json b/src/generated/resources/data/c/tags/item/dusts/actinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/actinium.json rename to src/generated/resources/data/c/tags/item/dusts/actinium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/aluminum.json b/src/generated/resources/data/c/tags/item/dusts/aluminum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/aluminum.json rename to src/generated/resources/data/c/tags/item/dusts/aluminum.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/aluminum_hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/aluminum_hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/aluminum_hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/aluminum_hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/aluminum_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/aluminum_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/aluminum_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/aluminum_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/aluminum_oxide.json b/src/generated/resources/data/c/tags/item/dusts/aluminum_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/aluminum_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/aluminum_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/amide.json b/src/generated/resources/data/c/tags/item/dusts/amide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/amide.json rename to src/generated/resources/data/c/tags/item/dusts/amide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/ammonium_chloride.json b/src/generated/resources/data/c/tags/item/dusts/ammonium_chloride.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/ammonium_chloride.json rename to src/generated/resources/data/c/tags/item/dusts/ammonium_chloride.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/antimony.json b/src/generated/resources/data/c/tags/item/dusts/antimony.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/antimony.json rename to src/generated/resources/data/c/tags/item/dusts/antimony.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/antimony_trioxide.json b/src/generated/resources/data/c/tags/item/dusts/antimony_trioxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/antimony_trioxide.json rename to src/generated/resources/data/c/tags/item/dusts/antimony_trioxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/antimony_trisulfide.json b/src/generated/resources/data/c/tags/item/dusts/antimony_trisulfide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/antimony_trisulfide.json rename to src/generated/resources/data/c/tags/item/dusts/antimony_trisulfide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/arsenic.json b/src/generated/resources/data/c/tags/item/dusts/arsenic.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/arsenic.json rename to src/generated/resources/data/c/tags/item/dusts/arsenic.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/astatine.json b/src/generated/resources/data/c/tags/item/dusts/astatine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/astatine.json rename to src/generated/resources/data/c/tags/item/dusts/astatine.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/barium.json b/src/generated/resources/data/c/tags/item/dusts/barium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/barium.json rename to src/generated/resources/data/c/tags/item/dusts/barium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/barium_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/barium_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/barium_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/barium_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/barium_chloride.json b/src/generated/resources/data/c/tags/item/dusts/barium_chloride.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/barium_chloride.json rename to src/generated/resources/data/c/tags/item/dusts/barium_chloride.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/barium_hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/barium_hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/barium_hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/barium_hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/barium_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/barium_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/barium_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/barium_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/barium_oxide.json b/src/generated/resources/data/c/tags/item/dusts/barium_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/barium_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/barium_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/barium_sulfide.json b/src/generated/resources/data/c/tags/item/dusts/barium_sulfide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/barium_sulfide.json rename to src/generated/resources/data/c/tags/item/dusts/barium_sulfide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/beryl.json b/src/generated/resources/data/c/tags/item/dusts/beryl.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/beryl.json rename to src/generated/resources/data/c/tags/item/dusts/beryl.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/beryllium.json b/src/generated/resources/data/c/tags/item/dusts/beryllium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/beryllium.json rename to src/generated/resources/data/c/tags/item/dusts/beryllium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/beryllium_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/beryllium_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/beryllium_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/beryllium_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/beryllium_chloride.json b/src/generated/resources/data/c/tags/item/dusts/beryllium_chloride.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/beryllium_chloride.json rename to src/generated/resources/data/c/tags/item/dusts/beryllium_chloride.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/beryllium_hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/beryllium_hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/beryllium_hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/beryllium_hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/beryllium_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/beryllium_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/beryllium_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/beryllium_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/beryllium_oxide.json b/src/generated/resources/data/c/tags/item/dusts/beryllium_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/beryllium_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/beryllium_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/beryllium_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/beryllium_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/beryllium_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/beryllium_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/beta_carotene.json b/src/generated/resources/data/c/tags/item/dusts/beta_carotene.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/beta_carotene.json rename to src/generated/resources/data/c/tags/item/dusts/beta_carotene.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/bismuth.json b/src/generated/resources/data/c/tags/item/dusts/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/bismuth.json rename to src/generated/resources/data/c/tags/item/dusts/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/boron.json b/src/generated/resources/data/c/tags/item/dusts/boron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/boron.json rename to src/generated/resources/data/c/tags/item/dusts/boron.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cadmium.json b/src/generated/resources/data/c/tags/item/dusts/cadmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cadmium.json rename to src/generated/resources/data/c/tags/item/dusts/cadmium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cadmium_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/cadmium_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cadmium_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/cadmium_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cadmium_hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/cadmium_hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cadmium_hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/cadmium_hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cadmium_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/cadmium_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cadmium_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/cadmium_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cadmium_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/cadmium_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cadmium_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/cadmium_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cadmium_sulfide.json b/src/generated/resources/data/c/tags/item/dusts/cadmium_sulfide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cadmium_sulfide.json rename to src/generated/resources/data/c/tags/item/dusts/cadmium_sulfide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/caffeine.json b/src/generated/resources/data/c/tags/item/dusts/caffeine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/caffeine.json rename to src/generated/resources/data/c/tags/item/dusts/caffeine.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/calcium.json b/src/generated/resources/data/c/tags/item/dusts/calcium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/calcium.json rename to src/generated/resources/data/c/tags/item/dusts/calcium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/calcium_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/calcium_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/calcium_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/calcium_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/calcium_chloride.json b/src/generated/resources/data/c/tags/item/dusts/calcium_chloride.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/calcium_chloride.json rename to src/generated/resources/data/c/tags/item/dusts/calcium_chloride.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/calcium_hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/calcium_hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/calcium_hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/calcium_hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/calcium_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/calcium_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/calcium_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/calcium_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/calcium_oxide.json b/src/generated/resources/data/c/tags/item/dusts/calcium_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/calcium_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/calcium_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/calcium_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/calcium_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/calcium_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/calcium_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/carbon.json b/src/generated/resources/data/c/tags/item/dusts/carbon.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/carbon.json rename to src/generated/resources/data/c/tags/item/dusts/carbon.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/carbonate.json b/src/generated/resources/data/c/tags/item/dusts/carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cellulose.json b/src/generated/resources/data/c/tags/item/dusts/cellulose.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cellulose.json rename to src/generated/resources/data/c/tags/item/dusts/cellulose.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cerium.json b/src/generated/resources/data/c/tags/item/dusts/cerium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cerium.json rename to src/generated/resources/data/c/tags/item/dusts/cerium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cesium.json b/src/generated/resources/data/c/tags/item/dusts/cesium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cesium.json rename to src/generated/resources/data/c/tags/item/dusts/cesium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cesium_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/cesium_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cesium_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/cesium_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cesium_chloride.json b/src/generated/resources/data/c/tags/item/dusts/cesium_chloride.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cesium_chloride.json rename to src/generated/resources/data/c/tags/item/dusts/cesium_chloride.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cesium_hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/cesium_hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cesium_hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/cesium_hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cesium_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/cesium_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cesium_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/cesium_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cesium_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/cesium_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cesium_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/cesium_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/chitin.json b/src/generated/resources/data/c/tags/item/dusts/chitin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/chitin.json rename to src/generated/resources/data/c/tags/item/dusts/chitin.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/chromium.json b/src/generated/resources/data/c/tags/item/dusts/chromium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/chromium.json rename to src/generated/resources/data/c/tags/item/dusts/chromium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/chromium_oxide.json b/src/generated/resources/data/c/tags/item/dusts/chromium_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/chromium_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/chromium_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cinnabar.json b/src/generated/resources/data/c/tags/item/dusts/cinnabar.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cinnabar.json rename to src/generated/resources/data/c/tags/item/dusts/cinnabar.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cobalt.json b/src/generated/resources/data/c/tags/item/dusts/cobalt.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cobalt.json rename to src/generated/resources/data/c/tags/item/dusts/cobalt.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cobalt_aluminate.json b/src/generated/resources/data/c/tags/item/dusts/cobalt_aluminate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cobalt_aluminate.json rename to src/generated/resources/data/c/tags/item/dusts/cobalt_aluminate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cobalt_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/cobalt_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cobalt_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/cobalt_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cobalt_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/cobalt_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cobalt_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/cobalt_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cobalt_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/cobalt_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cobalt_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/cobalt_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/copper.json b/src/generated/resources/data/c/tags/item/dusts/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/copper.json rename to src/generated/resources/data/c/tags/item/dusts/copper.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/copper_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/copper_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/copper_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/copper_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/copper_i_oxide.json b/src/generated/resources/data/c/tags/item/dusts/copper_i_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/copper_i_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/copper_i_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/copper_i_sulfide.json b/src/generated/resources/data/c/tags/item/dusts/copper_i_sulfide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/copper_i_sulfide.json rename to src/generated/resources/data/c/tags/item/dusts/copper_i_sulfide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/copper_ii_hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/copper_ii_hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/copper_ii_hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/copper_ii_hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/copper_ii_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/copper_ii_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/copper_ii_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/copper_ii_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/copper_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/copper_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/copper_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/copper_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/cucurbitacin.json b/src/generated/resources/data/c/tags/item/dusts/cucurbitacin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/cucurbitacin.json rename to src/generated/resources/data/c/tags/item/dusts/cucurbitacin.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/diammonium_phosphate.json b/src/generated/resources/data/c/tags/item/dusts/diammonium_phosphate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/diammonium_phosphate.json rename to src/generated/resources/data/c/tags/item/dusts/diammonium_phosphate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/dysprosium.json b/src/generated/resources/data/c/tags/item/dusts/dysprosium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/dysprosium.json rename to src/generated/resources/data/c/tags/item/dusts/dysprosium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/erbium.json b/src/generated/resources/data/c/tags/item/dusts/erbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/erbium.json rename to src/generated/resources/data/c/tags/item/dusts/erbium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/europium.json b/src/generated/resources/data/c/tags/item/dusts/europium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/europium.json rename to src/generated/resources/data/c/tags/item/dusts/europium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/francium.json b/src/generated/resources/data/c/tags/item/dusts/francium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/francium.json rename to src/generated/resources/data/c/tags/item/dusts/francium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/gadolinium.json b/src/generated/resources/data/c/tags/item/dusts/gadolinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/gadolinium.json rename to src/generated/resources/data/c/tags/item/dusts/gadolinium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/gallium.json b/src/generated/resources/data/c/tags/item/dusts/gallium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/gallium.json rename to src/generated/resources/data/c/tags/item/dusts/gallium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/germanium.json b/src/generated/resources/data/c/tags/item/dusts/germanium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/germanium.json rename to src/generated/resources/data/c/tags/item/dusts/germanium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/gold.json b/src/generated/resources/data/c/tags/item/dusts/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/gold.json rename to src/generated/resources/data/c/tags/item/dusts/gold.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/graphite.json b/src/generated/resources/data/c/tags/item/dusts/graphite.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/graphite.json rename to src/generated/resources/data/c/tags/item/dusts/graphite.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/hafnium.json b/src/generated/resources/data/c/tags/item/dusts/hafnium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/hafnium.json rename to src/generated/resources/data/c/tags/item/dusts/hafnium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/holmium.json b/src/generated/resources/data/c/tags/item/dusts/holmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/holmium.json rename to src/generated/resources/data/c/tags/item/dusts/holmium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/indium.json b/src/generated/resources/data/c/tags/item/dusts/indium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/indium.json rename to src/generated/resources/data/c/tags/item/dusts/indium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/iodine.json b/src/generated/resources/data/c/tags/item/dusts/iodine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/iodine.json rename to src/generated/resources/data/c/tags/item/dusts/iodine.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/iridium.json b/src/generated/resources/data/c/tags/item/dusts/iridium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/iridium.json rename to src/generated/resources/data/c/tags/item/dusts/iridium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/iron.json b/src/generated/resources/data/c/tags/item/dusts/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/iron.json rename to src/generated/resources/data/c/tags/item/dusts/iron.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/iron_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/iron_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/iron_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/iron_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/iron_disulfide.json b/src/generated/resources/data/c/tags/item/dusts/iron_disulfide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/iron_disulfide.json rename to src/generated/resources/data/c/tags/item/dusts/iron_disulfide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/iron_ii_oxide.json b/src/generated/resources/data/c/tags/item/dusts/iron_ii_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/iron_ii_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/iron_ii_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/iron_ii_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/iron_ii_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/iron_ii_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/iron_ii_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/iron_iii_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/iron_iii_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/iron_iii_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/iron_iii_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/iron_oxide.json b/src/generated/resources/data/c/tags/item/dusts/iron_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/iron_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/iron_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/keratin.json b/src/generated/resources/data/c/tags/item/dusts/keratin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/keratin.json rename to src/generated/resources/data/c/tags/item/dusts/keratin.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lanthanum.json b/src/generated/resources/data/c/tags/item/dusts/lanthanum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lanthanum.json rename to src/generated/resources/data/c/tags/item/dusts/lanthanum.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lead.json b/src/generated/resources/data/c/tags/item/dusts/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lead.json rename to src/generated/resources/data/c/tags/item/dusts/lead.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lead_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/lead_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lead_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/lead_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lead_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/lead_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lead_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/lead_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lead_oxide.json b/src/generated/resources/data/c/tags/item/dusts/lead_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lead_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/lead_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lead_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/lead_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lead_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/lead_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lead_sulfide.json b/src/generated/resources/data/c/tags/item/dusts/lead_sulfide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lead_sulfide.json rename to src/generated/resources/data/c/tags/item/dusts/lead_sulfide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lithium.json b/src/generated/resources/data/c/tags/item/dusts/lithium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lithium.json rename to src/generated/resources/data/c/tags/item/dusts/lithium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lithium_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/lithium_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lithium_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/lithium_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lithium_chloride.json b/src/generated/resources/data/c/tags/item/dusts/lithium_chloride.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lithium_chloride.json rename to src/generated/resources/data/c/tags/item/dusts/lithium_chloride.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lithium_hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/lithium_hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lithium_hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/lithium_hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lithium_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/lithium_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lithium_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/lithium_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lithium_oxide.json b/src/generated/resources/data/c/tags/item/dusts/lithium_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lithium_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/lithium_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lithium_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/lithium_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lithium_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/lithium_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/lutetium.json b/src/generated/resources/data/c/tags/item/dusts/lutetium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/lutetium.json rename to src/generated/resources/data/c/tags/item/dusts/lutetium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/magnesium.json b/src/generated/resources/data/c/tags/item/dusts/magnesium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/magnesium.json rename to src/generated/resources/data/c/tags/item/dusts/magnesium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/magnesium_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/magnesium_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/magnesium_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/magnesium_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/magnesium_chloride.json b/src/generated/resources/data/c/tags/item/dusts/magnesium_chloride.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/magnesium_chloride.json rename to src/generated/resources/data/c/tags/item/dusts/magnesium_chloride.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/magnesium_hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/magnesium_hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/magnesium_hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/magnesium_hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/magnesium_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/magnesium_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/magnesium_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/magnesium_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/magnesium_oxide.json b/src/generated/resources/data/c/tags/item/dusts/magnesium_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/magnesium_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/magnesium_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/manganese.json b/src/generated/resources/data/c/tags/item/dusts/manganese.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/manganese.json rename to src/generated/resources/data/c/tags/item/dusts/manganese.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/manganese_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/manganese_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/manganese_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/manganese_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/manganese_hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/manganese_hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/manganese_hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/manganese_hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/manganese_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/manganese_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/manganese_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/manganese_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/manganese_oxide.json b/src/generated/resources/data/c/tags/item/dusts/manganese_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/manganese_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/manganese_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/manganese_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/manganese_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/manganese_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/manganese_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/mercury_sulfide.json b/src/generated/resources/data/c/tags/item/dusts/mercury_sulfide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/mercury_sulfide.json rename to src/generated/resources/data/c/tags/item/dusts/mercury_sulfide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/molybdenum.json b/src/generated/resources/data/c/tags/item/dusts/molybdenum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/molybdenum.json rename to src/generated/resources/data/c/tags/item/dusts/molybdenum.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/mullite.json b/src/generated/resources/data/c/tags/item/dusts/mullite.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/mullite.json rename to src/generated/resources/data/c/tags/item/dusts/mullite.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/neodymium.json b/src/generated/resources/data/c/tags/item/dusts/neodymium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/neodymium.json rename to src/generated/resources/data/c/tags/item/dusts/neodymium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/nickel.json b/src/generated/resources/data/c/tags/item/dusts/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/nickel.json rename to src/generated/resources/data/c/tags/item/dusts/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/nickel_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/nickel_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/nickel_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/nickel_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/nickel_chloride.json b/src/generated/resources/data/c/tags/item/dusts/nickel_chloride.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/nickel_chloride.json rename to src/generated/resources/data/c/tags/item/dusts/nickel_chloride.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/nickel_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/nickel_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/nickel_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/nickel_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/nickel_oxide.json b/src/generated/resources/data/c/tags/item/dusts/nickel_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/nickel_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/nickel_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/nickel_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/nickel_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/nickel_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/nickel_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/nickel_sulfide.json b/src/generated/resources/data/c/tags/item/dusts/nickel_sulfide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/nickel_sulfide.json rename to src/generated/resources/data/c/tags/item/dusts/nickel_sulfide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/niobium.json b/src/generated/resources/data/c/tags/item/dusts/niobium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/niobium.json rename to src/generated/resources/data/c/tags/item/dusts/niobium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/niter.json b/src/generated/resources/data/c/tags/item/dusts/niter.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/niter.json rename to src/generated/resources/data/c/tags/item/dusts/niter.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/nitrate.json b/src/generated/resources/data/c/tags/item/dusts/nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/osmium.json b/src/generated/resources/data/c/tags/item/dusts/osmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/osmium.json rename to src/generated/resources/data/c/tags/item/dusts/osmium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/palladium.json b/src/generated/resources/data/c/tags/item/dusts/palladium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/palladium.json rename to src/generated/resources/data/c/tags/item/dusts/palladium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/phosphate.json b/src/generated/resources/data/c/tags/item/dusts/phosphate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/phosphate.json rename to src/generated/resources/data/c/tags/item/dusts/phosphate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/phosphoric_acid.json b/src/generated/resources/data/c/tags/item/dusts/phosphoric_acid.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/phosphoric_acid.json rename to src/generated/resources/data/c/tags/item/dusts/phosphoric_acid.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/phosphorus.json b/src/generated/resources/data/c/tags/item/dusts/phosphorus.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/phosphorus.json rename to src/generated/resources/data/c/tags/item/dusts/phosphorus.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/platinum.json b/src/generated/resources/data/c/tags/item/dusts/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/platinum.json rename to src/generated/resources/data/c/tags/item/dusts/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/polonium.json b/src/generated/resources/data/c/tags/item/dusts/polonium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/polonium.json rename to src/generated/resources/data/c/tags/item/dusts/polonium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/polyvinyl_chloride.json b/src/generated/resources/data/c/tags/item/dusts/polyvinyl_chloride.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/polyvinyl_chloride.json rename to src/generated/resources/data/c/tags/item/dusts/polyvinyl_chloride.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/potassium.json b/src/generated/resources/data/c/tags/item/dusts/potassium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/potassium.json rename to src/generated/resources/data/c/tags/item/dusts/potassium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/potassium_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/potassium_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/potassium_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/potassium_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/potassium_chloride.json b/src/generated/resources/data/c/tags/item/dusts/potassium_chloride.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/potassium_chloride.json rename to src/generated/resources/data/c/tags/item/dusts/potassium_chloride.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/potassium_cyanide.json b/src/generated/resources/data/c/tags/item/dusts/potassium_cyanide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/potassium_cyanide.json rename to src/generated/resources/data/c/tags/item/dusts/potassium_cyanide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/potassium_ethyl_xanthate.json b/src/generated/resources/data/c/tags/item/dusts/potassium_ethyl_xanthate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/potassium_ethyl_xanthate.json rename to src/generated/resources/data/c/tags/item/dusts/potassium_ethyl_xanthate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/potassium_hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/potassium_hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/potassium_hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/potassium_hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/potassium_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/potassium_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/potassium_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/potassium_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/potassium_oxide.json b/src/generated/resources/data/c/tags/item/dusts/potassium_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/potassium_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/potassium_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/potassium_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/potassium_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/potassium_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/potassium_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/praseodymium.json b/src/generated/resources/data/c/tags/item/dusts/praseodymium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/praseodymium.json rename to src/generated/resources/data/c/tags/item/dusts/praseodymium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/protactinium.json b/src/generated/resources/data/c/tags/item/dusts/protactinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/protactinium.json rename to src/generated/resources/data/c/tags/item/dusts/protactinium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/radium.json b/src/generated/resources/data/c/tags/item/dusts/radium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/radium.json rename to src/generated/resources/data/c/tags/item/dusts/radium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/rhenium.json b/src/generated/resources/data/c/tags/item/dusts/rhenium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/rhenium.json rename to src/generated/resources/data/c/tags/item/dusts/rhenium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/rhodium.json b/src/generated/resources/data/c/tags/item/dusts/rhodium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/rhodium.json rename to src/generated/resources/data/c/tags/item/dusts/rhodium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/rubidium.json b/src/generated/resources/data/c/tags/item/dusts/rubidium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/rubidium.json rename to src/generated/resources/data/c/tags/item/dusts/rubidium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/rubidium_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/rubidium_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/rubidium_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/rubidium_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/rubidium_chloride.json b/src/generated/resources/data/c/tags/item/dusts/rubidium_chloride.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/rubidium_chloride.json rename to src/generated/resources/data/c/tags/item/dusts/rubidium_chloride.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/rubidium_hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/rubidium_hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/rubidium_hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/rubidium_hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/rubidium_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/rubidium_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/rubidium_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/rubidium_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/rubidium_oxide.json b/src/generated/resources/data/c/tags/item/dusts/rubidium_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/rubidium_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/rubidium_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/rubidium_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/rubidium_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/rubidium_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/rubidium_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/ruthenium.json b/src/generated/resources/data/c/tags/item/dusts/ruthenium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/ruthenium.json rename to src/generated/resources/data/c/tags/item/dusts/ruthenium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/samarium.json b/src/generated/resources/data/c/tags/item/dusts/samarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/samarium.json rename to src/generated/resources/data/c/tags/item/dusts/samarium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/scandium.json b/src/generated/resources/data/c/tags/item/dusts/scandium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/scandium.json rename to src/generated/resources/data/c/tags/item/dusts/scandium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/selenium.json b/src/generated/resources/data/c/tags/item/dusts/selenium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/selenium.json rename to src/generated/resources/data/c/tags/item/dusts/selenium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/silicon.json b/src/generated/resources/data/c/tags/item/dusts/silicon.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/silicon.json rename to src/generated/resources/data/c/tags/item/dusts/silicon.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/silver.json b/src/generated/resources/data/c/tags/item/dusts/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/silver.json rename to src/generated/resources/data/c/tags/item/dusts/silver.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/sodium.json b/src/generated/resources/data/c/tags/item/dusts/sodium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/sodium.json rename to src/generated/resources/data/c/tags/item/dusts/sodium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/sodium_bisulfate.json b/src/generated/resources/data/c/tags/item/dusts/sodium_bisulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/sodium_bisulfate.json rename to src/generated/resources/data/c/tags/item/dusts/sodium_bisulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/sodium_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/sodium_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/sodium_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/sodium_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/sodium_chloride.json b/src/generated/resources/data/c/tags/item/dusts/sodium_chloride.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/sodium_chloride.json rename to src/generated/resources/data/c/tags/item/dusts/sodium_chloride.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/sodium_hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/sodium_hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/sodium_hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/sodium_hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/sodium_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/sodium_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/sodium_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/sodium_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/sodium_oxide.json b/src/generated/resources/data/c/tags/item/dusts/sodium_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/sodium_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/sodium_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/sodium_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/sodium_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/sodium_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/sodium_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/starch.json b/src/generated/resources/data/c/tags/item/dusts/starch.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/starch.json rename to src/generated/resources/data/c/tags/item/dusts/starch.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/strontium.json b/src/generated/resources/data/c/tags/item/dusts/strontium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/strontium.json rename to src/generated/resources/data/c/tags/item/dusts/strontium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/strontium_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/strontium_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/strontium_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/strontium_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/strontium_chloride.json b/src/generated/resources/data/c/tags/item/dusts/strontium_chloride.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/strontium_chloride.json rename to src/generated/resources/data/c/tags/item/dusts/strontium_chloride.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/strontium_hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/strontium_hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/strontium_hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/strontium_hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/strontium_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/strontium_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/strontium_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/strontium_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/strontium_oxide.json b/src/generated/resources/data/c/tags/item/dusts/strontium_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/strontium_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/strontium_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/strontium_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/strontium_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/strontium_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/strontium_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/sucrose.json b/src/generated/resources/data/c/tags/item/dusts/sucrose.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/sucrose.json rename to src/generated/resources/data/c/tags/item/dusts/sucrose.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/sulfur.json b/src/generated/resources/data/c/tags/item/dusts/sulfur.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/sulfur.json rename to src/generated/resources/data/c/tags/item/dusts/sulfur.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/tantalum.json b/src/generated/resources/data/c/tags/item/dusts/tantalum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/tantalum.json rename to src/generated/resources/data/c/tags/item/dusts/tantalum.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/tellurium.json b/src/generated/resources/data/c/tags/item/dusts/tellurium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/tellurium.json rename to src/generated/resources/data/c/tags/item/dusts/tellurium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/terbium.json b/src/generated/resources/data/c/tags/item/dusts/terbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/terbium.json rename to src/generated/resources/data/c/tags/item/dusts/terbium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/thallium.json b/src/generated/resources/data/c/tags/item/dusts/thallium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/thallium.json rename to src/generated/resources/data/c/tags/item/dusts/thallium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/thorium.json b/src/generated/resources/data/c/tags/item/dusts/thorium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/thorium.json rename to src/generated/resources/data/c/tags/item/dusts/thorium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/thulium.json b/src/generated/resources/data/c/tags/item/dusts/thulium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/thulium.json rename to src/generated/resources/data/c/tags/item/dusts/thulium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/tin.json b/src/generated/resources/data/c/tags/item/dusts/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/tin.json rename to src/generated/resources/data/c/tags/item/dusts/tin.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/tin_oxide.json b/src/generated/resources/data/c/tags/item/dusts/tin_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/tin_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/tin_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/tin_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/tin_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/tin_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/tin_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/titanium.json b/src/generated/resources/data/c/tags/item/dusts/titanium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/titanium.json rename to src/generated/resources/data/c/tags/item/dusts/titanium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/triglyceride.json b/src/generated/resources/data/c/tags/item/dusts/triglyceride.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/triglyceride.json rename to src/generated/resources/data/c/tags/item/dusts/triglyceride.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/tungsten.json b/src/generated/resources/data/c/tags/item/dusts/tungsten.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/tungsten.json rename to src/generated/resources/data/c/tags/item/dusts/tungsten.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/uranium.json b/src/generated/resources/data/c/tags/item/dusts/uranium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/uranium.json rename to src/generated/resources/data/c/tags/item/dusts/uranium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/urea.json b/src/generated/resources/data/c/tags/item/dusts/urea.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/urea.json rename to src/generated/resources/data/c/tags/item/dusts/urea.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/vanadium.json b/src/generated/resources/data/c/tags/item/dusts/vanadium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/vanadium.json rename to src/generated/resources/data/c/tags/item/dusts/vanadium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/ytterbium.json b/src/generated/resources/data/c/tags/item/dusts/ytterbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/ytterbium.json rename to src/generated/resources/data/c/tags/item/dusts/ytterbium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/yttrium.json b/src/generated/resources/data/c/tags/item/dusts/yttrium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/yttrium.json rename to src/generated/resources/data/c/tags/item/dusts/yttrium.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/zinc.json b/src/generated/resources/data/c/tags/item/dusts/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/zinc.json rename to src/generated/resources/data/c/tags/item/dusts/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/zinc_carbonate.json b/src/generated/resources/data/c/tags/item/dusts/zinc_carbonate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/zinc_carbonate.json rename to src/generated/resources/data/c/tags/item/dusts/zinc_carbonate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/zinc_hydroxide.json b/src/generated/resources/data/c/tags/item/dusts/zinc_hydroxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/zinc_hydroxide.json rename to src/generated/resources/data/c/tags/item/dusts/zinc_hydroxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/zinc_nitrate.json b/src/generated/resources/data/c/tags/item/dusts/zinc_nitrate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/zinc_nitrate.json rename to src/generated/resources/data/c/tags/item/dusts/zinc_nitrate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/zinc_oxide.json b/src/generated/resources/data/c/tags/item/dusts/zinc_oxide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/zinc_oxide.json rename to src/generated/resources/data/c/tags/item/dusts/zinc_oxide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/zinc_sulfate.json b/src/generated/resources/data/c/tags/item/dusts/zinc_sulfate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/zinc_sulfate.json rename to src/generated/resources/data/c/tags/item/dusts/zinc_sulfate.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/zinc_sulfide.json b/src/generated/resources/data/c/tags/item/dusts/zinc_sulfide.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/zinc_sulfide.json rename to src/generated/resources/data/c/tags/item/dusts/zinc_sulfide.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/zirconium.json b/src/generated/resources/data/c/tags/item/dusts/zirconium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/zirconium.json rename to src/generated/resources/data/c/tags/item/dusts/zirconium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/actinium.json b/src/generated/resources/data/c/tags/item/ingots/actinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/actinium.json rename to src/generated/resources/data/c/tags/item/ingots/actinium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/aluminum.json b/src/generated/resources/data/c/tags/item/ingots/aluminum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/aluminum.json rename to src/generated/resources/data/c/tags/item/ingots/aluminum.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/barium.json b/src/generated/resources/data/c/tags/item/ingots/barium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/barium.json rename to src/generated/resources/data/c/tags/item/ingots/barium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/beryllium.json b/src/generated/resources/data/c/tags/item/ingots/beryllium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/beryllium.json rename to src/generated/resources/data/c/tags/item/ingots/beryllium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/bismuth.json b/src/generated/resources/data/c/tags/item/ingots/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/bismuth.json rename to src/generated/resources/data/c/tags/item/ingots/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/cadmium.json b/src/generated/resources/data/c/tags/item/ingots/cadmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/cadmium.json rename to src/generated/resources/data/c/tags/item/ingots/cadmium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/calcium.json b/src/generated/resources/data/c/tags/item/ingots/calcium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/calcium.json rename to src/generated/resources/data/c/tags/item/ingots/calcium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/cerium.json b/src/generated/resources/data/c/tags/item/ingots/cerium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/cerium.json rename to src/generated/resources/data/c/tags/item/ingots/cerium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/cesium.json b/src/generated/resources/data/c/tags/item/ingots/cesium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/cesium.json rename to src/generated/resources/data/c/tags/item/ingots/cesium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/chromium.json b/src/generated/resources/data/c/tags/item/ingots/chromium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/chromium.json rename to src/generated/resources/data/c/tags/item/ingots/chromium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/cobalt.json b/src/generated/resources/data/c/tags/item/ingots/cobalt.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/cobalt.json rename to src/generated/resources/data/c/tags/item/ingots/cobalt.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/dysprosium.json b/src/generated/resources/data/c/tags/item/ingots/dysprosium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/dysprosium.json rename to src/generated/resources/data/c/tags/item/ingots/dysprosium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/erbium.json b/src/generated/resources/data/c/tags/item/ingots/erbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/erbium.json rename to src/generated/resources/data/c/tags/item/ingots/erbium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/europium.json b/src/generated/resources/data/c/tags/item/ingots/europium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/europium.json rename to src/generated/resources/data/c/tags/item/ingots/europium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/francium.json b/src/generated/resources/data/c/tags/item/ingots/francium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/francium.json rename to src/generated/resources/data/c/tags/item/ingots/francium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/gadolinium.json b/src/generated/resources/data/c/tags/item/ingots/gadolinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/gadolinium.json rename to src/generated/resources/data/c/tags/item/ingots/gadolinium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/gallium.json b/src/generated/resources/data/c/tags/item/ingots/gallium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/gallium.json rename to src/generated/resources/data/c/tags/item/ingots/gallium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/hafnium.json b/src/generated/resources/data/c/tags/item/ingots/hafnium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/hafnium.json rename to src/generated/resources/data/c/tags/item/ingots/hafnium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/holmium.json b/src/generated/resources/data/c/tags/item/ingots/holmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/holmium.json rename to src/generated/resources/data/c/tags/item/ingots/holmium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/indium.json b/src/generated/resources/data/c/tags/item/ingots/indium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/indium.json rename to src/generated/resources/data/c/tags/item/ingots/indium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/iridium.json b/src/generated/resources/data/c/tags/item/ingots/iridium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/iridium.json rename to src/generated/resources/data/c/tags/item/ingots/iridium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/lanthanum.json b/src/generated/resources/data/c/tags/item/ingots/lanthanum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/lanthanum.json rename to src/generated/resources/data/c/tags/item/ingots/lanthanum.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/lead.json b/src/generated/resources/data/c/tags/item/ingots/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/lead.json rename to src/generated/resources/data/c/tags/item/ingots/lead.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/lithium.json b/src/generated/resources/data/c/tags/item/ingots/lithium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/lithium.json rename to src/generated/resources/data/c/tags/item/ingots/lithium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/lutetium.json b/src/generated/resources/data/c/tags/item/ingots/lutetium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/lutetium.json rename to src/generated/resources/data/c/tags/item/ingots/lutetium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/magnesium.json b/src/generated/resources/data/c/tags/item/ingots/magnesium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/magnesium.json rename to src/generated/resources/data/c/tags/item/ingots/magnesium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/manganese.json b/src/generated/resources/data/c/tags/item/ingots/manganese.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/manganese.json rename to src/generated/resources/data/c/tags/item/ingots/manganese.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/molybdenum.json b/src/generated/resources/data/c/tags/item/ingots/molybdenum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/molybdenum.json rename to src/generated/resources/data/c/tags/item/ingots/molybdenum.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/neodymium.json b/src/generated/resources/data/c/tags/item/ingots/neodymium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/neodymium.json rename to src/generated/resources/data/c/tags/item/ingots/neodymium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/nickel.json b/src/generated/resources/data/c/tags/item/ingots/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/nickel.json rename to src/generated/resources/data/c/tags/item/ingots/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/niobium.json b/src/generated/resources/data/c/tags/item/ingots/niobium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/niobium.json rename to src/generated/resources/data/c/tags/item/ingots/niobium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/osmium.json b/src/generated/resources/data/c/tags/item/ingots/osmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/osmium.json rename to src/generated/resources/data/c/tags/item/ingots/osmium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/palladium.json b/src/generated/resources/data/c/tags/item/ingots/palladium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/palladium.json rename to src/generated/resources/data/c/tags/item/ingots/palladium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/platinum.json b/src/generated/resources/data/c/tags/item/ingots/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/platinum.json rename to src/generated/resources/data/c/tags/item/ingots/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/polonium.json b/src/generated/resources/data/c/tags/item/ingots/polonium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/polonium.json rename to src/generated/resources/data/c/tags/item/ingots/polonium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/potassium.json b/src/generated/resources/data/c/tags/item/ingots/potassium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/potassium.json rename to src/generated/resources/data/c/tags/item/ingots/potassium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/praseodymium.json b/src/generated/resources/data/c/tags/item/ingots/praseodymium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/praseodymium.json rename to src/generated/resources/data/c/tags/item/ingots/praseodymium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/protactinium.json b/src/generated/resources/data/c/tags/item/ingots/protactinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/protactinium.json rename to src/generated/resources/data/c/tags/item/ingots/protactinium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/radium.json b/src/generated/resources/data/c/tags/item/ingots/radium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/radium.json rename to src/generated/resources/data/c/tags/item/ingots/radium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/rhenium.json b/src/generated/resources/data/c/tags/item/ingots/rhenium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/rhenium.json rename to src/generated/resources/data/c/tags/item/ingots/rhenium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/rhodium.json b/src/generated/resources/data/c/tags/item/ingots/rhodium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/rhodium.json rename to src/generated/resources/data/c/tags/item/ingots/rhodium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/rubidium.json b/src/generated/resources/data/c/tags/item/ingots/rubidium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/rubidium.json rename to src/generated/resources/data/c/tags/item/ingots/rubidium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/ruthenium.json b/src/generated/resources/data/c/tags/item/ingots/ruthenium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/ruthenium.json rename to src/generated/resources/data/c/tags/item/ingots/ruthenium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/samarium.json b/src/generated/resources/data/c/tags/item/ingots/samarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/samarium.json rename to src/generated/resources/data/c/tags/item/ingots/samarium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/scandium.json b/src/generated/resources/data/c/tags/item/ingots/scandium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/scandium.json rename to src/generated/resources/data/c/tags/item/ingots/scandium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/silver.json b/src/generated/resources/data/c/tags/item/ingots/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/silver.json rename to src/generated/resources/data/c/tags/item/ingots/silver.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/sodium.json b/src/generated/resources/data/c/tags/item/ingots/sodium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/sodium.json rename to src/generated/resources/data/c/tags/item/ingots/sodium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/strontium.json b/src/generated/resources/data/c/tags/item/ingots/strontium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/strontium.json rename to src/generated/resources/data/c/tags/item/ingots/strontium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/tantalum.json b/src/generated/resources/data/c/tags/item/ingots/tantalum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/tantalum.json rename to src/generated/resources/data/c/tags/item/ingots/tantalum.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/terbium.json b/src/generated/resources/data/c/tags/item/ingots/terbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/terbium.json rename to src/generated/resources/data/c/tags/item/ingots/terbium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/thallium.json b/src/generated/resources/data/c/tags/item/ingots/thallium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/thallium.json rename to src/generated/resources/data/c/tags/item/ingots/thallium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/thorium.json b/src/generated/resources/data/c/tags/item/ingots/thorium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/thorium.json rename to src/generated/resources/data/c/tags/item/ingots/thorium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/thulium.json b/src/generated/resources/data/c/tags/item/ingots/thulium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/thulium.json rename to src/generated/resources/data/c/tags/item/ingots/thulium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/tin.json b/src/generated/resources/data/c/tags/item/ingots/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/tin.json rename to src/generated/resources/data/c/tags/item/ingots/tin.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/titanium.json b/src/generated/resources/data/c/tags/item/ingots/titanium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/titanium.json rename to src/generated/resources/data/c/tags/item/ingots/titanium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/tungsten.json b/src/generated/resources/data/c/tags/item/ingots/tungsten.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/tungsten.json rename to src/generated/resources/data/c/tags/item/ingots/tungsten.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/uranium.json b/src/generated/resources/data/c/tags/item/ingots/uranium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/uranium.json rename to src/generated/resources/data/c/tags/item/ingots/uranium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/vanadium.json b/src/generated/resources/data/c/tags/item/ingots/vanadium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/vanadium.json rename to src/generated/resources/data/c/tags/item/ingots/vanadium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/ytterbium.json b/src/generated/resources/data/c/tags/item/ingots/ytterbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/ytterbium.json rename to src/generated/resources/data/c/tags/item/ingots/ytterbium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/yttrium.json b/src/generated/resources/data/c/tags/item/ingots/yttrium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/yttrium.json rename to src/generated/resources/data/c/tags/item/ingots/yttrium.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/zinc.json b/src/generated/resources/data/c/tags/item/ingots/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/zinc.json rename to src/generated/resources/data/c/tags/item/ingots/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/zirconium.json b/src/generated/resources/data/c/tags/item/ingots/zirconium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/zirconium.json rename to src/generated/resources/data/c/tags/item/ingots/zirconium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/actinium.json b/src/generated/resources/data/c/tags/item/nuggets/actinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/actinium.json rename to src/generated/resources/data/c/tags/item/nuggets/actinium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/aluminum.json b/src/generated/resources/data/c/tags/item/nuggets/aluminum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/aluminum.json rename to src/generated/resources/data/c/tags/item/nuggets/aluminum.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/barium.json b/src/generated/resources/data/c/tags/item/nuggets/barium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/barium.json rename to src/generated/resources/data/c/tags/item/nuggets/barium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/beryllium.json b/src/generated/resources/data/c/tags/item/nuggets/beryllium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/beryllium.json rename to src/generated/resources/data/c/tags/item/nuggets/beryllium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/bismuth.json b/src/generated/resources/data/c/tags/item/nuggets/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/bismuth.json rename to src/generated/resources/data/c/tags/item/nuggets/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/cadmium.json b/src/generated/resources/data/c/tags/item/nuggets/cadmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/cadmium.json rename to src/generated/resources/data/c/tags/item/nuggets/cadmium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/calcium.json b/src/generated/resources/data/c/tags/item/nuggets/calcium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/calcium.json rename to src/generated/resources/data/c/tags/item/nuggets/calcium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/cerium.json b/src/generated/resources/data/c/tags/item/nuggets/cerium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/cerium.json rename to src/generated/resources/data/c/tags/item/nuggets/cerium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/cesium.json b/src/generated/resources/data/c/tags/item/nuggets/cesium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/cesium.json rename to src/generated/resources/data/c/tags/item/nuggets/cesium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/chromium.json b/src/generated/resources/data/c/tags/item/nuggets/chromium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/chromium.json rename to src/generated/resources/data/c/tags/item/nuggets/chromium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/cobalt.json b/src/generated/resources/data/c/tags/item/nuggets/cobalt.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/cobalt.json rename to src/generated/resources/data/c/tags/item/nuggets/cobalt.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/dysprosium.json b/src/generated/resources/data/c/tags/item/nuggets/dysprosium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/dysprosium.json rename to src/generated/resources/data/c/tags/item/nuggets/dysprosium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/erbium.json b/src/generated/resources/data/c/tags/item/nuggets/erbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/erbium.json rename to src/generated/resources/data/c/tags/item/nuggets/erbium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/europium.json b/src/generated/resources/data/c/tags/item/nuggets/europium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/europium.json rename to src/generated/resources/data/c/tags/item/nuggets/europium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/francium.json b/src/generated/resources/data/c/tags/item/nuggets/francium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/francium.json rename to src/generated/resources/data/c/tags/item/nuggets/francium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/gadolinium.json b/src/generated/resources/data/c/tags/item/nuggets/gadolinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/gadolinium.json rename to src/generated/resources/data/c/tags/item/nuggets/gadolinium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/gallium.json b/src/generated/resources/data/c/tags/item/nuggets/gallium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/gallium.json rename to src/generated/resources/data/c/tags/item/nuggets/gallium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/hafnium.json b/src/generated/resources/data/c/tags/item/nuggets/hafnium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/hafnium.json rename to src/generated/resources/data/c/tags/item/nuggets/hafnium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/holmium.json b/src/generated/resources/data/c/tags/item/nuggets/holmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/holmium.json rename to src/generated/resources/data/c/tags/item/nuggets/holmium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/indium.json b/src/generated/resources/data/c/tags/item/nuggets/indium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/indium.json rename to src/generated/resources/data/c/tags/item/nuggets/indium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/iridium.json b/src/generated/resources/data/c/tags/item/nuggets/iridium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/iridium.json rename to src/generated/resources/data/c/tags/item/nuggets/iridium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/lanthanum.json b/src/generated/resources/data/c/tags/item/nuggets/lanthanum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/lanthanum.json rename to src/generated/resources/data/c/tags/item/nuggets/lanthanum.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/lead.json b/src/generated/resources/data/c/tags/item/nuggets/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/lead.json rename to src/generated/resources/data/c/tags/item/nuggets/lead.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/lithium.json b/src/generated/resources/data/c/tags/item/nuggets/lithium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/lithium.json rename to src/generated/resources/data/c/tags/item/nuggets/lithium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/lutetium.json b/src/generated/resources/data/c/tags/item/nuggets/lutetium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/lutetium.json rename to src/generated/resources/data/c/tags/item/nuggets/lutetium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/magnesium.json b/src/generated/resources/data/c/tags/item/nuggets/magnesium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/magnesium.json rename to src/generated/resources/data/c/tags/item/nuggets/magnesium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/manganese.json b/src/generated/resources/data/c/tags/item/nuggets/manganese.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/manganese.json rename to src/generated/resources/data/c/tags/item/nuggets/manganese.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/molybdenum.json b/src/generated/resources/data/c/tags/item/nuggets/molybdenum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/molybdenum.json rename to src/generated/resources/data/c/tags/item/nuggets/molybdenum.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/neodymium.json b/src/generated/resources/data/c/tags/item/nuggets/neodymium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/neodymium.json rename to src/generated/resources/data/c/tags/item/nuggets/neodymium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/nickel.json b/src/generated/resources/data/c/tags/item/nuggets/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/nickel.json rename to src/generated/resources/data/c/tags/item/nuggets/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/niobium.json b/src/generated/resources/data/c/tags/item/nuggets/niobium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/niobium.json rename to src/generated/resources/data/c/tags/item/nuggets/niobium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/osmium.json b/src/generated/resources/data/c/tags/item/nuggets/osmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/osmium.json rename to src/generated/resources/data/c/tags/item/nuggets/osmium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/palladium.json b/src/generated/resources/data/c/tags/item/nuggets/palladium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/palladium.json rename to src/generated/resources/data/c/tags/item/nuggets/palladium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/platinum.json b/src/generated/resources/data/c/tags/item/nuggets/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/platinum.json rename to src/generated/resources/data/c/tags/item/nuggets/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/polonium.json b/src/generated/resources/data/c/tags/item/nuggets/polonium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/polonium.json rename to src/generated/resources/data/c/tags/item/nuggets/polonium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/potassium.json b/src/generated/resources/data/c/tags/item/nuggets/potassium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/potassium.json rename to src/generated/resources/data/c/tags/item/nuggets/potassium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/praseodymium.json b/src/generated/resources/data/c/tags/item/nuggets/praseodymium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/praseodymium.json rename to src/generated/resources/data/c/tags/item/nuggets/praseodymium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/protactinium.json b/src/generated/resources/data/c/tags/item/nuggets/protactinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/protactinium.json rename to src/generated/resources/data/c/tags/item/nuggets/protactinium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/radium.json b/src/generated/resources/data/c/tags/item/nuggets/radium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/radium.json rename to src/generated/resources/data/c/tags/item/nuggets/radium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/rhenium.json b/src/generated/resources/data/c/tags/item/nuggets/rhenium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/rhenium.json rename to src/generated/resources/data/c/tags/item/nuggets/rhenium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/rhodium.json b/src/generated/resources/data/c/tags/item/nuggets/rhodium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/rhodium.json rename to src/generated/resources/data/c/tags/item/nuggets/rhodium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/rubidium.json b/src/generated/resources/data/c/tags/item/nuggets/rubidium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/rubidium.json rename to src/generated/resources/data/c/tags/item/nuggets/rubidium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/ruthenium.json b/src/generated/resources/data/c/tags/item/nuggets/ruthenium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/ruthenium.json rename to src/generated/resources/data/c/tags/item/nuggets/ruthenium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/samarium.json b/src/generated/resources/data/c/tags/item/nuggets/samarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/samarium.json rename to src/generated/resources/data/c/tags/item/nuggets/samarium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/scandium.json b/src/generated/resources/data/c/tags/item/nuggets/scandium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/scandium.json rename to src/generated/resources/data/c/tags/item/nuggets/scandium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/silver.json b/src/generated/resources/data/c/tags/item/nuggets/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/silver.json rename to src/generated/resources/data/c/tags/item/nuggets/silver.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/sodium.json b/src/generated/resources/data/c/tags/item/nuggets/sodium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/sodium.json rename to src/generated/resources/data/c/tags/item/nuggets/sodium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/strontium.json b/src/generated/resources/data/c/tags/item/nuggets/strontium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/strontium.json rename to src/generated/resources/data/c/tags/item/nuggets/strontium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/tantalum.json b/src/generated/resources/data/c/tags/item/nuggets/tantalum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/tantalum.json rename to src/generated/resources/data/c/tags/item/nuggets/tantalum.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/terbium.json b/src/generated/resources/data/c/tags/item/nuggets/terbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/terbium.json rename to src/generated/resources/data/c/tags/item/nuggets/terbium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/thallium.json b/src/generated/resources/data/c/tags/item/nuggets/thallium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/thallium.json rename to src/generated/resources/data/c/tags/item/nuggets/thallium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/thorium.json b/src/generated/resources/data/c/tags/item/nuggets/thorium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/thorium.json rename to src/generated/resources/data/c/tags/item/nuggets/thorium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/thulium.json b/src/generated/resources/data/c/tags/item/nuggets/thulium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/thulium.json rename to src/generated/resources/data/c/tags/item/nuggets/thulium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/tin.json b/src/generated/resources/data/c/tags/item/nuggets/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/tin.json rename to src/generated/resources/data/c/tags/item/nuggets/tin.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/titanium.json b/src/generated/resources/data/c/tags/item/nuggets/titanium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/titanium.json rename to src/generated/resources/data/c/tags/item/nuggets/titanium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/tungsten.json b/src/generated/resources/data/c/tags/item/nuggets/tungsten.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/tungsten.json rename to src/generated/resources/data/c/tags/item/nuggets/tungsten.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/uranium.json b/src/generated/resources/data/c/tags/item/nuggets/uranium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/uranium.json rename to src/generated/resources/data/c/tags/item/nuggets/uranium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/vanadium.json b/src/generated/resources/data/c/tags/item/nuggets/vanadium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/vanadium.json rename to src/generated/resources/data/c/tags/item/nuggets/vanadium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/ytterbium.json b/src/generated/resources/data/c/tags/item/nuggets/ytterbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/ytterbium.json rename to src/generated/resources/data/c/tags/item/nuggets/ytterbium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/yttrium.json b/src/generated/resources/data/c/tags/item/nuggets/yttrium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/yttrium.json rename to src/generated/resources/data/c/tags/item/nuggets/yttrium.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/zinc.json b/src/generated/resources/data/c/tags/item/nuggets/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/zinc.json rename to src/generated/resources/data/c/tags/item/nuggets/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/zirconium.json b/src/generated/resources/data/c/tags/item/nuggets/zirconium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/zirconium.json rename to src/generated/resources/data/c/tags/item/nuggets/zirconium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/actinium.json b/src/generated/resources/data/c/tags/item/plates/actinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/actinium.json rename to src/generated/resources/data/c/tags/item/plates/actinium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/aluminum.json b/src/generated/resources/data/c/tags/item/plates/aluminum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/aluminum.json rename to src/generated/resources/data/c/tags/item/plates/aluminum.json diff --git a/src/generated/resources/data/forge/tags/items/plates/barium.json b/src/generated/resources/data/c/tags/item/plates/barium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/barium.json rename to src/generated/resources/data/c/tags/item/plates/barium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/beryllium.json b/src/generated/resources/data/c/tags/item/plates/beryllium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/beryllium.json rename to src/generated/resources/data/c/tags/item/plates/beryllium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/bismuth.json b/src/generated/resources/data/c/tags/item/plates/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/bismuth.json rename to src/generated/resources/data/c/tags/item/plates/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/plates/cadmium.json b/src/generated/resources/data/c/tags/item/plates/cadmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/cadmium.json rename to src/generated/resources/data/c/tags/item/plates/cadmium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/calcium.json b/src/generated/resources/data/c/tags/item/plates/calcium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/calcium.json rename to src/generated/resources/data/c/tags/item/plates/calcium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/cerium.json b/src/generated/resources/data/c/tags/item/plates/cerium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/cerium.json rename to src/generated/resources/data/c/tags/item/plates/cerium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/cesium.json b/src/generated/resources/data/c/tags/item/plates/cesium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/cesium.json rename to src/generated/resources/data/c/tags/item/plates/cesium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/chromium.json b/src/generated/resources/data/c/tags/item/plates/chromium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/chromium.json rename to src/generated/resources/data/c/tags/item/plates/chromium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/cobalt.json b/src/generated/resources/data/c/tags/item/plates/cobalt.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/cobalt.json rename to src/generated/resources/data/c/tags/item/plates/cobalt.json diff --git a/src/generated/resources/data/forge/tags/items/plates/copper.json b/src/generated/resources/data/c/tags/item/plates/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/copper.json rename to src/generated/resources/data/c/tags/item/plates/copper.json diff --git a/src/generated/resources/data/forge/tags/items/plates/dysprosium.json b/src/generated/resources/data/c/tags/item/plates/dysprosium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/dysprosium.json rename to src/generated/resources/data/c/tags/item/plates/dysprosium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/erbium.json b/src/generated/resources/data/c/tags/item/plates/erbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/erbium.json rename to src/generated/resources/data/c/tags/item/plates/erbium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/europium.json b/src/generated/resources/data/c/tags/item/plates/europium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/europium.json rename to src/generated/resources/data/c/tags/item/plates/europium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/francium.json b/src/generated/resources/data/c/tags/item/plates/francium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/francium.json rename to src/generated/resources/data/c/tags/item/plates/francium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/gadolinium.json b/src/generated/resources/data/c/tags/item/plates/gadolinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/gadolinium.json rename to src/generated/resources/data/c/tags/item/plates/gadolinium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/gallium.json b/src/generated/resources/data/c/tags/item/plates/gallium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/gallium.json rename to src/generated/resources/data/c/tags/item/plates/gallium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/gold.json b/src/generated/resources/data/c/tags/item/plates/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/gold.json rename to src/generated/resources/data/c/tags/item/plates/gold.json diff --git a/src/generated/resources/data/forge/tags/items/plates/hafnium.json b/src/generated/resources/data/c/tags/item/plates/hafnium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/hafnium.json rename to src/generated/resources/data/c/tags/item/plates/hafnium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/holmium.json b/src/generated/resources/data/c/tags/item/plates/holmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/holmium.json rename to src/generated/resources/data/c/tags/item/plates/holmium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/indium.json b/src/generated/resources/data/c/tags/item/plates/indium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/indium.json rename to src/generated/resources/data/c/tags/item/plates/indium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/iridium.json b/src/generated/resources/data/c/tags/item/plates/iridium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/iridium.json rename to src/generated/resources/data/c/tags/item/plates/iridium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/iron.json b/src/generated/resources/data/c/tags/item/plates/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/iron.json rename to src/generated/resources/data/c/tags/item/plates/iron.json diff --git a/src/generated/resources/data/forge/tags/items/plates/lanthanum.json b/src/generated/resources/data/c/tags/item/plates/lanthanum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/lanthanum.json rename to src/generated/resources/data/c/tags/item/plates/lanthanum.json diff --git a/src/generated/resources/data/forge/tags/items/plates/lead.json b/src/generated/resources/data/c/tags/item/plates/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/lead.json rename to src/generated/resources/data/c/tags/item/plates/lead.json diff --git a/src/generated/resources/data/forge/tags/items/plates/lithium.json b/src/generated/resources/data/c/tags/item/plates/lithium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/lithium.json rename to src/generated/resources/data/c/tags/item/plates/lithium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/lutetium.json b/src/generated/resources/data/c/tags/item/plates/lutetium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/lutetium.json rename to src/generated/resources/data/c/tags/item/plates/lutetium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/magnesium.json b/src/generated/resources/data/c/tags/item/plates/magnesium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/magnesium.json rename to src/generated/resources/data/c/tags/item/plates/magnesium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/manganese.json b/src/generated/resources/data/c/tags/item/plates/manganese.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/manganese.json rename to src/generated/resources/data/c/tags/item/plates/manganese.json diff --git a/src/generated/resources/data/forge/tags/items/plates/molybdenum.json b/src/generated/resources/data/c/tags/item/plates/molybdenum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/molybdenum.json rename to src/generated/resources/data/c/tags/item/plates/molybdenum.json diff --git a/src/generated/resources/data/forge/tags/items/plates/neodymium.json b/src/generated/resources/data/c/tags/item/plates/neodymium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/neodymium.json rename to src/generated/resources/data/c/tags/item/plates/neodymium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/nickel.json b/src/generated/resources/data/c/tags/item/plates/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/nickel.json rename to src/generated/resources/data/c/tags/item/plates/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/plates/niobium.json b/src/generated/resources/data/c/tags/item/plates/niobium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/niobium.json rename to src/generated/resources/data/c/tags/item/plates/niobium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/osmium.json b/src/generated/resources/data/c/tags/item/plates/osmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/osmium.json rename to src/generated/resources/data/c/tags/item/plates/osmium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/palladium.json b/src/generated/resources/data/c/tags/item/plates/palladium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/palladium.json rename to src/generated/resources/data/c/tags/item/plates/palladium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/platinum.json b/src/generated/resources/data/c/tags/item/plates/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/platinum.json rename to src/generated/resources/data/c/tags/item/plates/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/plates/polonium.json b/src/generated/resources/data/c/tags/item/plates/polonium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/polonium.json rename to src/generated/resources/data/c/tags/item/plates/polonium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/polyvinyl_chloride.json b/src/generated/resources/data/c/tags/item/plates/polyvinyl_chloride.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/polyvinyl_chloride.json rename to src/generated/resources/data/c/tags/item/plates/polyvinyl_chloride.json diff --git a/src/generated/resources/data/forge/tags/items/plates/potassium.json b/src/generated/resources/data/c/tags/item/plates/potassium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/potassium.json rename to src/generated/resources/data/c/tags/item/plates/potassium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/praseodymium.json b/src/generated/resources/data/c/tags/item/plates/praseodymium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/praseodymium.json rename to src/generated/resources/data/c/tags/item/plates/praseodymium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/protactinium.json b/src/generated/resources/data/c/tags/item/plates/protactinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/protactinium.json rename to src/generated/resources/data/c/tags/item/plates/protactinium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/radium.json b/src/generated/resources/data/c/tags/item/plates/radium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/radium.json rename to src/generated/resources/data/c/tags/item/plates/radium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/rhenium.json b/src/generated/resources/data/c/tags/item/plates/rhenium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/rhenium.json rename to src/generated/resources/data/c/tags/item/plates/rhenium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/rhodium.json b/src/generated/resources/data/c/tags/item/plates/rhodium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/rhodium.json rename to src/generated/resources/data/c/tags/item/plates/rhodium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/rubidium.json b/src/generated/resources/data/c/tags/item/plates/rubidium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/rubidium.json rename to src/generated/resources/data/c/tags/item/plates/rubidium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/ruthenium.json b/src/generated/resources/data/c/tags/item/plates/ruthenium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/ruthenium.json rename to src/generated/resources/data/c/tags/item/plates/ruthenium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/samarium.json b/src/generated/resources/data/c/tags/item/plates/samarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/samarium.json rename to src/generated/resources/data/c/tags/item/plates/samarium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/scandium.json b/src/generated/resources/data/c/tags/item/plates/scandium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/scandium.json rename to src/generated/resources/data/c/tags/item/plates/scandium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/silver.json b/src/generated/resources/data/c/tags/item/plates/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/silver.json rename to src/generated/resources/data/c/tags/item/plates/silver.json diff --git a/src/generated/resources/data/forge/tags/items/plates/sodium.json b/src/generated/resources/data/c/tags/item/plates/sodium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/sodium.json rename to src/generated/resources/data/c/tags/item/plates/sodium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/strontium.json b/src/generated/resources/data/c/tags/item/plates/strontium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/strontium.json rename to src/generated/resources/data/c/tags/item/plates/strontium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/tantalum.json b/src/generated/resources/data/c/tags/item/plates/tantalum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/tantalum.json rename to src/generated/resources/data/c/tags/item/plates/tantalum.json diff --git a/src/generated/resources/data/forge/tags/items/plates/terbium.json b/src/generated/resources/data/c/tags/item/plates/terbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/terbium.json rename to src/generated/resources/data/c/tags/item/plates/terbium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/thallium.json b/src/generated/resources/data/c/tags/item/plates/thallium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/thallium.json rename to src/generated/resources/data/c/tags/item/plates/thallium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/thorium.json b/src/generated/resources/data/c/tags/item/plates/thorium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/thorium.json rename to src/generated/resources/data/c/tags/item/plates/thorium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/thulium.json b/src/generated/resources/data/c/tags/item/plates/thulium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/thulium.json rename to src/generated/resources/data/c/tags/item/plates/thulium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/tin.json b/src/generated/resources/data/c/tags/item/plates/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/tin.json rename to src/generated/resources/data/c/tags/item/plates/tin.json diff --git a/src/generated/resources/data/forge/tags/items/plates/titanium.json b/src/generated/resources/data/c/tags/item/plates/titanium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/titanium.json rename to src/generated/resources/data/c/tags/item/plates/titanium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/tungsten.json b/src/generated/resources/data/c/tags/item/plates/tungsten.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/tungsten.json rename to src/generated/resources/data/c/tags/item/plates/tungsten.json diff --git a/src/generated/resources/data/forge/tags/items/plates/uranium.json b/src/generated/resources/data/c/tags/item/plates/uranium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/uranium.json rename to src/generated/resources/data/c/tags/item/plates/uranium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/vanadium.json b/src/generated/resources/data/c/tags/item/plates/vanadium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/vanadium.json rename to src/generated/resources/data/c/tags/item/plates/vanadium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/ytterbium.json b/src/generated/resources/data/c/tags/item/plates/ytterbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/ytterbium.json rename to src/generated/resources/data/c/tags/item/plates/ytterbium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/yttrium.json b/src/generated/resources/data/c/tags/item/plates/yttrium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/yttrium.json rename to src/generated/resources/data/c/tags/item/plates/yttrium.json diff --git a/src/generated/resources/data/forge/tags/items/plates/zinc.json b/src/generated/resources/data/c/tags/item/plates/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/zinc.json rename to src/generated/resources/data/c/tags/item/plates/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/plates/zirconium.json b/src/generated/resources/data/c/tags/item/plates/zirconium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/plates/zirconium.json rename to src/generated/resources/data/c/tags/item/plates/zirconium.json diff --git a/src/generated/resources/data/forge/tags/items/sawdust.json b/src/generated/resources/data/c/tags/item/sawdust.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/sawdust.json rename to src/generated/resources/data/c/tags/item/sawdust.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/actinium.json b/src/generated/resources/data/c/tags/item/storage_blocks/actinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/actinium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/actinium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/aluminum.json b/src/generated/resources/data/c/tags/item/storage_blocks/aluminum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/aluminum.json rename to src/generated/resources/data/c/tags/item/storage_blocks/aluminum.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/barium.json b/src/generated/resources/data/c/tags/item/storage_blocks/barium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/barium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/barium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/beryllium.json b/src/generated/resources/data/c/tags/item/storage_blocks/beryllium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/beryllium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/beryllium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/bismuth.json b/src/generated/resources/data/c/tags/item/storage_blocks/bismuth.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/bismuth.json rename to src/generated/resources/data/c/tags/item/storage_blocks/bismuth.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/cadmium.json b/src/generated/resources/data/c/tags/item/storage_blocks/cadmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/cadmium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/cadmium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/calcium.json b/src/generated/resources/data/c/tags/item/storage_blocks/calcium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/calcium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/calcium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/cerium.json b/src/generated/resources/data/c/tags/item/storage_blocks/cerium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/cerium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/cerium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/cesium.json b/src/generated/resources/data/c/tags/item/storage_blocks/cesium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/cesium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/cesium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/chromium.json b/src/generated/resources/data/c/tags/item/storage_blocks/chromium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/chromium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/chromium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/cobalt.json b/src/generated/resources/data/c/tags/item/storage_blocks/cobalt.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/cobalt.json rename to src/generated/resources/data/c/tags/item/storage_blocks/cobalt.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/dysprosium.json b/src/generated/resources/data/c/tags/item/storage_blocks/dysprosium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/dysprosium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/dysprosium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/erbium.json b/src/generated/resources/data/c/tags/item/storage_blocks/erbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/erbium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/erbium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/europium.json b/src/generated/resources/data/c/tags/item/storage_blocks/europium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/europium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/europium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/francium.json b/src/generated/resources/data/c/tags/item/storage_blocks/francium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/francium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/francium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/gadolinium.json b/src/generated/resources/data/c/tags/item/storage_blocks/gadolinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/gadolinium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/gadolinium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/gallium.json b/src/generated/resources/data/c/tags/item/storage_blocks/gallium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/gallium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/gallium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/hafnium.json b/src/generated/resources/data/c/tags/item/storage_blocks/hafnium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/hafnium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/hafnium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/holmium.json b/src/generated/resources/data/c/tags/item/storage_blocks/holmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/holmium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/holmium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/indium.json b/src/generated/resources/data/c/tags/item/storage_blocks/indium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/indium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/indium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/iridium.json b/src/generated/resources/data/c/tags/item/storage_blocks/iridium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/iridium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/iridium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/lanthanum.json b/src/generated/resources/data/c/tags/item/storage_blocks/lanthanum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/lanthanum.json rename to src/generated/resources/data/c/tags/item/storage_blocks/lanthanum.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/lead.json b/src/generated/resources/data/c/tags/item/storage_blocks/lead.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/lead.json rename to src/generated/resources/data/c/tags/item/storage_blocks/lead.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/lithium.json b/src/generated/resources/data/c/tags/item/storage_blocks/lithium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/lithium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/lithium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/lutetium.json b/src/generated/resources/data/c/tags/item/storage_blocks/lutetium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/lutetium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/lutetium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/magnesium.json b/src/generated/resources/data/c/tags/item/storage_blocks/magnesium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/magnesium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/magnesium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/manganese.json b/src/generated/resources/data/c/tags/item/storage_blocks/manganese.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/manganese.json rename to src/generated/resources/data/c/tags/item/storage_blocks/manganese.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/molybdenum.json b/src/generated/resources/data/c/tags/item/storage_blocks/molybdenum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/molybdenum.json rename to src/generated/resources/data/c/tags/item/storage_blocks/molybdenum.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/neodymium.json b/src/generated/resources/data/c/tags/item/storage_blocks/neodymium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/neodymium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/neodymium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/nickel.json b/src/generated/resources/data/c/tags/item/storage_blocks/nickel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/nickel.json rename to src/generated/resources/data/c/tags/item/storage_blocks/nickel.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/niobium.json b/src/generated/resources/data/c/tags/item/storage_blocks/niobium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/niobium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/niobium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/osmium.json b/src/generated/resources/data/c/tags/item/storage_blocks/osmium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/osmium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/osmium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/palladium.json b/src/generated/resources/data/c/tags/item/storage_blocks/palladium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/palladium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/palladium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/platinum.json b/src/generated/resources/data/c/tags/item/storage_blocks/platinum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/platinum.json rename to src/generated/resources/data/c/tags/item/storage_blocks/platinum.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/polonium.json b/src/generated/resources/data/c/tags/item/storage_blocks/polonium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/polonium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/polonium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/potassium.json b/src/generated/resources/data/c/tags/item/storage_blocks/potassium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/potassium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/potassium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/praseodymium.json b/src/generated/resources/data/c/tags/item/storage_blocks/praseodymium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/praseodymium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/praseodymium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/protactinium.json b/src/generated/resources/data/c/tags/item/storage_blocks/protactinium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/protactinium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/protactinium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/radium.json b/src/generated/resources/data/c/tags/item/storage_blocks/radium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/radium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/radium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/rhenium.json b/src/generated/resources/data/c/tags/item/storage_blocks/rhenium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/rhenium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/rhenium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/rhodium.json b/src/generated/resources/data/c/tags/item/storage_blocks/rhodium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/rhodium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/rhodium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/rubidium.json b/src/generated/resources/data/c/tags/item/storage_blocks/rubidium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/rubidium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/rubidium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/ruthenium.json b/src/generated/resources/data/c/tags/item/storage_blocks/ruthenium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/ruthenium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/ruthenium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/samarium.json b/src/generated/resources/data/c/tags/item/storage_blocks/samarium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/samarium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/samarium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/scandium.json b/src/generated/resources/data/c/tags/item/storage_blocks/scandium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/scandium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/scandium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/silver.json b/src/generated/resources/data/c/tags/item/storage_blocks/silver.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/silver.json rename to src/generated/resources/data/c/tags/item/storage_blocks/silver.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/sodium.json b/src/generated/resources/data/c/tags/item/storage_blocks/sodium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/sodium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/sodium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/strontium.json b/src/generated/resources/data/c/tags/item/storage_blocks/strontium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/strontium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/strontium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/tantalum.json b/src/generated/resources/data/c/tags/item/storage_blocks/tantalum.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/tantalum.json rename to src/generated/resources/data/c/tags/item/storage_blocks/tantalum.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/terbium.json b/src/generated/resources/data/c/tags/item/storage_blocks/terbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/terbium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/terbium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/thallium.json b/src/generated/resources/data/c/tags/item/storage_blocks/thallium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/thallium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/thallium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/thorium.json b/src/generated/resources/data/c/tags/item/storage_blocks/thorium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/thorium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/thorium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/thulium.json b/src/generated/resources/data/c/tags/item/storage_blocks/thulium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/thulium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/thulium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/tin.json b/src/generated/resources/data/c/tags/item/storage_blocks/tin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/tin.json rename to src/generated/resources/data/c/tags/item/storage_blocks/tin.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/titanium.json b/src/generated/resources/data/c/tags/item/storage_blocks/titanium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/titanium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/titanium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/tungsten.json b/src/generated/resources/data/c/tags/item/storage_blocks/tungsten.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/tungsten.json rename to src/generated/resources/data/c/tags/item/storage_blocks/tungsten.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/uranium.json b/src/generated/resources/data/c/tags/item/storage_blocks/uranium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/uranium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/uranium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/vanadium.json b/src/generated/resources/data/c/tags/item/storage_blocks/vanadium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/vanadium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/vanadium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/ytterbium.json b/src/generated/resources/data/c/tags/item/storage_blocks/ytterbium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/ytterbium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/ytterbium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/yttrium.json b/src/generated/resources/data/c/tags/item/storage_blocks/yttrium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/yttrium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/yttrium.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/zinc.json b/src/generated/resources/data/c/tags/item/storage_blocks/zinc.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/zinc.json rename to src/generated/resources/data/c/tags/item/storage_blocks/zinc.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/zirconium.json b/src/generated/resources/data/c/tags/item/storage_blocks/zirconium.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/zirconium.json rename to src/generated/resources/data/c/tags/item/storage_blocks/zirconium.json diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_block_to_ingot.json index a5848c37..2a39d2d4 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_actinium": { + "has_chemlib:actinium": { "conditions": { "items": [ { - "items": [ - "chemlib:actinium" - ] + "items": "chemlib:actinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_actinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:actinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_ingot_from_blasting_actinium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_ingot_from_blasting_actinium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_ingot_from_blasting_actinium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_ingot_from_blasting_actinium_dust.json index 7c5f4ea6..30dfe768 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_ingot_from_blasting_actinium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_ingot_from_blasting_actinium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_actinium": { + "has_chemlib:actinium": { "conditions": { "items": [ { - "items": [ - "chemlib:actinium" - ] + "items": "chemlib:actinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_actinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:actinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_ingot_from_smelting_actinium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_ingot_from_smelting_actinium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_ingot_from_smelting_actinium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_ingot_from_smelting_actinium_dust.json index 764945db..f33d677a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_ingot_from_smelting_actinium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_ingot_from_smelting_actinium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_actinium": { + "has_chemlib:actinium": { "conditions": { "items": [ { - "items": [ - "chemlib:actinium" - ] + "items": "chemlib:actinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_actinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:actinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_ingot_to_block.json index 1c6c2a67..b96b4ea5 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_actinium": { + "has_chemlib:actinium": { "conditions": { "items": [ { - "items": [ - "chemlib:actinium" - ] + "items": "chemlib:actinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_actinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:actinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_ingot_to_nugget.json index 8b93e99f..8b07d354 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_actinium": { + "has_chemlib:actinium": { "conditions": { "items": [ { - "items": [ - "chemlib:actinium" - ] + "items": "chemlib:actinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_actinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:actinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_nugget_to_ingot.json index dac7a4af..f5b165ba 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/actinium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/actinium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_actinium": { + "has_chemlib:actinium": { "conditions": { "items": [ { - "items": [ - "chemlib:actinium" - ] + "items": "chemlib:actinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_actinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:actinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_block_to_ingot.json index fa56af48..46244cf2 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_aluminum": { + "has_chemlib:aluminum": { "conditions": { "items": [ { - "items": [ - "chemlib:aluminum" - ] + "items": "chemlib:aluminum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_aluminum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:aluminum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_ingot_from_blasting_aluminum_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_ingot_from_blasting_aluminum_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_ingot_from_blasting_aluminum_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_ingot_from_blasting_aluminum_dust.json index bd045069..8855a3cf 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_ingot_from_blasting_aluminum_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_ingot_from_blasting_aluminum_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_aluminum": { + "has_chemlib:aluminum": { "conditions": { "items": [ { - "items": [ - "chemlib:aluminum" - ] + "items": "chemlib:aluminum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_aluminum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:aluminum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_ingot_from_smelting_aluminum_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_ingot_from_smelting_aluminum_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_ingot_from_smelting_aluminum_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_ingot_from_smelting_aluminum_dust.json index d5462ff2..991f1efc 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_ingot_from_smelting_aluminum_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_ingot_from_smelting_aluminum_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_aluminum": { + "has_chemlib:aluminum": { "conditions": { "items": [ { - "items": [ - "chemlib:aluminum" - ] + "items": "chemlib:aluminum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_aluminum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:aluminum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_ingot_to_block.json index 86aa9a9f..6d4f8601 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_aluminum": { + "has_chemlib:aluminum": { "conditions": { "items": [ { - "items": [ - "chemlib:aluminum" - ] + "items": "chemlib:aluminum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_aluminum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:aluminum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_ingot_to_nugget.json index 4a334f2a..aeda0189 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_aluminum": { + "has_chemlib:aluminum": { "conditions": { "items": [ { - "items": [ - "chemlib:aluminum" - ] + "items": "chemlib:aluminum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_aluminum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:aluminum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_nugget_to_ingot.json index 8789c4c2..76a48031 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/aluminum_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/aluminum_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_aluminum": { + "has_chemlib:aluminum": { "conditions": { "items": [ { - "items": [ - "chemlib:aluminum" - ] + "items": "chemlib:aluminum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_aluminum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:aluminum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/argon_lamp_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/argon_lamp_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/argon_lamp_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/argon_lamp_block.json index 062bc422..b475e7f0 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/argon_lamp_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/argon_lamp_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_argon": { + "has_chemlib:argon": { "conditions": { "items": [ { - "items": [ - "chemlib:argon" - ] + "items": "chemlib:argon" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_argon", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:argon" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/barium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/barium_block_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/barium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/barium_block_to_ingot.json index 058c1fa3..aa72c639 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/barium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/barium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_barium": { + "has_chemlib:barium": { "conditions": { "items": [ { - "items": [ - "chemlib:barium" - ] + "items": "chemlib:barium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_barium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:barium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/barium_ingot_from_blasting_barium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/barium_ingot_from_blasting_barium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/barium_ingot_from_blasting_barium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/barium_ingot_from_blasting_barium_dust.json index f8f70eeb..860711b1 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/barium_ingot_from_blasting_barium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/barium_ingot_from_blasting_barium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_barium": { + "has_chemlib:barium": { "conditions": { "items": [ { - "items": [ - "chemlib:barium" - ] + "items": "chemlib:barium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_barium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:barium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/barium_ingot_from_smelting_barium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/barium_ingot_from_smelting_barium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/barium_ingot_from_smelting_barium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/barium_ingot_from_smelting_barium_dust.json index 07d6740b..af831387 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/barium_ingot_from_smelting_barium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/barium_ingot_from_smelting_barium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_barium": { + "has_chemlib:barium": { "conditions": { "items": [ { - "items": [ - "chemlib:barium" - ] + "items": "chemlib:barium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_barium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:barium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/barium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/barium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/barium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/barium_ingot_to_block.json index 7afae09b..9d9fbed7 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/barium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/barium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_barium": { + "has_chemlib:barium": { "conditions": { "items": [ { - "items": [ - "chemlib:barium" - ] + "items": "chemlib:barium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_barium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:barium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/barium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/barium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/barium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/barium_ingot_to_nugget.json index 1fe8f0d1..a3c184fc 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/barium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/barium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_barium": { + "has_chemlib:barium": { "conditions": { "items": [ { - "items": [ - "chemlib:barium" - ] + "items": "chemlib:barium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_barium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:barium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/barium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/barium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/barium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/barium_nugget_to_ingot.json index 8d8f996c..d91f80a6 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/barium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/barium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_barium": { + "has_chemlib:barium": { "conditions": { "items": [ { - "items": [ - "chemlib:barium" - ] + "items": "chemlib:barium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_barium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:barium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_block_to_ingot.json index b07979fb..3e3a4a35 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_beryllium": { + "has_chemlib:beryllium": { "conditions": { "items": [ { - "items": [ - "chemlib:beryllium" - ] + "items": "chemlib:beryllium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_beryllium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:beryllium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_ingot_from_blasting_beryllium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_ingot_from_blasting_beryllium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_ingot_from_blasting_beryllium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_ingot_from_blasting_beryllium_dust.json index c07fbed2..18944626 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_ingot_from_blasting_beryllium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_ingot_from_blasting_beryllium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_beryllium": { + "has_chemlib:beryllium": { "conditions": { "items": [ { - "items": [ - "chemlib:beryllium" - ] + "items": "chemlib:beryllium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_beryllium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:beryllium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_ingot_from_smelting_beryllium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_ingot_from_smelting_beryllium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_ingot_from_smelting_beryllium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_ingot_from_smelting_beryllium_dust.json index 54be1231..c3393ef9 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_ingot_from_smelting_beryllium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_ingot_from_smelting_beryllium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_beryllium": { + "has_chemlib:beryllium": { "conditions": { "items": [ { - "items": [ - "chemlib:beryllium" - ] + "items": "chemlib:beryllium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_beryllium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:beryllium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_ingot_to_block.json index 05706134..dcaa113b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_beryllium": { + "has_chemlib:beryllium": { "conditions": { "items": [ { - "items": [ - "chemlib:beryllium" - ] + "items": "chemlib:beryllium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_beryllium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:beryllium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_ingot_to_nugget.json index 2220d4e7..f7400380 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_beryllium": { + "has_chemlib:beryllium": { "conditions": { "items": [ { - "items": [ - "chemlib:beryllium" - ] + "items": "chemlib:beryllium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_beryllium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:beryllium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_nugget_to_ingot.json index 2a34d1f4..7aeb6328 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/beryllium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/beryllium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_beryllium": { + "has_chemlib:beryllium": { "conditions": { "items": [ { - "items": [ - "chemlib:beryllium" - ] + "items": "chemlib:beryllium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_beryllium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:beryllium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_block_to_ingot.json index f6756494..472faa40 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_bismuth": { + "has_chemlib:bismuth": { "conditions": { "items": [ { - "items": [ - "chemlib:bismuth" - ] + "items": "chemlib:bismuth" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_bismuth", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:bismuth" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_ingot_from_blasting_bismuth_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_ingot_from_blasting_bismuth_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_ingot_from_blasting_bismuth_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_ingot_from_blasting_bismuth_dust.json index ae1c1af7..42b9221a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_ingot_from_blasting_bismuth_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_ingot_from_blasting_bismuth_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_bismuth": { + "has_chemlib:bismuth": { "conditions": { "items": [ { - "items": [ - "chemlib:bismuth" - ] + "items": "chemlib:bismuth" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_bismuth", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:bismuth" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_ingot_from_smelting_bismuth_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_ingot_from_smelting_bismuth_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_ingot_from_smelting_bismuth_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_ingot_from_smelting_bismuth_dust.json index 51c3d5c6..f99557fe 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_ingot_from_smelting_bismuth_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_ingot_from_smelting_bismuth_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_bismuth": { + "has_chemlib:bismuth": { "conditions": { "items": [ { - "items": [ - "chemlib:bismuth" - ] + "items": "chemlib:bismuth" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_bismuth", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:bismuth" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_ingot_to_block.json index ce522224..ceb7d998 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_bismuth": { + "has_chemlib:bismuth": { "conditions": { "items": [ { - "items": [ - "chemlib:bismuth" - ] + "items": "chemlib:bismuth" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_bismuth", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:bismuth" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_ingot_to_nugget.json index c26299e3..13ed2f56 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_bismuth": { + "has_chemlib:bismuth": { "conditions": { "items": [ { - "items": [ - "chemlib:bismuth" - ] + "items": "chemlib:bismuth" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_bismuth", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:bismuth" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_nugget_to_ingot.json index 9266546a..13e931a4 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/bismuth_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/bismuth_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_bismuth": { + "has_chemlib:bismuth": { "conditions": { "items": [ { - "items": [ - "chemlib:bismuth" - ] + "items": "chemlib:bismuth" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_bismuth", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:bismuth" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_block_to_ingot.json index c7ca7e2e..ae36b241 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cadmium": { + "has_chemlib:cadmium": { "conditions": { "items": [ { - "items": [ - "chemlib:cadmium" - ] + "items": "chemlib:cadmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cadmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cadmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_ingot_from_blasting_cadmium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_ingot_from_blasting_cadmium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_ingot_from_blasting_cadmium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_ingot_from_blasting_cadmium_dust.json index 627a98c1..27847453 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_ingot_from_blasting_cadmium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_ingot_from_blasting_cadmium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cadmium": { + "has_chemlib:cadmium": { "conditions": { "items": [ { - "items": [ - "chemlib:cadmium" - ] + "items": "chemlib:cadmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cadmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cadmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_ingot_from_smelting_cadmium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_ingot_from_smelting_cadmium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_ingot_from_smelting_cadmium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_ingot_from_smelting_cadmium_dust.json index 09524848..c0c70132 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_ingot_from_smelting_cadmium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_ingot_from_smelting_cadmium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cadmium": { + "has_chemlib:cadmium": { "conditions": { "items": [ { - "items": [ - "chemlib:cadmium" - ] + "items": "chemlib:cadmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cadmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cadmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_ingot_to_block.json index c0dd3297..d8471e6f 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cadmium": { + "has_chemlib:cadmium": { "conditions": { "items": [ { - "items": [ - "chemlib:cadmium" - ] + "items": "chemlib:cadmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cadmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cadmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_ingot_to_nugget.json index eb101fa2..9354db5b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cadmium": { + "has_chemlib:cadmium": { "conditions": { "items": [ { - "items": [ - "chemlib:cadmium" - ] + "items": "chemlib:cadmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cadmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cadmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_nugget_to_ingot.json index 1e860206..9d8eeb32 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cadmium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cadmium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cadmium": { + "has_chemlib:cadmium": { "conditions": { "items": [ { - "items": [ - "chemlib:cadmium" - ] + "items": "chemlib:cadmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cadmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cadmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_block_to_ingot.json index 091b949b..0bfe2092 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_calcium": { + "has_chemlib:calcium": { "conditions": { "items": [ { - "items": [ - "chemlib:calcium" - ] + "items": "chemlib:calcium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_calcium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:calcium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_ingot_from_blasting_calcium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_ingot_from_blasting_calcium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_ingot_from_blasting_calcium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_ingot_from_blasting_calcium_dust.json index 87749dec..93969d1d 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_ingot_from_blasting_calcium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_ingot_from_blasting_calcium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_calcium": { + "has_chemlib:calcium": { "conditions": { "items": [ { - "items": [ - "chemlib:calcium" - ] + "items": "chemlib:calcium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_calcium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:calcium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_ingot_from_smelting_calcium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_ingot_from_smelting_calcium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_ingot_from_smelting_calcium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_ingot_from_smelting_calcium_dust.json index 035eb0f1..6b714e5b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_ingot_from_smelting_calcium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_ingot_from_smelting_calcium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_calcium": { + "has_chemlib:calcium": { "conditions": { "items": [ { - "items": [ - "chemlib:calcium" - ] + "items": "chemlib:calcium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_calcium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:calcium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_ingot_to_block.json index 52dfd233..b6be2a4a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_calcium": { + "has_chemlib:calcium": { "conditions": { "items": [ { - "items": [ - "chemlib:calcium" - ] + "items": "chemlib:calcium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_calcium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:calcium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_ingot_to_nugget.json index b5833a3c..bb9e5258 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_calcium": { + "has_chemlib:calcium": { "conditions": { "items": [ { - "items": [ - "chemlib:calcium" - ] + "items": "chemlib:calcium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_calcium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:calcium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_nugget_to_ingot.json index 8a662506..09ab6a00 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/calcium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/calcium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_calcium": { + "has_chemlib:calcium": { "conditions": { "items": [ { - "items": [ - "chemlib:calcium" - ] + "items": "chemlib:calcium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_calcium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:calcium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_block_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_block_to_ingot.json index 199aeb01..ab64714f 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cerium": { + "has_chemlib:cerium": { "conditions": { "items": [ { - "items": [ - "chemlib:cerium" - ] + "items": "chemlib:cerium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cerium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cerium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_ingot_from_blasting_cerium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_ingot_from_blasting_cerium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_ingot_from_blasting_cerium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_ingot_from_blasting_cerium_dust.json index 01d6a835..13040e6e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_ingot_from_blasting_cerium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_ingot_from_blasting_cerium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cerium": { + "has_chemlib:cerium": { "conditions": { "items": [ { - "items": [ - "chemlib:cerium" - ] + "items": "chemlib:cerium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cerium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cerium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_ingot_from_smelting_cerium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_ingot_from_smelting_cerium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_ingot_from_smelting_cerium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_ingot_from_smelting_cerium_dust.json index 74959337..77787da9 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_ingot_from_smelting_cerium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_ingot_from_smelting_cerium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cerium": { + "has_chemlib:cerium": { "conditions": { "items": [ { - "items": [ - "chemlib:cerium" - ] + "items": "chemlib:cerium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cerium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cerium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_ingot_to_block.json index 0b666bea..fe8f4268 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cerium": { + "has_chemlib:cerium": { "conditions": { "items": [ { - "items": [ - "chemlib:cerium" - ] + "items": "chemlib:cerium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cerium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cerium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_ingot_to_nugget.json index 0b272778..24fddaf4 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cerium": { + "has_chemlib:cerium": { "conditions": { "items": [ { - "items": [ - "chemlib:cerium" - ] + "items": "chemlib:cerium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cerium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cerium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_nugget_to_ingot.json index ba9cffb0..d8cd42df 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cerium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cerium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cerium": { + "has_chemlib:cerium": { "conditions": { "items": [ { - "items": [ - "chemlib:cerium" - ] + "items": "chemlib:cerium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cerium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cerium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_block_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_block_to_ingot.json index 999ff809..56dff78a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cesium": { + "has_chemlib:cesium": { "conditions": { "items": [ { - "items": [ - "chemlib:cesium" - ] + "items": "chemlib:cesium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cesium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cesium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_ingot_from_blasting_cesium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_ingot_from_blasting_cesium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_ingot_from_blasting_cesium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_ingot_from_blasting_cesium_dust.json index f76d5ee9..63b51e0a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_ingot_from_blasting_cesium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_ingot_from_blasting_cesium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cesium": { + "has_chemlib:cesium": { "conditions": { "items": [ { - "items": [ - "chemlib:cesium" - ] + "items": "chemlib:cesium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cesium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cesium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_ingot_from_smelting_cesium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_ingot_from_smelting_cesium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_ingot_from_smelting_cesium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_ingot_from_smelting_cesium_dust.json index 589d834a..78b30003 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_ingot_from_smelting_cesium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_ingot_from_smelting_cesium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cesium": { + "has_chemlib:cesium": { "conditions": { "items": [ { - "items": [ - "chemlib:cesium" - ] + "items": "chemlib:cesium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cesium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cesium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_ingot_to_block.json index 20a9a8c3..760e370c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cesium": { + "has_chemlib:cesium": { "conditions": { "items": [ { - "items": [ - "chemlib:cesium" - ] + "items": "chemlib:cesium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cesium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cesium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_ingot_to_nugget.json index 38b6cec7..e22939d8 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cesium": { + "has_chemlib:cesium": { "conditions": { "items": [ { - "items": [ - "chemlib:cesium" - ] + "items": "chemlib:cesium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cesium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cesium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_nugget_to_ingot.json index a640d82a..b3559ee9 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cesium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cesium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cesium": { + "has_chemlib:cesium": { "conditions": { "items": [ { - "items": [ - "chemlib:cesium" - ] + "items": "chemlib:cesium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cesium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cesium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_block_to_ingot.json index f4dad0a4..3e37f729 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_chromium": { + "has_chemlib:chromium": { "conditions": { "items": [ { - "items": [ - "chemlib:chromium" - ] + "items": "chemlib:chromium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_chromium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:chromium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_ingot_from_blasting_chromium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_ingot_from_blasting_chromium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_ingot_from_blasting_chromium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_ingot_from_blasting_chromium_dust.json index 3ea592e8..3f629a43 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_ingot_from_blasting_chromium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_ingot_from_blasting_chromium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_chromium": { + "has_chemlib:chromium": { "conditions": { "items": [ { - "items": [ - "chemlib:chromium" - ] + "items": "chemlib:chromium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_chromium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:chromium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_ingot_from_smelting_chromium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_ingot_from_smelting_chromium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_ingot_from_smelting_chromium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_ingot_from_smelting_chromium_dust.json index 4d592ded..8de487f8 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_ingot_from_smelting_chromium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_ingot_from_smelting_chromium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_chromium": { + "has_chemlib:chromium": { "conditions": { "items": [ { - "items": [ - "chemlib:chromium" - ] + "items": "chemlib:chromium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_chromium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:chromium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_ingot_to_block.json index d596b488..bdfe1568 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_chromium": { + "has_chemlib:chromium": { "conditions": { "items": [ { - "items": [ - "chemlib:chromium" - ] + "items": "chemlib:chromium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_chromium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:chromium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_ingot_to_nugget.json index 4009934e..c4df02b6 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_chromium": { + "has_chemlib:chromium": { "conditions": { "items": [ { - "items": [ - "chemlib:chromium" - ] + "items": "chemlib:chromium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_chromium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:chromium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_nugget_to_ingot.json index 2e956dc6..fbd81994 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/chromium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/chromium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_chromium": { + "has_chemlib:chromium": { "conditions": { "items": [ { - "items": [ - "chemlib:chromium" - ] + "items": "chemlib:chromium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_chromium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:chromium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_block_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_block_to_ingot.json index a51038b1..96440c03 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cobalt": { + "has_chemlib:cobalt": { "conditions": { "items": [ { - "items": [ - "chemlib:cobalt" - ] + "items": "chemlib:cobalt" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cobalt", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cobalt" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_ingot_from_blasting_cobalt_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_ingot_from_blasting_cobalt_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_ingot_from_blasting_cobalt_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_ingot_from_blasting_cobalt_dust.json index 8c34dc5a..c825453c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_ingot_from_blasting_cobalt_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_ingot_from_blasting_cobalt_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cobalt": { + "has_chemlib:cobalt": { "conditions": { "items": [ { - "items": [ - "chemlib:cobalt" - ] + "items": "chemlib:cobalt" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cobalt", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cobalt" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_ingot_from_smelting_cobalt_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_ingot_from_smelting_cobalt_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_ingot_from_smelting_cobalt_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_ingot_from_smelting_cobalt_dust.json index 5444a7ce..5360bf81 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_ingot_from_smelting_cobalt_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_ingot_from_smelting_cobalt_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cobalt": { + "has_chemlib:cobalt": { "conditions": { "items": [ { - "items": [ - "chemlib:cobalt" - ] + "items": "chemlib:cobalt" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cobalt", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cobalt" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_ingot_to_block.json index 7571e465..f9093eac 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cobalt": { + "has_chemlib:cobalt": { "conditions": { "items": [ { - "items": [ - "chemlib:cobalt" - ] + "items": "chemlib:cobalt" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cobalt", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cobalt" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_ingot_to_nugget.json index aec31e2a..072ae672 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cobalt": { + "has_chemlib:cobalt": { "conditions": { "items": [ { - "items": [ - "chemlib:cobalt" - ] + "items": "chemlib:cobalt" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cobalt", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cobalt" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_nugget_to_ingot.json index 9c48a1cf..7e148fc1 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/cobalt_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/cobalt_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cobalt": { + "has_chemlib:cobalt": { "conditions": { "items": [ { - "items": [ - "chemlib:cobalt" - ] + "items": "chemlib:cobalt" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_cobalt", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:cobalt" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/copper_ingot_from_blasting_copper_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/copper_ingot_from_blasting_copper_dust.json similarity index 81% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/copper_ingot_from_blasting_copper_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/copper_ingot_from_blasting_copper_dust.json index f057d36b..0e1235c3 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/copper_ingot_from_blasting_copper_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/copper_ingot_from_blasting_copper_dust.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "chemlib:copper_dust" - ] + "items": "chemlib:copper_dust" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_copper", - "has_the_recipe" + "has_the_recipe", + "has_copper" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/copper_ingot_from_smelting_copper_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/copper_ingot_from_smelting_copper_dust.json similarity index 81% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/copper_ingot_from_smelting_copper_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/copper_ingot_from_smelting_copper_dust.json index 11f07dd4..c6a532d4 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/copper_ingot_from_smelting_copper_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/copper_ingot_from_smelting_copper_dust.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "chemlib:copper_dust" - ] + "items": "chemlib:copper_dust" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_copper", - "has_the_recipe" + "has_the_recipe", + "has_copper" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_block_to_ingot.json index 0c588c94..0576cb0a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_dysprosium": { + "has_chemlib:dysprosium": { "conditions": { "items": [ { - "items": [ - "chemlib:dysprosium" - ] + "items": "chemlib:dysprosium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_dysprosium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:dysprosium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_ingot_from_blasting_dysprosium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_ingot_from_blasting_dysprosium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_ingot_from_blasting_dysprosium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_ingot_from_blasting_dysprosium_dust.json index 27feb26b..0edbbe62 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_ingot_from_blasting_dysprosium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_ingot_from_blasting_dysprosium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_dysprosium": { + "has_chemlib:dysprosium": { "conditions": { "items": [ { - "items": [ - "chemlib:dysprosium" - ] + "items": "chemlib:dysprosium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_dysprosium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:dysprosium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_ingot_from_smelting_dysprosium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_ingot_from_smelting_dysprosium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_ingot_from_smelting_dysprosium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_ingot_from_smelting_dysprosium_dust.json index 4fce6521..4485a97c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_ingot_from_smelting_dysprosium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_ingot_from_smelting_dysprosium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_dysprosium": { + "has_chemlib:dysprosium": { "conditions": { "items": [ { - "items": [ - "chemlib:dysprosium" - ] + "items": "chemlib:dysprosium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_dysprosium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:dysprosium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_ingot_to_block.json index be6d47bf..b48da865 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_dysprosium": { + "has_chemlib:dysprosium": { "conditions": { "items": [ { - "items": [ - "chemlib:dysprosium" - ] + "items": "chemlib:dysprosium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_dysprosium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:dysprosium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_ingot_to_nugget.json index 8b4f39ad..fd1b0bd7 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_dysprosium": { + "has_chemlib:dysprosium": { "conditions": { "items": [ { - "items": [ - "chemlib:dysprosium" - ] + "items": "chemlib:dysprosium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_dysprosium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:dysprosium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_nugget_to_ingot.json index 4aecd426..96e36ec7 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/dysprosium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/dysprosium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_dysprosium": { + "has_chemlib:dysprosium": { "conditions": { "items": [ { - "items": [ - "chemlib:dysprosium" - ] + "items": "chemlib:dysprosium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_dysprosium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:dysprosium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_block_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_block_to_ingot.json index d42ec59c..3fb8ac4b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_erbium": { + "has_chemlib:erbium": { "conditions": { "items": [ { - "items": [ - "chemlib:erbium" - ] + "items": "chemlib:erbium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_erbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:erbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_ingot_from_blasting_erbium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_ingot_from_blasting_erbium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_ingot_from_blasting_erbium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_ingot_from_blasting_erbium_dust.json index 2bf1b680..57ee496b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_ingot_from_blasting_erbium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_ingot_from_blasting_erbium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_erbium": { + "has_chemlib:erbium": { "conditions": { "items": [ { - "items": [ - "chemlib:erbium" - ] + "items": "chemlib:erbium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_erbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:erbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_ingot_from_smelting_erbium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_ingot_from_smelting_erbium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_ingot_from_smelting_erbium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_ingot_from_smelting_erbium_dust.json index f38be4c3..3bb3be1a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_ingot_from_smelting_erbium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_ingot_from_smelting_erbium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_erbium": { + "has_chemlib:erbium": { "conditions": { "items": [ { - "items": [ - "chemlib:erbium" - ] + "items": "chemlib:erbium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_erbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:erbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_ingot_to_block.json index aad4c364..f7ac249f 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_erbium": { + "has_chemlib:erbium": { "conditions": { "items": [ { - "items": [ - "chemlib:erbium" - ] + "items": "chemlib:erbium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_erbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:erbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_ingot_to_nugget.json index 9c390b16..07bacb54 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_erbium": { + "has_chemlib:erbium": { "conditions": { "items": [ { - "items": [ - "chemlib:erbium" - ] + "items": "chemlib:erbium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_erbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:erbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_nugget_to_ingot.json index 0e8feb4f..7c12bf09 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/erbium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/erbium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_erbium": { + "has_chemlib:erbium": { "conditions": { "items": [ { - "items": [ - "chemlib:erbium" - ] + "items": "chemlib:erbium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_erbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:erbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/europium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/europium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/europium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/europium_block_to_ingot.json index 8fcb09a1..77f46d30 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/europium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/europium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_europium": { + "has_chemlib:europium": { "conditions": { "items": [ { - "items": [ - "chemlib:europium" - ] + "items": "chemlib:europium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_europium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:europium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/europium_ingot_from_blasting_europium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/europium_ingot_from_blasting_europium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/europium_ingot_from_blasting_europium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/europium_ingot_from_blasting_europium_dust.json index 5baac001..910d316b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/europium_ingot_from_blasting_europium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/europium_ingot_from_blasting_europium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_europium": { + "has_chemlib:europium": { "conditions": { "items": [ { - "items": [ - "chemlib:europium" - ] + "items": "chemlib:europium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_europium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:europium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/europium_ingot_from_smelting_europium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/europium_ingot_from_smelting_europium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/europium_ingot_from_smelting_europium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/europium_ingot_from_smelting_europium_dust.json index 634c05fc..1b0546f5 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/europium_ingot_from_smelting_europium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/europium_ingot_from_smelting_europium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_europium": { + "has_chemlib:europium": { "conditions": { "items": [ { - "items": [ - "chemlib:europium" - ] + "items": "chemlib:europium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_europium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:europium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/europium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/europium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/europium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/europium_ingot_to_block.json index 43c5b7b6..b8f2adda 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/europium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/europium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_europium": { + "has_chemlib:europium": { "conditions": { "items": [ { - "items": [ - "chemlib:europium" - ] + "items": "chemlib:europium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_europium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:europium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/europium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/europium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/europium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/europium_ingot_to_nugget.json index 14c4694d..f1d24e49 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/europium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/europium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_europium": { + "has_chemlib:europium": { "conditions": { "items": [ { - "items": [ - "chemlib:europium" - ] + "items": "chemlib:europium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_europium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:europium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/europium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/europium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/europium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/europium_nugget_to_ingot.json index df61aceb..62db9bdc 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/europium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/europium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_europium": { + "has_chemlib:europium": { "conditions": { "items": [ { - "items": [ - "chemlib:europium" - ] + "items": "chemlib:europium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_europium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:europium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/francium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/francium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/francium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/francium_block_to_ingot.json index 5cdf7970..a3ce87b5 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/francium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/francium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_francium": { + "has_chemlib:francium": { "conditions": { "items": [ { - "items": [ - "chemlib:francium" - ] + "items": "chemlib:francium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_francium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:francium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/francium_ingot_from_blasting_francium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/francium_ingot_from_blasting_francium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/francium_ingot_from_blasting_francium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/francium_ingot_from_blasting_francium_dust.json index 4b8962a1..5a044997 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/francium_ingot_from_blasting_francium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/francium_ingot_from_blasting_francium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_francium": { + "has_chemlib:francium": { "conditions": { "items": [ { - "items": [ - "chemlib:francium" - ] + "items": "chemlib:francium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_francium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:francium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/francium_ingot_from_smelting_francium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/francium_ingot_from_smelting_francium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/francium_ingot_from_smelting_francium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/francium_ingot_from_smelting_francium_dust.json index 484a768a..e5fb4aef 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/francium_ingot_from_smelting_francium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/francium_ingot_from_smelting_francium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_francium": { + "has_chemlib:francium": { "conditions": { "items": [ { - "items": [ - "chemlib:francium" - ] + "items": "chemlib:francium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_francium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:francium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/francium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/francium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/francium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/francium_ingot_to_block.json index a52626fd..7b9d5070 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/francium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/francium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_francium": { + "has_chemlib:francium": { "conditions": { "items": [ { - "items": [ - "chemlib:francium" - ] + "items": "chemlib:francium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_francium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:francium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/francium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/francium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/francium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/francium_ingot_to_nugget.json index c29a68bb..e50ad79a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/francium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/francium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_francium": { + "has_chemlib:francium": { "conditions": { "items": [ { - "items": [ - "chemlib:francium" - ] + "items": "chemlib:francium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_francium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:francium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/francium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/francium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/francium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/francium_nugget_to_ingot.json index 6b776406..eb7401e0 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/francium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/francium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_francium": { + "has_chemlib:francium": { "conditions": { "items": [ { - "items": [ - "chemlib:francium" - ] + "items": "chemlib:francium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_francium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:francium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_block_to_ingot.json index d2838e76..38da00d4 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gadolinium": { + "has_chemlib:gadolinium": { "conditions": { "items": [ { - "items": [ - "chemlib:gadolinium" - ] + "items": "chemlib:gadolinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_gadolinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:gadolinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_ingot_from_blasting_gadolinium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_ingot_from_blasting_gadolinium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_ingot_from_blasting_gadolinium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_ingot_from_blasting_gadolinium_dust.json index d17de7d7..efa5df6b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_ingot_from_blasting_gadolinium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_ingot_from_blasting_gadolinium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gadolinium": { + "has_chemlib:gadolinium": { "conditions": { "items": [ { - "items": [ - "chemlib:gadolinium" - ] + "items": "chemlib:gadolinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_gadolinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:gadolinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_ingot_from_smelting_gadolinium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_ingot_from_smelting_gadolinium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_ingot_from_smelting_gadolinium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_ingot_from_smelting_gadolinium_dust.json index 0cff85c4..348ff352 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_ingot_from_smelting_gadolinium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_ingot_from_smelting_gadolinium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gadolinium": { + "has_chemlib:gadolinium": { "conditions": { "items": [ { - "items": [ - "chemlib:gadolinium" - ] + "items": "chemlib:gadolinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_gadolinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:gadolinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_ingot_to_block.json index 79d59e12..42a2bd5c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gadolinium": { + "has_chemlib:gadolinium": { "conditions": { "items": [ { - "items": [ - "chemlib:gadolinium" - ] + "items": "chemlib:gadolinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_gadolinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:gadolinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_ingot_to_nugget.json index 36acf9fd..fde05d05 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gadolinium": { + "has_chemlib:gadolinium": { "conditions": { "items": [ { - "items": [ - "chemlib:gadolinium" - ] + "items": "chemlib:gadolinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_gadolinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:gadolinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_nugget_to_ingot.json index 6ac1aa84..4a2908ba 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/gadolinium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/gadolinium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gadolinium": { + "has_chemlib:gadolinium": { "conditions": { "items": [ { - "items": [ - "chemlib:gadolinium" - ] + "items": "chemlib:gadolinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_gadolinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:gadolinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_block_to_ingot.json index f1f8e9a0..e85617d2 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gallium": { + "has_chemlib:gallium": { "conditions": { "items": [ { - "items": [ - "chemlib:gallium" - ] + "items": "chemlib:gallium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_gallium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:gallium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_ingot_from_blasting_gallium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_ingot_from_blasting_gallium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_ingot_from_blasting_gallium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_ingot_from_blasting_gallium_dust.json index fbba67b5..f1e11134 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_ingot_from_blasting_gallium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_ingot_from_blasting_gallium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gallium": { + "has_chemlib:gallium": { "conditions": { "items": [ { - "items": [ - "chemlib:gallium" - ] + "items": "chemlib:gallium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_gallium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:gallium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_ingot_from_smelting_gallium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_ingot_from_smelting_gallium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_ingot_from_smelting_gallium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_ingot_from_smelting_gallium_dust.json index 8b6f8e08..983f724b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_ingot_from_smelting_gallium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_ingot_from_smelting_gallium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gallium": { + "has_chemlib:gallium": { "conditions": { "items": [ { - "items": [ - "chemlib:gallium" - ] + "items": "chemlib:gallium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_gallium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:gallium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_ingot_to_block.json index e52bd411..510dff8e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gallium": { + "has_chemlib:gallium": { "conditions": { "items": [ { - "items": [ - "chemlib:gallium" - ] + "items": "chemlib:gallium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_gallium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:gallium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_ingot_to_nugget.json index 7bcce377..e777888a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gallium": { + "has_chemlib:gallium": { "conditions": { "items": [ { - "items": [ - "chemlib:gallium" - ] + "items": "chemlib:gallium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_gallium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:gallium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_nugget_to_ingot.json index 8f21a7b3..1d499257 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/gallium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/gallium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gallium": { + "has_chemlib:gallium": { "conditions": { "items": [ { - "items": [ - "chemlib:gallium" - ] + "items": "chemlib:gallium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_gallium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:gallium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/gold_ingot_from_blasting_gold_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/gold_ingot_from_blasting_gold_dust.json similarity index 82% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/gold_ingot_from_blasting_gold_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/gold_ingot_from_blasting_gold_dust.json index 09519247..2b377a3e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/gold_ingot_from_blasting_gold_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/gold_ingot_from_blasting_gold_dust.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "chemlib:gold_dust" - ] + "items": "chemlib:gold_dust" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_gold", - "has_the_recipe" + "has_the_recipe", + "has_gold" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/gold_ingot_from_smelting_gold_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/gold_ingot_from_smelting_gold_dust.json similarity index 82% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/gold_ingot_from_smelting_gold_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/gold_ingot_from_smelting_gold_dust.json index 00f24992..9a2cdf90 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/gold_ingot_from_smelting_gold_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/gold_ingot_from_smelting_gold_dust.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "chemlib:gold_dust" - ] + "items": "chemlib:gold_dust" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_gold", - "has_the_recipe" + "has_the_recipe", + "has_gold" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_block_to_ingot.json index 5465b27d..68cb983d 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_hafnium": { + "has_chemlib:hafnium": { "conditions": { "items": [ { - "items": [ - "chemlib:hafnium" - ] + "items": "chemlib:hafnium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_hafnium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:hafnium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_ingot_from_blasting_hafnium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_ingot_from_blasting_hafnium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_ingot_from_blasting_hafnium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_ingot_from_blasting_hafnium_dust.json index 8ba9f7fb..222fc0d2 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_ingot_from_blasting_hafnium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_ingot_from_blasting_hafnium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_hafnium": { + "has_chemlib:hafnium": { "conditions": { "items": [ { - "items": [ - "chemlib:hafnium" - ] + "items": "chemlib:hafnium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_hafnium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:hafnium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_ingot_from_smelting_hafnium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_ingot_from_smelting_hafnium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_ingot_from_smelting_hafnium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_ingot_from_smelting_hafnium_dust.json index 79d1f7d2..17557e2a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_ingot_from_smelting_hafnium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_ingot_from_smelting_hafnium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_hafnium": { + "has_chemlib:hafnium": { "conditions": { "items": [ { - "items": [ - "chemlib:hafnium" - ] + "items": "chemlib:hafnium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_hafnium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:hafnium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_ingot_to_block.json index aa67ffe0..03efdec7 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_hafnium": { + "has_chemlib:hafnium": { "conditions": { "items": [ { - "items": [ - "chemlib:hafnium" - ] + "items": "chemlib:hafnium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_hafnium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:hafnium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_ingot_to_nugget.json index 496eb47c..6778eaa1 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_hafnium": { + "has_chemlib:hafnium": { "conditions": { "items": [ { - "items": [ - "chemlib:hafnium" - ] + "items": "chemlib:hafnium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_hafnium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:hafnium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_nugget_to_ingot.json index bdc25880..05b24941 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/hafnium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/hafnium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_hafnium": { + "has_chemlib:hafnium": { "conditions": { "items": [ { - "items": [ - "chemlib:hafnium" - ] + "items": "chemlib:hafnium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_hafnium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:hafnium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/helium_lamp_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/helium_lamp_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/helium_lamp_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/helium_lamp_block.json index 76b60830..3665e26d 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/helium_lamp_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/helium_lamp_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_helium": { + "has_chemlib:helium": { "conditions": { "items": [ { - "items": [ - "chemlib:helium" - ] + "items": "chemlib:helium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_helium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:helium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_block_to_ingot.json index 5be9fbf2..4365423f 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_holmium": { + "has_chemlib:holmium": { "conditions": { "items": [ { - "items": [ - "chemlib:holmium" - ] + "items": "chemlib:holmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_holmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:holmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_ingot_from_blasting_holmium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_ingot_from_blasting_holmium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_ingot_from_blasting_holmium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_ingot_from_blasting_holmium_dust.json index 9ae752cc..0dfe3544 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_ingot_from_blasting_holmium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_ingot_from_blasting_holmium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_holmium": { + "has_chemlib:holmium": { "conditions": { "items": [ { - "items": [ - "chemlib:holmium" - ] + "items": "chemlib:holmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_holmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:holmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_ingot_from_smelting_holmium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_ingot_from_smelting_holmium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_ingot_from_smelting_holmium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_ingot_from_smelting_holmium_dust.json index 2034bdc2..8b8cd817 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_ingot_from_smelting_holmium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_ingot_from_smelting_holmium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_holmium": { + "has_chemlib:holmium": { "conditions": { "items": [ { - "items": [ - "chemlib:holmium" - ] + "items": "chemlib:holmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_holmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:holmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_ingot_to_block.json index 51c254fc..a9a26b4f 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_holmium": { + "has_chemlib:holmium": { "conditions": { "items": [ { - "items": [ - "chemlib:holmium" - ] + "items": "chemlib:holmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_holmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:holmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_ingot_to_nugget.json index 36fb5ef4..a2a7e316 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_holmium": { + "has_chemlib:holmium": { "conditions": { "items": [ { - "items": [ - "chemlib:holmium" - ] + "items": "chemlib:holmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_holmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:holmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_nugget_to_ingot.json index 4e98687a..c35eef41 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/holmium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/holmium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_holmium": { + "has_chemlib:holmium": { "conditions": { "items": [ { - "items": [ - "chemlib:holmium" - ] + "items": "chemlib:holmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_holmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:holmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/indium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/indium_block_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/indium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/indium_block_to_ingot.json index 05bdf05f..da3c7bef 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/indium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/indium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_indium": { + "has_chemlib:indium": { "conditions": { "items": [ { - "items": [ - "chemlib:indium" - ] + "items": "chemlib:indium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_indium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:indium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/indium_ingot_from_blasting_indium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/indium_ingot_from_blasting_indium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/indium_ingot_from_blasting_indium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/indium_ingot_from_blasting_indium_dust.json index 37564bd0..0a0a38ba 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/indium_ingot_from_blasting_indium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/indium_ingot_from_blasting_indium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_indium": { + "has_chemlib:indium": { "conditions": { "items": [ { - "items": [ - "chemlib:indium" - ] + "items": "chemlib:indium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_indium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:indium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/indium_ingot_from_smelting_indium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/indium_ingot_from_smelting_indium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/indium_ingot_from_smelting_indium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/indium_ingot_from_smelting_indium_dust.json index f076ee0e..4a60c86d 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/indium_ingot_from_smelting_indium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/indium_ingot_from_smelting_indium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_indium": { + "has_chemlib:indium": { "conditions": { "items": [ { - "items": [ - "chemlib:indium" - ] + "items": "chemlib:indium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_indium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:indium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/indium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/indium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/indium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/indium_ingot_to_block.json index 37678397..fdfde3cc 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/indium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/indium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_indium": { + "has_chemlib:indium": { "conditions": { "items": [ { - "items": [ - "chemlib:indium" - ] + "items": "chemlib:indium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_indium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:indium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/indium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/indium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/indium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/indium_ingot_to_nugget.json index 68554497..9550b63f 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/indium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/indium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_indium": { + "has_chemlib:indium": { "conditions": { "items": [ { - "items": [ - "chemlib:indium" - ] + "items": "chemlib:indium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_indium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:indium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/indium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/indium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/indium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/indium_nugget_to_ingot.json index d1b40a14..114daf1b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/indium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/indium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_indium": { + "has_chemlib:indium": { "conditions": { "items": [ { - "items": [ - "chemlib:indium" - ] + "items": "chemlib:indium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_indium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:indium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_block_to_ingot.json index 5ef75bd9..a61762c3 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_iridium": { + "has_chemlib:iridium": { "conditions": { "items": [ { - "items": [ - "chemlib:iridium" - ] + "items": "chemlib:iridium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_iridium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:iridium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_ingot_from_blasting_iridium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_ingot_from_blasting_iridium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_ingot_from_blasting_iridium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_ingot_from_blasting_iridium_dust.json index 0a8a7c1a..cd5338a4 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_ingot_from_blasting_iridium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_ingot_from_blasting_iridium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_iridium": { + "has_chemlib:iridium": { "conditions": { "items": [ { - "items": [ - "chemlib:iridium" - ] + "items": "chemlib:iridium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_iridium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:iridium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_ingot_from_smelting_iridium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_ingot_from_smelting_iridium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_ingot_from_smelting_iridium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_ingot_from_smelting_iridium_dust.json index 61549cf6..246a61b9 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_ingot_from_smelting_iridium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_ingot_from_smelting_iridium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_iridium": { + "has_chemlib:iridium": { "conditions": { "items": [ { - "items": [ - "chemlib:iridium" - ] + "items": "chemlib:iridium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_iridium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:iridium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_ingot_to_block.json index 6888b8a2..d0e56189 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_iridium": { + "has_chemlib:iridium": { "conditions": { "items": [ { - "items": [ - "chemlib:iridium" - ] + "items": "chemlib:iridium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_iridium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:iridium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_ingot_to_nugget.json index 9f5c2f0e..a330865f 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_iridium": { + "has_chemlib:iridium": { "conditions": { "items": [ { - "items": [ - "chemlib:iridium" - ] + "items": "chemlib:iridium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_iridium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:iridium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_nugget_to_ingot.json index d3637b56..444a2bdf 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/iridium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/iridium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_iridium": { + "has_chemlib:iridium": { "conditions": { "items": [ { - "items": [ - "chemlib:iridium" - ] + "items": "chemlib:iridium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_iridium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:iridium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/iron_ingot_from_blasting_iron_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/iron_ingot_from_blasting_iron_dust.json similarity index 82% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/iron_ingot_from_blasting_iron_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/iron_ingot_from_blasting_iron_dust.json index 0184b7ee..468655fd 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/iron_ingot_from_blasting_iron_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/iron_ingot_from_blasting_iron_dust.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "chemlib:iron_dust" - ] + "items": "chemlib:iron_dust" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_iron", - "has_the_recipe" + "has_the_recipe", + "has_iron" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/iron_ingot_from_smelting_iron_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/iron_ingot_from_smelting_iron_dust.json similarity index 82% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/iron_ingot_from_smelting_iron_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/iron_ingot_from_smelting_iron_dust.json index e6e3adf6..4c3f6408 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/iron_ingot_from_smelting_iron_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/iron_ingot_from_smelting_iron_dust.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "chemlib:iron_dust" - ] + "items": "chemlib:iron_dust" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_iron", - "has_the_recipe" + "has_the_recipe", + "has_iron" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/krypton_lamp_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/krypton_lamp_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/krypton_lamp_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/krypton_lamp_block.json index 5baad357..04328611 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/krypton_lamp_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/krypton_lamp_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_krypton": { + "has_chemlib:krypton": { "conditions": { "items": [ { - "items": [ - "chemlib:krypton" - ] + "items": "chemlib:krypton" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_krypton", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:krypton" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_block_to_ingot.json index 3bafa8b5..84097289 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lanthanum": { + "has_chemlib:lanthanum": { "conditions": { "items": [ { - "items": [ - "chemlib:lanthanum" - ] + "items": "chemlib:lanthanum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lanthanum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lanthanum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_ingot_from_blasting_lanthanum_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_ingot_from_blasting_lanthanum_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_ingot_from_blasting_lanthanum_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_ingot_from_blasting_lanthanum_dust.json index 1b878495..55c000b2 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_ingot_from_blasting_lanthanum_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_ingot_from_blasting_lanthanum_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lanthanum": { + "has_chemlib:lanthanum": { "conditions": { "items": [ { - "items": [ - "chemlib:lanthanum" - ] + "items": "chemlib:lanthanum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lanthanum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lanthanum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_ingot_from_smelting_lanthanum_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_ingot_from_smelting_lanthanum_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_ingot_from_smelting_lanthanum_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_ingot_from_smelting_lanthanum_dust.json index 59f3f3d7..e7208b8c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_ingot_from_smelting_lanthanum_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_ingot_from_smelting_lanthanum_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lanthanum": { + "has_chemlib:lanthanum": { "conditions": { "items": [ { - "items": [ - "chemlib:lanthanum" - ] + "items": "chemlib:lanthanum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lanthanum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lanthanum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_ingot_to_block.json index ae24a618..afdf8b67 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lanthanum": { + "has_chemlib:lanthanum": { "conditions": { "items": [ { - "items": [ - "chemlib:lanthanum" - ] + "items": "chemlib:lanthanum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lanthanum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lanthanum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_ingot_to_nugget.json index 16106fe9..0b2d1b4e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lanthanum": { + "has_chemlib:lanthanum": { "conditions": { "items": [ { - "items": [ - "chemlib:lanthanum" - ] + "items": "chemlib:lanthanum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lanthanum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lanthanum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_nugget_to_ingot.json index b1579040..34312484 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lanthanum_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lanthanum_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lanthanum": { + "has_chemlib:lanthanum": { "conditions": { "items": [ { - "items": [ - "chemlib:lanthanum" - ] + "items": "chemlib:lanthanum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lanthanum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lanthanum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lead_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lead_block_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lead_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lead_block_to_ingot.json index c4542b1e..842350d7 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lead_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lead_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lead": { + "has_chemlib:lead": { "conditions": { "items": [ { - "items": [ - "chemlib:lead" - ] + "items": "chemlib:lead" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lead", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lead" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lead_ingot_from_blasting_lead_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lead_ingot_from_blasting_lead_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lead_ingot_from_blasting_lead_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lead_ingot_from_blasting_lead_dust.json index f8f2c6c4..368865d6 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lead_ingot_from_blasting_lead_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lead_ingot_from_blasting_lead_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lead": { + "has_chemlib:lead": { "conditions": { "items": [ { - "items": [ - "chemlib:lead" - ] + "items": "chemlib:lead" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lead", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lead" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lead_ingot_from_smelting_lead_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lead_ingot_from_smelting_lead_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lead_ingot_from_smelting_lead_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lead_ingot_from_smelting_lead_dust.json index be8be340..e9cac1b5 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lead_ingot_from_smelting_lead_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lead_ingot_from_smelting_lead_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lead": { + "has_chemlib:lead": { "conditions": { "items": [ { - "items": [ - "chemlib:lead" - ] + "items": "chemlib:lead" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lead", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lead" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lead_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lead_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lead_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lead_ingot_to_block.json index 2599b246..812efe48 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lead_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lead_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lead": { + "has_chemlib:lead": { "conditions": { "items": [ { - "items": [ - "chemlib:lead" - ] + "items": "chemlib:lead" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lead", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lead" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lead_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lead_ingot_to_nugget.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lead_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lead_ingot_to_nugget.json index 786aaa43..f9333079 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lead_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lead_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lead": { + "has_chemlib:lead": { "conditions": { "items": [ { - "items": [ - "chemlib:lead" - ] + "items": "chemlib:lead" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lead", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lead" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lead_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lead_nugget_to_ingot.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lead_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lead_nugget_to_ingot.json index e385ead1..d9ffc1f7 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lead_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lead_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lead": { + "has_chemlib:lead": { "conditions": { "items": [ { - "items": [ - "chemlib:lead" - ] + "items": "chemlib:lead" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lead", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lead" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_block_to_ingot.json index 3ed328fb..f179e17d 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lithium": { + "has_chemlib:lithium": { "conditions": { "items": [ { - "items": [ - "chemlib:lithium" - ] + "items": "chemlib:lithium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lithium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lithium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_ingot_from_blasting_lithium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_ingot_from_blasting_lithium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_ingot_from_blasting_lithium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_ingot_from_blasting_lithium_dust.json index cde1e162..a2f36e7b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_ingot_from_blasting_lithium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_ingot_from_blasting_lithium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lithium": { + "has_chemlib:lithium": { "conditions": { "items": [ { - "items": [ - "chemlib:lithium" - ] + "items": "chemlib:lithium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lithium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lithium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_ingot_from_smelting_lithium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_ingot_from_smelting_lithium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_ingot_from_smelting_lithium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_ingot_from_smelting_lithium_dust.json index a18f1b6c..150cb82c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_ingot_from_smelting_lithium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_ingot_from_smelting_lithium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lithium": { + "has_chemlib:lithium": { "conditions": { "items": [ { - "items": [ - "chemlib:lithium" - ] + "items": "chemlib:lithium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lithium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lithium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_ingot_to_block.json index d10e70e3..a17fecda 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lithium": { + "has_chemlib:lithium": { "conditions": { "items": [ { - "items": [ - "chemlib:lithium" - ] + "items": "chemlib:lithium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lithium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lithium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_ingot_to_nugget.json index e1dc7fa2..5dc08812 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lithium": { + "has_chemlib:lithium": { "conditions": { "items": [ { - "items": [ - "chemlib:lithium" - ] + "items": "chemlib:lithium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lithium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lithium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_nugget_to_ingot.json index 7a940203..5240b7e8 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lithium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lithium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lithium": { + "has_chemlib:lithium": { "conditions": { "items": [ { - "items": [ - "chemlib:lithium" - ] + "items": "chemlib:lithium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lithium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lithium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_block_to_ingot.json index 1d128d1e..119451c6 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lutetium": { + "has_chemlib:lutetium": { "conditions": { "items": [ { - "items": [ - "chemlib:lutetium" - ] + "items": "chemlib:lutetium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lutetium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lutetium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_ingot_from_blasting_lutetium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_ingot_from_blasting_lutetium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_ingot_from_blasting_lutetium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_ingot_from_blasting_lutetium_dust.json index 42c35721..085226c1 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_ingot_from_blasting_lutetium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_ingot_from_blasting_lutetium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lutetium": { + "has_chemlib:lutetium": { "conditions": { "items": [ { - "items": [ - "chemlib:lutetium" - ] + "items": "chemlib:lutetium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lutetium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lutetium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_ingot_from_smelting_lutetium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_ingot_from_smelting_lutetium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_ingot_from_smelting_lutetium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_ingot_from_smelting_lutetium_dust.json index 3991fd50..f26e1ac3 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_ingot_from_smelting_lutetium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_ingot_from_smelting_lutetium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lutetium": { + "has_chemlib:lutetium": { "conditions": { "items": [ { - "items": [ - "chemlib:lutetium" - ] + "items": "chemlib:lutetium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lutetium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lutetium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_ingot_to_block.json index a2681b3a..533a009e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lutetium": { + "has_chemlib:lutetium": { "conditions": { "items": [ { - "items": [ - "chemlib:lutetium" - ] + "items": "chemlib:lutetium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lutetium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lutetium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_ingot_to_nugget.json index 193537ab..a5c08522 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lutetium": { + "has_chemlib:lutetium": { "conditions": { "items": [ { - "items": [ - "chemlib:lutetium" - ] + "items": "chemlib:lutetium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lutetium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lutetium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_nugget_to_ingot.json index 181c6c99..3bbb4047 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/lutetium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/lutetium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lutetium": { + "has_chemlib:lutetium": { "conditions": { "items": [ { - "items": [ - "chemlib:lutetium" - ] + "items": "chemlib:lutetium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_lutetium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:lutetium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_block_to_ingot.json index 316b1e4f..20a3e8d8 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_magnesium": { + "has_chemlib:magnesium": { "conditions": { "items": [ { - "items": [ - "chemlib:magnesium" - ] + "items": "chemlib:magnesium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_magnesium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:magnesium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_ingot_from_blasting_magnesium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_ingot_from_blasting_magnesium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_ingot_from_blasting_magnesium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_ingot_from_blasting_magnesium_dust.json index 5b97ccf7..dbaad10a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_ingot_from_blasting_magnesium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_ingot_from_blasting_magnesium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_magnesium": { + "has_chemlib:magnesium": { "conditions": { "items": [ { - "items": [ - "chemlib:magnesium" - ] + "items": "chemlib:magnesium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_magnesium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:magnesium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_ingot_from_smelting_magnesium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_ingot_from_smelting_magnesium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_ingot_from_smelting_magnesium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_ingot_from_smelting_magnesium_dust.json index a088254a..34890822 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_ingot_from_smelting_magnesium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_ingot_from_smelting_magnesium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_magnesium": { + "has_chemlib:magnesium": { "conditions": { "items": [ { - "items": [ - "chemlib:magnesium" - ] + "items": "chemlib:magnesium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_magnesium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:magnesium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_ingot_to_block.json index d07c686a..ab61ddac 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_magnesium": { + "has_chemlib:magnesium": { "conditions": { "items": [ { - "items": [ - "chemlib:magnesium" - ] + "items": "chemlib:magnesium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_magnesium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:magnesium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_ingot_to_nugget.json index 11d19a6c..73ff3bf1 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_magnesium": { + "has_chemlib:magnesium": { "conditions": { "items": [ { - "items": [ - "chemlib:magnesium" - ] + "items": "chemlib:magnesium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_magnesium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:magnesium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_nugget_to_ingot.json index 93be7ff2..269628a7 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/magnesium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/magnesium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_magnesium": { + "has_chemlib:magnesium": { "conditions": { "items": [ { - "items": [ - "chemlib:magnesium" - ] + "items": "chemlib:magnesium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_magnesium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:magnesium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_block_to_ingot.json index 905f1000..5077107e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_manganese": { + "has_chemlib:manganese": { "conditions": { "items": [ { - "items": [ - "chemlib:manganese" - ] + "items": "chemlib:manganese" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_manganese", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:manganese" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_ingot_from_blasting_manganese_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_ingot_from_blasting_manganese_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_ingot_from_blasting_manganese_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_ingot_from_blasting_manganese_dust.json index 15c0c525..a6e4db78 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_ingot_from_blasting_manganese_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_ingot_from_blasting_manganese_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_manganese": { + "has_chemlib:manganese": { "conditions": { "items": [ { - "items": [ - "chemlib:manganese" - ] + "items": "chemlib:manganese" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_manganese", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:manganese" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_ingot_from_smelting_manganese_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_ingot_from_smelting_manganese_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_ingot_from_smelting_manganese_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_ingot_from_smelting_manganese_dust.json index 34715aae..a2a2112e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_ingot_from_smelting_manganese_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_ingot_from_smelting_manganese_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_manganese": { + "has_chemlib:manganese": { "conditions": { "items": [ { - "items": [ - "chemlib:manganese" - ] + "items": "chemlib:manganese" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_manganese", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:manganese" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_ingot_to_block.json index 74c8381e..41c5f8e5 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_manganese": { + "has_chemlib:manganese": { "conditions": { "items": [ { - "items": [ - "chemlib:manganese" - ] + "items": "chemlib:manganese" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_manganese", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:manganese" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_ingot_to_nugget.json index f8993ab7..fb9cbe6a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_manganese": { + "has_chemlib:manganese": { "conditions": { "items": [ { - "items": [ - "chemlib:manganese" - ] + "items": "chemlib:manganese" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_manganese", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:manganese" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_nugget_to_ingot.json index 5accff3d..6661c8f5 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/manganese_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/manganese_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_manganese": { + "has_chemlib:manganese": { "conditions": { "items": [ { - "items": [ - "chemlib:manganese" - ] + "items": "chemlib:manganese" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_manganese", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:manganese" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_block_to_ingot.json index d8203550..75808946 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_molybdenum": { + "has_chemlib:molybdenum": { "conditions": { "items": [ { - "items": [ - "chemlib:molybdenum" - ] + "items": "chemlib:molybdenum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_molybdenum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:molybdenum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_ingot_from_blasting_molybdenum_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_ingot_from_blasting_molybdenum_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_ingot_from_blasting_molybdenum_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_ingot_from_blasting_molybdenum_dust.json index 58396a9b..fd6d0aee 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_ingot_from_blasting_molybdenum_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_ingot_from_blasting_molybdenum_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_molybdenum": { + "has_chemlib:molybdenum": { "conditions": { "items": [ { - "items": [ - "chemlib:molybdenum" - ] + "items": "chemlib:molybdenum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_molybdenum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:molybdenum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_ingot_from_smelting_molybdenum_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_ingot_from_smelting_molybdenum_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_ingot_from_smelting_molybdenum_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_ingot_from_smelting_molybdenum_dust.json index f86330c9..0689e5da 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_ingot_from_smelting_molybdenum_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_ingot_from_smelting_molybdenum_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_molybdenum": { + "has_chemlib:molybdenum": { "conditions": { "items": [ { - "items": [ - "chemlib:molybdenum" - ] + "items": "chemlib:molybdenum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_molybdenum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:molybdenum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_ingot_to_block.json index c426a81c..e032b6d2 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_molybdenum": { + "has_chemlib:molybdenum": { "conditions": { "items": [ { - "items": [ - "chemlib:molybdenum" - ] + "items": "chemlib:molybdenum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_molybdenum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:molybdenum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_ingot_to_nugget.json index 500ff5f7..418bddd4 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_molybdenum": { + "has_chemlib:molybdenum": { "conditions": { "items": [ { - "items": [ - "chemlib:molybdenum" - ] + "items": "chemlib:molybdenum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_molybdenum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:molybdenum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_nugget_to_ingot.json index 154039e6..56a150b1 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/molybdenum_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/molybdenum_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_molybdenum": { + "has_chemlib:molybdenum": { "conditions": { "items": [ { - "items": [ - "chemlib:molybdenum" - ] + "items": "chemlib:molybdenum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_molybdenum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:molybdenum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_block_to_ingot.json index 8654afa4..2fc533b8 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_neodymium": { + "has_chemlib:neodymium": { "conditions": { "items": [ { - "items": [ - "chemlib:neodymium" - ] + "items": "chemlib:neodymium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_neodymium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:neodymium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_ingot_from_blasting_neodymium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_ingot_from_blasting_neodymium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_ingot_from_blasting_neodymium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_ingot_from_blasting_neodymium_dust.json index da3e5c12..0b5b8258 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_ingot_from_blasting_neodymium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_ingot_from_blasting_neodymium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_neodymium": { + "has_chemlib:neodymium": { "conditions": { "items": [ { - "items": [ - "chemlib:neodymium" - ] + "items": "chemlib:neodymium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_neodymium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:neodymium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_ingot_from_smelting_neodymium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_ingot_from_smelting_neodymium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_ingot_from_smelting_neodymium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_ingot_from_smelting_neodymium_dust.json index f133e422..1558595e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_ingot_from_smelting_neodymium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_ingot_from_smelting_neodymium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_neodymium": { + "has_chemlib:neodymium": { "conditions": { "items": [ { - "items": [ - "chemlib:neodymium" - ] + "items": "chemlib:neodymium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_neodymium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:neodymium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_ingot_to_block.json index c9dfd26d..8107f2fb 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_neodymium": { + "has_chemlib:neodymium": { "conditions": { "items": [ { - "items": [ - "chemlib:neodymium" - ] + "items": "chemlib:neodymium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_neodymium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:neodymium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_ingot_to_nugget.json index fddfd201..c5bccbf6 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_neodymium": { + "has_chemlib:neodymium": { "conditions": { "items": [ { - "items": [ - "chemlib:neodymium" - ] + "items": "chemlib:neodymium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_neodymium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:neodymium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_nugget_to_ingot.json index d6068323..3dd314d1 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/neodymium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/neodymium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_neodymium": { + "has_chemlib:neodymium": { "conditions": { "items": [ { - "items": [ - "chemlib:neodymium" - ] + "items": "chemlib:neodymium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_neodymium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:neodymium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/neon_lamp_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/neon_lamp_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/neon_lamp_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/neon_lamp_block.json index a2606798..0d8b7807 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/neon_lamp_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/neon_lamp_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_neon": { + "has_chemlib:neon": { "conditions": { "items": [ { - "items": [ - "chemlib:neon" - ] + "items": "chemlib:neon" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_neon", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:neon" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_block_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_block_to_ingot.json index 41267be0..9951e825 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_nickel": { + "has_chemlib:nickel": { "conditions": { "items": [ { - "items": [ - "chemlib:nickel" - ] + "items": "chemlib:nickel" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_nickel", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:nickel" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_ingot_from_blasting_nickel_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_ingot_from_blasting_nickel_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_ingot_from_blasting_nickel_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_ingot_from_blasting_nickel_dust.json index 89993379..1c14a0f4 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_ingot_from_blasting_nickel_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_ingot_from_blasting_nickel_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_nickel": { + "has_chemlib:nickel": { "conditions": { "items": [ { - "items": [ - "chemlib:nickel" - ] + "items": "chemlib:nickel" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_nickel", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:nickel" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_ingot_from_smelting_nickel_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_ingot_from_smelting_nickel_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_ingot_from_smelting_nickel_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_ingot_from_smelting_nickel_dust.json index f8fdb5a7..42ec94d1 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_ingot_from_smelting_nickel_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_ingot_from_smelting_nickel_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_nickel": { + "has_chemlib:nickel": { "conditions": { "items": [ { - "items": [ - "chemlib:nickel" - ] + "items": "chemlib:nickel" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_nickel", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:nickel" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_ingot_to_block.json index 9825889d..6ae3cc3f 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_nickel": { + "has_chemlib:nickel": { "conditions": { "items": [ { - "items": [ - "chemlib:nickel" - ] + "items": "chemlib:nickel" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_nickel", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:nickel" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_ingot_to_nugget.json index f47313dd..bdbc6dd5 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_nickel": { + "has_chemlib:nickel": { "conditions": { "items": [ { - "items": [ - "chemlib:nickel" - ] + "items": "chemlib:nickel" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_nickel", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:nickel" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_nugget_to_ingot.json index 403e51f7..4807c4e4 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/nickel_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/nickel_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_nickel": { + "has_chemlib:nickel": { "conditions": { "items": [ { - "items": [ - "chemlib:nickel" - ] + "items": "chemlib:nickel" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_nickel", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:nickel" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_block_to_ingot.json index ac1865c2..469d8b1b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_niobium": { + "has_chemlib:niobium": { "conditions": { "items": [ { - "items": [ - "chemlib:niobium" - ] + "items": "chemlib:niobium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_niobium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:niobium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_ingot_from_blasting_niobium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_ingot_from_blasting_niobium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_ingot_from_blasting_niobium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_ingot_from_blasting_niobium_dust.json index 6af149f9..f3c4d009 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_ingot_from_blasting_niobium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_ingot_from_blasting_niobium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_niobium": { + "has_chemlib:niobium": { "conditions": { "items": [ { - "items": [ - "chemlib:niobium" - ] + "items": "chemlib:niobium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_niobium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:niobium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_ingot_from_smelting_niobium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_ingot_from_smelting_niobium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_ingot_from_smelting_niobium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_ingot_from_smelting_niobium_dust.json index 7251bccb..568f6369 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_ingot_from_smelting_niobium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_ingot_from_smelting_niobium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_niobium": { + "has_chemlib:niobium": { "conditions": { "items": [ { - "items": [ - "chemlib:niobium" - ] + "items": "chemlib:niobium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_niobium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:niobium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_ingot_to_block.json index f4ed049f..6eff2421 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_niobium": { + "has_chemlib:niobium": { "conditions": { "items": [ { - "items": [ - "chemlib:niobium" - ] + "items": "chemlib:niobium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_niobium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:niobium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_ingot_to_nugget.json index 077047e2..66a60fe9 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_niobium": { + "has_chemlib:niobium": { "conditions": { "items": [ { - "items": [ - "chemlib:niobium" - ] + "items": "chemlib:niobium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_niobium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:niobium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_nugget_to_ingot.json index ba49e7ff..4605eb89 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/niobium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/niobium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_niobium": { + "has_chemlib:niobium": { "conditions": { "items": [ { - "items": [ - "chemlib:niobium" - ] + "items": "chemlib:niobium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_niobium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:niobium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_block_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_block_to_ingot.json index a945fc99..575804f7 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_osmium": { + "has_chemlib:osmium": { "conditions": { "items": [ { - "items": [ - "chemlib:osmium" - ] + "items": "chemlib:osmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_osmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:osmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_ingot_from_blasting_osmium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_ingot_from_blasting_osmium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_ingot_from_blasting_osmium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_ingot_from_blasting_osmium_dust.json index dee22149..6b425d82 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_ingot_from_blasting_osmium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_ingot_from_blasting_osmium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_osmium": { + "has_chemlib:osmium": { "conditions": { "items": [ { - "items": [ - "chemlib:osmium" - ] + "items": "chemlib:osmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_osmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:osmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_ingot_from_smelting_osmium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_ingot_from_smelting_osmium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_ingot_from_smelting_osmium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_ingot_from_smelting_osmium_dust.json index 47b77e02..9e33505b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_ingot_from_smelting_osmium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_ingot_from_smelting_osmium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_osmium": { + "has_chemlib:osmium": { "conditions": { "items": [ { - "items": [ - "chemlib:osmium" - ] + "items": "chemlib:osmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_osmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:osmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_ingot_to_block.json index ad01ca61..56b19446 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_osmium": { + "has_chemlib:osmium": { "conditions": { "items": [ { - "items": [ - "chemlib:osmium" - ] + "items": "chemlib:osmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_osmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:osmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_ingot_to_nugget.json index 9c49cc2f..4a7d7e42 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_osmium": { + "has_chemlib:osmium": { "conditions": { "items": [ { - "items": [ - "chemlib:osmium" - ] + "items": "chemlib:osmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_osmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:osmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_nugget_to_ingot.json index 90892ee2..90d8b0dd 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/osmium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/osmium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_osmium": { + "has_chemlib:osmium": { "conditions": { "items": [ { - "items": [ - "chemlib:osmium" - ] + "items": "chemlib:osmium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_osmium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:osmium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_block_to_ingot.json index 8898d20e..27d9f92a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_palladium": { + "has_chemlib:palladium": { "conditions": { "items": [ { - "items": [ - "chemlib:palladium" - ] + "items": "chemlib:palladium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_palladium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:palladium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_ingot_from_blasting_palladium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_ingot_from_blasting_palladium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_ingot_from_blasting_palladium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_ingot_from_blasting_palladium_dust.json index a6c2e879..b50227de 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_ingot_from_blasting_palladium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_ingot_from_blasting_palladium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_palladium": { + "has_chemlib:palladium": { "conditions": { "items": [ { - "items": [ - "chemlib:palladium" - ] + "items": "chemlib:palladium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_palladium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:palladium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_ingot_from_smelting_palladium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_ingot_from_smelting_palladium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_ingot_from_smelting_palladium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_ingot_from_smelting_palladium_dust.json index c15a199f..a3a37b1f 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_ingot_from_smelting_palladium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_ingot_from_smelting_palladium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_palladium": { + "has_chemlib:palladium": { "conditions": { "items": [ { - "items": [ - "chemlib:palladium" - ] + "items": "chemlib:palladium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_palladium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:palladium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_ingot_to_block.json index c0376a54..006e33e5 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_palladium": { + "has_chemlib:palladium": { "conditions": { "items": [ { - "items": [ - "chemlib:palladium" - ] + "items": "chemlib:palladium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_palladium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:palladium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_ingot_to_nugget.json index 025420c2..6a486529 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_palladium": { + "has_chemlib:palladium": { "conditions": { "items": [ { - "items": [ - "chemlib:palladium" - ] + "items": "chemlib:palladium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_palladium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:palladium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_nugget_to_ingot.json index 8ca54c8a..7d95d91e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/palladium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/palladium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_palladium": { + "has_chemlib:palladium": { "conditions": { "items": [ { - "items": [ - "chemlib:palladium" - ] + "items": "chemlib:palladium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_palladium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:palladium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/periodic_table.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/periodic_table.json similarity index 80% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/periodic_table.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/periodic_table.json index 83ac4b91..0cd6603c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/periodic_table.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/periodic_table.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "chemlib:hydrogen" - ] + "items": "chemlib:hydrogen" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_hydrogen", - "has_the_recipe" + "has_the_recipe", + "has_hydrogen" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_block_to_ingot.json index 9eeeb0e4..32ca4827 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_platinum": { + "has_chemlib:platinum": { "conditions": { "items": [ { - "items": [ - "chemlib:platinum" - ] + "items": "chemlib:platinum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_platinum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:platinum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_ingot_from_blasting_platinum_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_ingot_from_blasting_platinum_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_ingot_from_blasting_platinum_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_ingot_from_blasting_platinum_dust.json index a9a26781..f986f133 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_ingot_from_blasting_platinum_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_ingot_from_blasting_platinum_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_platinum": { + "has_chemlib:platinum": { "conditions": { "items": [ { - "items": [ - "chemlib:platinum" - ] + "items": "chemlib:platinum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_platinum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:platinum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_ingot_from_smelting_platinum_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_ingot_from_smelting_platinum_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_ingot_from_smelting_platinum_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_ingot_from_smelting_platinum_dust.json index 69065007..81ac64b5 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_ingot_from_smelting_platinum_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_ingot_from_smelting_platinum_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_platinum": { + "has_chemlib:platinum": { "conditions": { "items": [ { - "items": [ - "chemlib:platinum" - ] + "items": "chemlib:platinum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_platinum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:platinum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_ingot_to_block.json index facc69d7..9baa6377 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_platinum": { + "has_chemlib:platinum": { "conditions": { "items": [ { - "items": [ - "chemlib:platinum" - ] + "items": "chemlib:platinum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_platinum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:platinum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_ingot_to_nugget.json index 99cf3540..312def33 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_platinum": { + "has_chemlib:platinum": { "conditions": { "items": [ { - "items": [ - "chemlib:platinum" - ] + "items": "chemlib:platinum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_platinum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:platinum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_nugget_to_ingot.json index 96d8a455..21303b9b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/platinum_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/platinum_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_platinum": { + "has_chemlib:platinum": { "conditions": { "items": [ { - "items": [ - "chemlib:platinum" - ] + "items": "chemlib:platinum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_platinum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:platinum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_block_to_ingot.json index 04c2628c..bb5963a7 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_polonium": { + "has_chemlib:polonium": { "conditions": { "items": [ { - "items": [ - "chemlib:polonium" - ] + "items": "chemlib:polonium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_polonium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:polonium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_ingot_from_blasting_polonium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_ingot_from_blasting_polonium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_ingot_from_blasting_polonium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_ingot_from_blasting_polonium_dust.json index 575da413..27a2599a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_ingot_from_blasting_polonium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_ingot_from_blasting_polonium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_polonium": { + "has_chemlib:polonium": { "conditions": { "items": [ { - "items": [ - "chemlib:polonium" - ] + "items": "chemlib:polonium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_polonium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:polonium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_ingot_from_smelting_polonium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_ingot_from_smelting_polonium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_ingot_from_smelting_polonium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_ingot_from_smelting_polonium_dust.json index 68b32912..4b8a726c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_ingot_from_smelting_polonium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_ingot_from_smelting_polonium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_polonium": { + "has_chemlib:polonium": { "conditions": { "items": [ { - "items": [ - "chemlib:polonium" - ] + "items": "chemlib:polonium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_polonium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:polonium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_ingot_to_block.json index a3a4a77f..c9c206f7 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_polonium": { + "has_chemlib:polonium": { "conditions": { "items": [ { - "items": [ - "chemlib:polonium" - ] + "items": "chemlib:polonium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_polonium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:polonium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_ingot_to_nugget.json index dfa550aa..9888adaa 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_polonium": { + "has_chemlib:polonium": { "conditions": { "items": [ { - "items": [ - "chemlib:polonium" - ] + "items": "chemlib:polonium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_polonium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:polonium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_nugget_to_ingot.json index 65316361..576b2525 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/polonium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/polonium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_polonium": { + "has_chemlib:polonium": { "conditions": { "items": [ { - "items": [ - "chemlib:polonium" - ] + "items": "chemlib:polonium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_polonium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:polonium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_block_to_ingot.json index 285da88c..ddc69026 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_potassium": { + "has_chemlib:potassium": { "conditions": { "items": [ { - "items": [ - "chemlib:potassium" - ] + "items": "chemlib:potassium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_potassium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:potassium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_ingot_from_blasting_potassium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_ingot_from_blasting_potassium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_ingot_from_blasting_potassium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_ingot_from_blasting_potassium_dust.json index f132cb09..e1e6be8f 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_ingot_from_blasting_potassium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_ingot_from_blasting_potassium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_potassium": { + "has_chemlib:potassium": { "conditions": { "items": [ { - "items": [ - "chemlib:potassium" - ] + "items": "chemlib:potassium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_potassium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:potassium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_ingot_from_smelting_potassium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_ingot_from_smelting_potassium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_ingot_from_smelting_potassium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_ingot_from_smelting_potassium_dust.json index 39d332aa..0bfd8647 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_ingot_from_smelting_potassium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_ingot_from_smelting_potassium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_potassium": { + "has_chemlib:potassium": { "conditions": { "items": [ { - "items": [ - "chemlib:potassium" - ] + "items": "chemlib:potassium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_potassium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:potassium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_ingot_to_block.json index fbbe66fa..a69384ab 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_potassium": { + "has_chemlib:potassium": { "conditions": { "items": [ { - "items": [ - "chemlib:potassium" - ] + "items": "chemlib:potassium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_potassium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:potassium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_ingot_to_nugget.json index 14ac2fef..6e1eaed5 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_potassium": { + "has_chemlib:potassium": { "conditions": { "items": [ { - "items": [ - "chemlib:potassium" - ] + "items": "chemlib:potassium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_potassium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:potassium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_nugget_to_ingot.json index 949b2cbe..de536d37 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/potassium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/potassium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_potassium": { + "has_chemlib:potassium": { "conditions": { "items": [ { - "items": [ - "chemlib:potassium" - ] + "items": "chemlib:potassium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_potassium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:potassium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_block_to_ingot.json similarity index 76% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_block_to_ingot.json index c0d612e6..0ddf0f08 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_praseodymium": { + "has_chemlib:praseodymium": { "conditions": { "items": [ { - "items": [ - "chemlib:praseodymium" - ] + "items": "chemlib:praseodymium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_praseodymium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:praseodymium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_ingot_from_blasting_praseodymium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_ingot_from_blasting_praseodymium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_ingot_from_blasting_praseodymium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_ingot_from_blasting_praseodymium_dust.json index 0898030e..0fef3a3e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_ingot_from_blasting_praseodymium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_ingot_from_blasting_praseodymium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_praseodymium": { + "has_chemlib:praseodymium": { "conditions": { "items": [ { - "items": [ - "chemlib:praseodymium" - ] + "items": "chemlib:praseodymium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_praseodymium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:praseodymium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_ingot_from_smelting_praseodymium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_ingot_from_smelting_praseodymium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_ingot_from_smelting_praseodymium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_ingot_from_smelting_praseodymium_dust.json index a982c57c..dbaea11c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_ingot_from_smelting_praseodymium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_ingot_from_smelting_praseodymium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_praseodymium": { + "has_chemlib:praseodymium": { "conditions": { "items": [ { - "items": [ - "chemlib:praseodymium" - ] + "items": "chemlib:praseodymium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_praseodymium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:praseodymium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_ingot_to_block.json similarity index 76% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_ingot_to_block.json index 52da96d2..ea2e62fa 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_praseodymium": { + "has_chemlib:praseodymium": { "conditions": { "items": [ { - "items": [ - "chemlib:praseodymium" - ] + "items": "chemlib:praseodymium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_praseodymium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:praseodymium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_ingot_to_nugget.json similarity index 76% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_ingot_to_nugget.json index 665f3612..b15d852e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_praseodymium": { + "has_chemlib:praseodymium": { "conditions": { "items": [ { - "items": [ - "chemlib:praseodymium" - ] + "items": "chemlib:praseodymium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_praseodymium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:praseodymium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_nugget_to_ingot.json similarity index 76% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_nugget_to_ingot.json index 12554c5a..5b5a3e9d 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/praseodymium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/praseodymium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_praseodymium": { + "has_chemlib:praseodymium": { "conditions": { "items": [ { - "items": [ - "chemlib:praseodymium" - ] + "items": "chemlib:praseodymium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_praseodymium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:praseodymium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_block_to_ingot.json similarity index 76% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_block_to_ingot.json index 5cba289e..4645b09c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_protactinium": { + "has_chemlib:protactinium": { "conditions": { "items": [ { - "items": [ - "chemlib:protactinium" - ] + "items": "chemlib:protactinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_protactinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:protactinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_ingot_from_blasting_protactinium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_ingot_from_blasting_protactinium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_ingot_from_blasting_protactinium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_ingot_from_blasting_protactinium_dust.json index cb257736..480de592 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_ingot_from_blasting_protactinium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_ingot_from_blasting_protactinium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_protactinium": { + "has_chemlib:protactinium": { "conditions": { "items": [ { - "items": [ - "chemlib:protactinium" - ] + "items": "chemlib:protactinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_protactinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:protactinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_ingot_from_smelting_protactinium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_ingot_from_smelting_protactinium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_ingot_from_smelting_protactinium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_ingot_from_smelting_protactinium_dust.json index f14713f3..fdc4b816 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_ingot_from_smelting_protactinium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_ingot_from_smelting_protactinium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_protactinium": { + "has_chemlib:protactinium": { "conditions": { "items": [ { - "items": [ - "chemlib:protactinium" - ] + "items": "chemlib:protactinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_protactinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:protactinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_ingot_to_block.json similarity index 76% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_ingot_to_block.json index 582ed713..afe13e7c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_protactinium": { + "has_chemlib:protactinium": { "conditions": { "items": [ { - "items": [ - "chemlib:protactinium" - ] + "items": "chemlib:protactinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_protactinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:protactinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_ingot_to_nugget.json similarity index 76% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_ingot_to_nugget.json index 938dbf44..5ca1543d 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_protactinium": { + "has_chemlib:protactinium": { "conditions": { "items": [ { - "items": [ - "chemlib:protactinium" - ] + "items": "chemlib:protactinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_protactinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:protactinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_nugget_to_ingot.json similarity index 76% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_nugget_to_ingot.json index 7cfcb44c..71c51e03 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/protactinium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/protactinium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_protactinium": { + "has_chemlib:protactinium": { "conditions": { "items": [ { - "items": [ - "chemlib:protactinium" - ] + "items": "chemlib:protactinium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_protactinium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:protactinium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/radium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/radium_block_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/radium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/radium_block_to_ingot.json index 38afbb24..82600ae6 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/radium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/radium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_radium": { + "has_chemlib:radium": { "conditions": { "items": [ { - "items": [ - "chemlib:radium" - ] + "items": "chemlib:radium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_radium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:radium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/radium_ingot_from_blasting_radium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/radium_ingot_from_blasting_radium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/radium_ingot_from_blasting_radium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/radium_ingot_from_blasting_radium_dust.json index 9ade6e35..7a83b790 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/radium_ingot_from_blasting_radium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/radium_ingot_from_blasting_radium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_radium": { + "has_chemlib:radium": { "conditions": { "items": [ { - "items": [ - "chemlib:radium" - ] + "items": "chemlib:radium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_radium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:radium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/radium_ingot_from_smelting_radium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/radium_ingot_from_smelting_radium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/radium_ingot_from_smelting_radium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/radium_ingot_from_smelting_radium_dust.json index aa018d68..4e6835bb 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/radium_ingot_from_smelting_radium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/radium_ingot_from_smelting_radium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_radium": { + "has_chemlib:radium": { "conditions": { "items": [ { - "items": [ - "chemlib:radium" - ] + "items": "chemlib:radium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_radium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:radium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/radium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/radium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/radium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/radium_ingot_to_block.json index f1c1a3be..2e8bbcb6 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/radium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/radium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_radium": { + "has_chemlib:radium": { "conditions": { "items": [ { - "items": [ - "chemlib:radium" - ] + "items": "chemlib:radium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_radium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:radium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/radium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/radium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/radium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/radium_ingot_to_nugget.json index 781e912d..7bd71e76 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/radium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/radium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_radium": { + "has_chemlib:radium": { "conditions": { "items": [ { - "items": [ - "chemlib:radium" - ] + "items": "chemlib:radium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_radium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:radium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/radium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/radium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/radium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/radium_nugget_to_ingot.json index d3b4bc74..42d8244d 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/radium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/radium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_radium": { + "has_chemlib:radium": { "conditions": { "items": [ { - "items": [ - "chemlib:radium" - ] + "items": "chemlib:radium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_radium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:radium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/radon_lamp_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/radon_lamp_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/radon_lamp_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/radon_lamp_block.json index 7197ccdc..393ef322 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/radon_lamp_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/radon_lamp_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_radon": { + "has_chemlib:radon": { "conditions": { "items": [ { - "items": [ - "chemlib:radon" - ] + "items": "chemlib:radon" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_radon", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:radon" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_block_to_ingot.json index baaca8be..93700ce3 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rhenium": { + "has_chemlib:rhenium": { "conditions": { "items": [ { - "items": [ - "chemlib:rhenium" - ] + "items": "chemlib:rhenium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rhenium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rhenium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_ingot_from_blasting_rhenium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_ingot_from_blasting_rhenium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_ingot_from_blasting_rhenium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_ingot_from_blasting_rhenium_dust.json index 672b32e5..747d1a61 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_ingot_from_blasting_rhenium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_ingot_from_blasting_rhenium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rhenium": { + "has_chemlib:rhenium": { "conditions": { "items": [ { - "items": [ - "chemlib:rhenium" - ] + "items": "chemlib:rhenium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rhenium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rhenium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_ingot_from_smelting_rhenium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_ingot_from_smelting_rhenium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_ingot_from_smelting_rhenium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_ingot_from_smelting_rhenium_dust.json index ee3d2495..aa36c8f9 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_ingot_from_smelting_rhenium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_ingot_from_smelting_rhenium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rhenium": { + "has_chemlib:rhenium": { "conditions": { "items": [ { - "items": [ - "chemlib:rhenium" - ] + "items": "chemlib:rhenium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rhenium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rhenium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_ingot_to_block.json index f3c7551f..32823a94 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rhenium": { + "has_chemlib:rhenium": { "conditions": { "items": [ { - "items": [ - "chemlib:rhenium" - ] + "items": "chemlib:rhenium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rhenium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rhenium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_ingot_to_nugget.json index 5cecf658..4599b625 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rhenium": { + "has_chemlib:rhenium": { "conditions": { "items": [ { - "items": [ - "chemlib:rhenium" - ] + "items": "chemlib:rhenium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rhenium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rhenium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_nugget_to_ingot.json index 15642765..2546f507 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhenium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhenium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rhenium": { + "has_chemlib:rhenium": { "conditions": { "items": [ { - "items": [ - "chemlib:rhenium" - ] + "items": "chemlib:rhenium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rhenium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rhenium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_block_to_ingot.json index cb5194c2..d70046c8 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rhodium": { + "has_chemlib:rhodium": { "conditions": { "items": [ { - "items": [ - "chemlib:rhodium" - ] + "items": "chemlib:rhodium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rhodium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rhodium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_ingot_from_blasting_rhodium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_ingot_from_blasting_rhodium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_ingot_from_blasting_rhodium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_ingot_from_blasting_rhodium_dust.json index 081899fd..dccb0691 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_ingot_from_blasting_rhodium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_ingot_from_blasting_rhodium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rhodium": { + "has_chemlib:rhodium": { "conditions": { "items": [ { - "items": [ - "chemlib:rhodium" - ] + "items": "chemlib:rhodium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rhodium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rhodium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_ingot_from_smelting_rhodium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_ingot_from_smelting_rhodium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_ingot_from_smelting_rhodium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_ingot_from_smelting_rhodium_dust.json index 4ab8cf6e..feae0787 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_ingot_from_smelting_rhodium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_ingot_from_smelting_rhodium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rhodium": { + "has_chemlib:rhodium": { "conditions": { "items": [ { - "items": [ - "chemlib:rhodium" - ] + "items": "chemlib:rhodium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rhodium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rhodium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_ingot_to_block.json index e0f04f14..0e613370 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rhodium": { + "has_chemlib:rhodium": { "conditions": { "items": [ { - "items": [ - "chemlib:rhodium" - ] + "items": "chemlib:rhodium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rhodium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rhodium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_ingot_to_nugget.json index ac43ca8c..1ba43796 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rhodium": { + "has_chemlib:rhodium": { "conditions": { "items": [ { - "items": [ - "chemlib:rhodium" - ] + "items": "chemlib:rhodium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rhodium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rhodium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_nugget_to_ingot.json index 6473c729..58fda191 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rhodium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rhodium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rhodium": { + "has_chemlib:rhodium": { "conditions": { "items": [ { - "items": [ - "chemlib:rhodium" - ] + "items": "chemlib:rhodium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rhodium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rhodium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_block_to_ingot.json index 117f4d84..cfb5cd23 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rubidium": { + "has_chemlib:rubidium": { "conditions": { "items": [ { - "items": [ - "chemlib:rubidium" - ] + "items": "chemlib:rubidium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rubidium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rubidium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_ingot_from_blasting_rubidium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_ingot_from_blasting_rubidium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_ingot_from_blasting_rubidium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_ingot_from_blasting_rubidium_dust.json index 4194ea91..28847cbc 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_ingot_from_blasting_rubidium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_ingot_from_blasting_rubidium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rubidium": { + "has_chemlib:rubidium": { "conditions": { "items": [ { - "items": [ - "chemlib:rubidium" - ] + "items": "chemlib:rubidium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rubidium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rubidium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_ingot_from_smelting_rubidium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_ingot_from_smelting_rubidium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_ingot_from_smelting_rubidium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_ingot_from_smelting_rubidium_dust.json index d5d4fec7..85fda40c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_ingot_from_smelting_rubidium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_ingot_from_smelting_rubidium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rubidium": { + "has_chemlib:rubidium": { "conditions": { "items": [ { - "items": [ - "chemlib:rubidium" - ] + "items": "chemlib:rubidium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rubidium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rubidium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_ingot_to_block.json index 8ffb649e..05d47324 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rubidium": { + "has_chemlib:rubidium": { "conditions": { "items": [ { - "items": [ - "chemlib:rubidium" - ] + "items": "chemlib:rubidium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rubidium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rubidium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_ingot_to_nugget.json index 5ca82c8b..fe31d78f 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rubidium": { + "has_chemlib:rubidium": { "conditions": { "items": [ { - "items": [ - "chemlib:rubidium" - ] + "items": "chemlib:rubidium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rubidium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rubidium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_nugget_to_ingot.json index 0504d576..d5095f55 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/rubidium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/rubidium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_rubidium": { + "has_chemlib:rubidium": { "conditions": { "items": [ { - "items": [ - "chemlib:rubidium" - ] + "items": "chemlib:rubidium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_rubidium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:rubidium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_block_to_ingot.json index d24a3e3e..38328ae3 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_ruthenium": { + "has_chemlib:ruthenium": { "conditions": { "items": [ { - "items": [ - "chemlib:ruthenium" - ] + "items": "chemlib:ruthenium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_ruthenium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:ruthenium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_ingot_from_blasting_ruthenium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_ingot_from_blasting_ruthenium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_ingot_from_blasting_ruthenium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_ingot_from_blasting_ruthenium_dust.json index c5734deb..350fb21c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_ingot_from_blasting_ruthenium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_ingot_from_blasting_ruthenium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_ruthenium": { + "has_chemlib:ruthenium": { "conditions": { "items": [ { - "items": [ - "chemlib:ruthenium" - ] + "items": "chemlib:ruthenium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_ruthenium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:ruthenium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_ingot_from_smelting_ruthenium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_ingot_from_smelting_ruthenium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_ingot_from_smelting_ruthenium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_ingot_from_smelting_ruthenium_dust.json index 13cb5ca9..c69cc322 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_ingot_from_smelting_ruthenium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_ingot_from_smelting_ruthenium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_ruthenium": { + "has_chemlib:ruthenium": { "conditions": { "items": [ { - "items": [ - "chemlib:ruthenium" - ] + "items": "chemlib:ruthenium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_ruthenium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:ruthenium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_ingot_to_block.json index e9377aa2..b4eba635 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_ruthenium": { + "has_chemlib:ruthenium": { "conditions": { "items": [ { - "items": [ - "chemlib:ruthenium" - ] + "items": "chemlib:ruthenium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_ruthenium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:ruthenium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_ingot_to_nugget.json index 94471e02..e5992ca6 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_ruthenium": { + "has_chemlib:ruthenium": { "conditions": { "items": [ { - "items": [ - "chemlib:ruthenium" - ] + "items": "chemlib:ruthenium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_ruthenium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:ruthenium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_nugget_to_ingot.json index 0721b740..58886b31 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/ruthenium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/ruthenium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_ruthenium": { + "has_chemlib:ruthenium": { "conditions": { "items": [ { - "items": [ - "chemlib:ruthenium" - ] + "items": "chemlib:ruthenium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_ruthenium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:ruthenium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_block_to_ingot.json index 8477a79e..4e237b88 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_samarium": { + "has_chemlib:samarium": { "conditions": { "items": [ { - "items": [ - "chemlib:samarium" - ] + "items": "chemlib:samarium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_samarium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:samarium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_ingot_from_blasting_samarium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_ingot_from_blasting_samarium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_ingot_from_blasting_samarium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_ingot_from_blasting_samarium_dust.json index 2196a795..19c0ef49 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_ingot_from_blasting_samarium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_ingot_from_blasting_samarium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_samarium": { + "has_chemlib:samarium": { "conditions": { "items": [ { - "items": [ - "chemlib:samarium" - ] + "items": "chemlib:samarium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_samarium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:samarium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_ingot_from_smelting_samarium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_ingot_from_smelting_samarium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_ingot_from_smelting_samarium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_ingot_from_smelting_samarium_dust.json index 6f3f9049..d439f322 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_ingot_from_smelting_samarium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_ingot_from_smelting_samarium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_samarium": { + "has_chemlib:samarium": { "conditions": { "items": [ { - "items": [ - "chemlib:samarium" - ] + "items": "chemlib:samarium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_samarium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:samarium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_ingot_to_block.json index 7bfb262d..f1f0dac4 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_samarium": { + "has_chemlib:samarium": { "conditions": { "items": [ { - "items": [ - "chemlib:samarium" - ] + "items": "chemlib:samarium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_samarium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:samarium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_ingot_to_nugget.json index 7408f4c4..26c02fcd 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_samarium": { + "has_chemlib:samarium": { "conditions": { "items": [ { - "items": [ - "chemlib:samarium" - ] + "items": "chemlib:samarium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_samarium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:samarium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_nugget_to_ingot.json index 3bf47f80..769277f4 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/samarium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/samarium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_samarium": { + "has_chemlib:samarium": { "conditions": { "items": [ { - "items": [ - "chemlib:samarium" - ] + "items": "chemlib:samarium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_samarium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:samarium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_block_to_ingot.json index 5651edc6..31005898 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_scandium": { + "has_chemlib:scandium": { "conditions": { "items": [ { - "items": [ - "chemlib:scandium" - ] + "items": "chemlib:scandium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_scandium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:scandium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_ingot_from_blasting_scandium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_ingot_from_blasting_scandium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_ingot_from_blasting_scandium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_ingot_from_blasting_scandium_dust.json index 37e98b1b..46dccc90 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_ingot_from_blasting_scandium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_ingot_from_blasting_scandium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_scandium": { + "has_chemlib:scandium": { "conditions": { "items": [ { - "items": [ - "chemlib:scandium" - ] + "items": "chemlib:scandium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_scandium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:scandium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_ingot_from_smelting_scandium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_ingot_from_smelting_scandium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_ingot_from_smelting_scandium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_ingot_from_smelting_scandium_dust.json index b5aa47a0..6f11450e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_ingot_from_smelting_scandium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_ingot_from_smelting_scandium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_scandium": { + "has_chemlib:scandium": { "conditions": { "items": [ { - "items": [ - "chemlib:scandium" - ] + "items": "chemlib:scandium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_scandium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:scandium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_ingot_to_block.json index 536e614f..ade06215 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_scandium": { + "has_chemlib:scandium": { "conditions": { "items": [ { - "items": [ - "chemlib:scandium" - ] + "items": "chemlib:scandium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_scandium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:scandium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_ingot_to_nugget.json index eefbac57..511125ab 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_scandium": { + "has_chemlib:scandium": { "conditions": { "items": [ { - "items": [ - "chemlib:scandium" - ] + "items": "chemlib:scandium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_scandium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:scandium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_nugget_to_ingot.json index 77f4907c..b88d499e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/scandium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/scandium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_scandium": { + "has_chemlib:scandium": { "conditions": { "items": [ { - "items": [ - "chemlib:scandium" - ] + "items": "chemlib:scandium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_scandium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:scandium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/silver_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/silver_block_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/silver_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/silver_block_to_ingot.json index 7e3bd716..49de4aca 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/silver_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/silver_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_silver": { + "has_chemlib:silver": { "conditions": { "items": [ { - "items": [ - "chemlib:silver" - ] + "items": "chemlib:silver" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_silver", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:silver" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/silver_ingot_from_blasting_silver_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/silver_ingot_from_blasting_silver_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/silver_ingot_from_blasting_silver_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/silver_ingot_from_blasting_silver_dust.json index d3e15b7a..3562deaf 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/silver_ingot_from_blasting_silver_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/silver_ingot_from_blasting_silver_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_silver": { + "has_chemlib:silver": { "conditions": { "items": [ { - "items": [ - "chemlib:silver" - ] + "items": "chemlib:silver" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_silver", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:silver" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/silver_ingot_from_smelting_silver_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/silver_ingot_from_smelting_silver_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/silver_ingot_from_smelting_silver_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/silver_ingot_from_smelting_silver_dust.json index aec32744..7e58d220 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/silver_ingot_from_smelting_silver_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/silver_ingot_from_smelting_silver_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_silver": { + "has_chemlib:silver": { "conditions": { "items": [ { - "items": [ - "chemlib:silver" - ] + "items": "chemlib:silver" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_silver", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:silver" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/silver_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/silver_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/silver_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/silver_ingot_to_block.json index 967f7180..1a573b88 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/silver_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/silver_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_silver": { + "has_chemlib:silver": { "conditions": { "items": [ { - "items": [ - "chemlib:silver" - ] + "items": "chemlib:silver" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_silver", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:silver" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/silver_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/silver_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/silver_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/silver_ingot_to_nugget.json index c8ab0446..4aa111b6 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/silver_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/silver_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_silver": { + "has_chemlib:silver": { "conditions": { "items": [ { - "items": [ - "chemlib:silver" - ] + "items": "chemlib:silver" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_silver", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:silver" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/silver_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/silver_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/silver_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/silver_nugget_to_ingot.json index 5ab3af9c..fabf0b88 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/silver_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/silver_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_silver": { + "has_chemlib:silver": { "conditions": { "items": [ { - "items": [ - "chemlib:silver" - ] + "items": "chemlib:silver" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_silver", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:silver" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_block_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_block_to_ingot.json index 770b242e..9e587b5b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_sodium": { + "has_chemlib:sodium": { "conditions": { "items": [ { - "items": [ - "chemlib:sodium" - ] + "items": "chemlib:sodium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_sodium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:sodium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_ingot_from_blasting_sodium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_ingot_from_blasting_sodium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_ingot_from_blasting_sodium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_ingot_from_blasting_sodium_dust.json index ba927d74..77e88d49 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_ingot_from_blasting_sodium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_ingot_from_blasting_sodium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_sodium": { + "has_chemlib:sodium": { "conditions": { "items": [ { - "items": [ - "chemlib:sodium" - ] + "items": "chemlib:sodium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_sodium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:sodium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_ingot_from_smelting_sodium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_ingot_from_smelting_sodium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_ingot_from_smelting_sodium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_ingot_from_smelting_sodium_dust.json index f7cd69a9..b6fde5d7 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_ingot_from_smelting_sodium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_ingot_from_smelting_sodium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_sodium": { + "has_chemlib:sodium": { "conditions": { "items": [ { - "items": [ - "chemlib:sodium" - ] + "items": "chemlib:sodium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_sodium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:sodium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_ingot_to_block.json index 6b2d836d..8083bbf1 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_sodium": { + "has_chemlib:sodium": { "conditions": { "items": [ { - "items": [ - "chemlib:sodium" - ] + "items": "chemlib:sodium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_sodium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:sodium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_ingot_to_nugget.json index 0122148a..153c791a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_sodium": { + "has_chemlib:sodium": { "conditions": { "items": [ { - "items": [ - "chemlib:sodium" - ] + "items": "chemlib:sodium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_sodium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:sodium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_nugget_to_ingot.json index aa3b6e51..c4cac8a5 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/sodium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/sodium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_sodium": { + "has_chemlib:sodium": { "conditions": { "items": [ { - "items": [ - "chemlib:sodium" - ] + "items": "chemlib:sodium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_sodium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:sodium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_block_to_ingot.json index d152b29e..9f113321 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_strontium": { + "has_chemlib:strontium": { "conditions": { "items": [ { - "items": [ - "chemlib:strontium" - ] + "items": "chemlib:strontium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_strontium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:strontium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_ingot_from_blasting_strontium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_ingot_from_blasting_strontium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_ingot_from_blasting_strontium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_ingot_from_blasting_strontium_dust.json index 03d47881..d823f93c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_ingot_from_blasting_strontium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_ingot_from_blasting_strontium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_strontium": { + "has_chemlib:strontium": { "conditions": { "items": [ { - "items": [ - "chemlib:strontium" - ] + "items": "chemlib:strontium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_strontium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:strontium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_ingot_from_smelting_strontium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_ingot_from_smelting_strontium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_ingot_from_smelting_strontium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_ingot_from_smelting_strontium_dust.json index d953c6ae..e989fb59 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_ingot_from_smelting_strontium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_ingot_from_smelting_strontium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_strontium": { + "has_chemlib:strontium": { "conditions": { "items": [ { - "items": [ - "chemlib:strontium" - ] + "items": "chemlib:strontium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_strontium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:strontium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_ingot_to_block.json index 27e0dca0..c27202ef 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_strontium": { + "has_chemlib:strontium": { "conditions": { "items": [ { - "items": [ - "chemlib:strontium" - ] + "items": "chemlib:strontium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_strontium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:strontium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_ingot_to_nugget.json index 8d61641d..6844ed44 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_strontium": { + "has_chemlib:strontium": { "conditions": { "items": [ { - "items": [ - "chemlib:strontium" - ] + "items": "chemlib:strontium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_strontium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:strontium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_nugget_to_ingot.json index ff077217..bbccf6fc 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/strontium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/strontium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_strontium": { + "has_chemlib:strontium": { "conditions": { "items": [ { - "items": [ - "chemlib:strontium" - ] + "items": "chemlib:strontium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_strontium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:strontium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_block_to_ingot.json index 8adf17d2..811c682a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_tantalum": { + "has_chemlib:tantalum": { "conditions": { "items": [ { - "items": [ - "chemlib:tantalum" - ] + "items": "chemlib:tantalum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_tantalum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tantalum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_ingot_from_blasting_tantalum_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_ingot_from_blasting_tantalum_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_ingot_from_blasting_tantalum_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_ingot_from_blasting_tantalum_dust.json index a79e130b..0e515c28 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_ingot_from_blasting_tantalum_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_ingot_from_blasting_tantalum_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_tantalum": { + "has_chemlib:tantalum": { "conditions": { "items": [ { - "items": [ - "chemlib:tantalum" - ] + "items": "chemlib:tantalum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_tantalum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tantalum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_ingot_from_smelting_tantalum_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_ingot_from_smelting_tantalum_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_ingot_from_smelting_tantalum_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_ingot_from_smelting_tantalum_dust.json index cea2edcd..2a013a55 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_ingot_from_smelting_tantalum_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_ingot_from_smelting_tantalum_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_tantalum": { + "has_chemlib:tantalum": { "conditions": { "items": [ { - "items": [ - "chemlib:tantalum" - ] + "items": "chemlib:tantalum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_tantalum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tantalum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_ingot_to_block.json index 30dc268d..e78ad84c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_tantalum": { + "has_chemlib:tantalum": { "conditions": { "items": [ { - "items": [ - "chemlib:tantalum" - ] + "items": "chemlib:tantalum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_tantalum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tantalum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_ingot_to_nugget.json index 9807a6db..ec7a7f47 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_tantalum": { + "has_chemlib:tantalum": { "conditions": { "items": [ { - "items": [ - "chemlib:tantalum" - ] + "items": "chemlib:tantalum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_tantalum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tantalum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_nugget_to_ingot.json index 82e2bd60..24036a68 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tantalum_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tantalum_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_tantalum": { + "has_chemlib:tantalum": { "conditions": { "items": [ { - "items": [ - "chemlib:tantalum" - ] + "items": "chemlib:tantalum" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_tantalum", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tantalum" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_block_to_ingot.json index dd7c27a4..3aeca601 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_terbium": { + "has_chemlib:terbium": { "conditions": { "items": [ { - "items": [ - "chemlib:terbium" - ] + "items": "chemlib:terbium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_terbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:terbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_ingot_from_blasting_terbium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_ingot_from_blasting_terbium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_ingot_from_blasting_terbium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_ingot_from_blasting_terbium_dust.json index e6798d48..05df2286 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_ingot_from_blasting_terbium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_ingot_from_blasting_terbium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_terbium": { + "has_chemlib:terbium": { "conditions": { "items": [ { - "items": [ - "chemlib:terbium" - ] + "items": "chemlib:terbium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_terbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:terbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_ingot_from_smelting_terbium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_ingot_from_smelting_terbium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_ingot_from_smelting_terbium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_ingot_from_smelting_terbium_dust.json index e2281ebf..7cd72456 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_ingot_from_smelting_terbium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_ingot_from_smelting_terbium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_terbium": { + "has_chemlib:terbium": { "conditions": { "items": [ { - "items": [ - "chemlib:terbium" - ] + "items": "chemlib:terbium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_terbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:terbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_ingot_to_block.json index 314a96ee..5f7ff47d 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_terbium": { + "has_chemlib:terbium": { "conditions": { "items": [ { - "items": [ - "chemlib:terbium" - ] + "items": "chemlib:terbium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_terbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:terbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_ingot_to_nugget.json index 98e861aa..44ef5f7c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_terbium": { + "has_chemlib:terbium": { "conditions": { "items": [ { - "items": [ - "chemlib:terbium" - ] + "items": "chemlib:terbium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_terbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:terbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_nugget_to_ingot.json index a655ec2f..8558269c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/terbium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/terbium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_terbium": { + "has_chemlib:terbium": { "conditions": { "items": [ { - "items": [ - "chemlib:terbium" - ] + "items": "chemlib:terbium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_terbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:terbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_block_to_ingot.json index 35f3f5e8..b6977bcd 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_block_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_thallium": { + "has_chemlib:thallium": { "conditions": { "items": [ { - "items": [ - "chemlib:thallium" - ] + "items": "chemlib:thallium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_thallium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thallium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_ingot_from_blasting_thallium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_ingot_from_blasting_thallium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_ingot_from_blasting_thallium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_ingot_from_blasting_thallium_dust.json index 047e6983..99cb078b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_ingot_from_blasting_thallium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_ingot_from_blasting_thallium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_thallium": { + "has_chemlib:thallium": { "conditions": { "items": [ { - "items": [ - "chemlib:thallium" - ] + "items": "chemlib:thallium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_thallium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thallium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_ingot_from_smelting_thallium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_ingot_from_smelting_thallium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_ingot_from_smelting_thallium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_ingot_from_smelting_thallium_dust.json index a0de86be..55c026b9 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_ingot_from_smelting_thallium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_ingot_from_smelting_thallium_dust.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_thallium": { + "has_chemlib:thallium": { "conditions": { "items": [ { - "items": [ - "chemlib:thallium" - ] + "items": "chemlib:thallium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_thallium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thallium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_ingot_to_block.json index 66b4d0a6..593d3cbd 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_ingot_to_block.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_thallium": { + "has_chemlib:thallium": { "conditions": { "items": [ { - "items": [ - "chemlib:thallium" - ] + "items": "chemlib:thallium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_thallium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thallium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_ingot_to_nugget.json index bfa83383..0acbc41e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_ingot_to_nugget.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_thallium": { + "has_chemlib:thallium": { "conditions": { "items": [ { - "items": [ - "chemlib:thallium" - ] + "items": "chemlib:thallium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_thallium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thallium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_nugget_to_ingot.json index 06e2ecf5..f137823f 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thallium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thallium_nugget_to_ingot.json @@ -1,13 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_thallium": { + "has_chemlib:thallium": { "conditions": { "items": [ { - "items": [ - "chemlib:thallium" - ] + "items": "chemlib:thallium" } ] }, @@ -22,8 +20,8 @@ }, "requirements": [ [ - "has_thallium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thallium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_block_to_ingot.json index 8f5a9a67..24a8e64a 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_block_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:thorium_block_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_thorium": { + "has_chemlib:thorium": { "conditions": { "items": [ { - "items": [ - "chemlib:thorium" - ] + "items": "chemlib:thorium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:thorium_block_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_thorium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thorium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_ingot_from_blasting_thorium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_ingot_from_blasting_thorium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_ingot_from_blasting_thorium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_ingot_from_blasting_thorium_dust.json index c5bc883d..ac645648 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_ingot_from_blasting_thorium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_ingot_from_blasting_thorium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:thorium_ingot_from_blasting_thorium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_thorium": { + "has_chemlib:thorium": { "conditions": { "items": [ { - "items": [ - "chemlib:thorium" - ] + "items": "chemlib:thorium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:thorium_ingot_from_blasting_thorium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_thorium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thorium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_ingot_from_smelting_thorium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_ingot_from_smelting_thorium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_ingot_from_smelting_thorium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_ingot_from_smelting_thorium_dust.json index 630faa36..87c52725 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_ingot_from_smelting_thorium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_ingot_from_smelting_thorium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:thorium_ingot_from_smelting_thorium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_thorium": { + "has_chemlib:thorium": { "conditions": { "items": [ { - "items": [ - "chemlib:thorium" - ] + "items": "chemlib:thorium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:thorium_ingot_from_smelting_thorium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_thorium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thorium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_ingot_to_block.json index ea69b294..e4f469db 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_ingot_to_block.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:thorium_ingot_to_block" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_thorium": { + "has_chemlib:thorium": { "conditions": { "items": [ { - "items": [ - "chemlib:thorium" - ] + "items": "chemlib:thorium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:thorium_ingot_to_block" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_thorium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thorium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_ingot_to_nugget.json index a380637f..7af5e2fb 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_ingot_to_nugget.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:thorium_ingot_to_nugget" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_thorium": { + "has_chemlib:thorium": { "conditions": { "items": [ { - "items": [ - "chemlib:thorium" - ] + "items": "chemlib:thorium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:thorium_ingot_to_nugget" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_thorium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thorium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_nugget_to_ingot.json index 65f1cb0c..0a6319b3 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thorium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thorium_nugget_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:thorium_nugget_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_thorium": { + "has_chemlib:thorium": { "conditions": { "items": [ { - "items": [ - "chemlib:thorium" - ] + "items": "chemlib:thorium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:thorium_nugget_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_thorium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thorium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_block_to_ingot.json index 8ab2a4ed..aefa672b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_block_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:thulium_block_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_thulium": { + "has_chemlib:thulium": { "conditions": { "items": [ { - "items": [ - "chemlib:thulium" - ] + "items": "chemlib:thulium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:thulium_block_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_thulium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thulium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_ingot_from_blasting_thulium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_ingot_from_blasting_thulium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_ingot_from_blasting_thulium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_ingot_from_blasting_thulium_dust.json index 79b3a34c..057f20db 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_ingot_from_blasting_thulium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_ingot_from_blasting_thulium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:thulium_ingot_from_blasting_thulium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_thulium": { + "has_chemlib:thulium": { "conditions": { "items": [ { - "items": [ - "chemlib:thulium" - ] + "items": "chemlib:thulium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:thulium_ingot_from_blasting_thulium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_thulium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thulium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_ingot_from_smelting_thulium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_ingot_from_smelting_thulium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_ingot_from_smelting_thulium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_ingot_from_smelting_thulium_dust.json index 5f40f593..238052fd 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_ingot_from_smelting_thulium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_ingot_from_smelting_thulium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:thulium_ingot_from_smelting_thulium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_thulium": { + "has_chemlib:thulium": { "conditions": { "items": [ { - "items": [ - "chemlib:thulium" - ] + "items": "chemlib:thulium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:thulium_ingot_from_smelting_thulium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_thulium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thulium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_ingot_to_block.json index 455d1bab..07040be9 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_ingot_to_block.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:thulium_ingot_to_block" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_thulium": { + "has_chemlib:thulium": { "conditions": { "items": [ { - "items": [ - "chemlib:thulium" - ] + "items": "chemlib:thulium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:thulium_ingot_to_block" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_thulium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thulium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_ingot_to_nugget.json index e72d93ba..0d2bdc01 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_ingot_to_nugget.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:thulium_ingot_to_nugget" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_thulium": { + "has_chemlib:thulium": { "conditions": { "items": [ { - "items": [ - "chemlib:thulium" - ] + "items": "chemlib:thulium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:thulium_ingot_to_nugget" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_thulium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thulium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_nugget_to_ingot.json index 5261bcd6..114530e7 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/thulium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/thulium_nugget_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:thulium_nugget_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_thulium": { + "has_chemlib:thulium": { "conditions": { "items": [ { - "items": [ - "chemlib:thulium" - ] + "items": "chemlib:thulium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:thulium_nugget_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_thulium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:thulium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tin_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tin_block_to_ingot.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tin_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tin_block_to_ingot.json index 424934e3..082c326f 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tin_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tin_block_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:tin_block_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_tin": { + "has_chemlib:tin": { "conditions": { "items": [ { - "items": [ - "chemlib:tin" - ] + "items": "chemlib:tin" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:tin_block_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_tin", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tin" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tin_ingot_from_blasting_tin_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tin_ingot_from_blasting_tin_dust.json similarity index 80% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tin_ingot_from_blasting_tin_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tin_ingot_from_blasting_tin_dust.json index 6a86724b..0fb726ef 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tin_ingot_from_blasting_tin_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tin_ingot_from_blasting_tin_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:tin_ingot_from_blasting_tin_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_tin": { + "has_chemlib:tin": { "conditions": { "items": [ { - "items": [ - "chemlib:tin" - ] + "items": "chemlib:tin" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:tin_ingot_from_blasting_tin_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_tin", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tin" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tin_ingot_from_smelting_tin_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tin_ingot_from_smelting_tin_dust.json similarity index 80% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tin_ingot_from_smelting_tin_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tin_ingot_from_smelting_tin_dust.json index 4dd5c0b4..20295fb5 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tin_ingot_from_smelting_tin_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tin_ingot_from_smelting_tin_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:tin_ingot_from_smelting_tin_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_tin": { + "has_chemlib:tin": { "conditions": { "items": [ { - "items": [ - "chemlib:tin" - ] + "items": "chemlib:tin" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:tin_ingot_from_smelting_tin_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_tin", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tin" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tin_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tin_ingot_to_block.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tin_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tin_ingot_to_block.json index be9d204b..86042e07 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tin_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tin_ingot_to_block.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:tin_ingot_to_block" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_tin": { + "has_chemlib:tin": { "conditions": { "items": [ { - "items": [ - "chemlib:tin" - ] + "items": "chemlib:tin" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:tin_ingot_to_block" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_tin", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tin" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tin_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tin_ingot_to_nugget.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tin_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tin_ingot_to_nugget.json index 485a384b..dd7da0e1 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tin_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tin_ingot_to_nugget.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:tin_ingot_to_nugget" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_tin": { + "has_chemlib:tin": { "conditions": { "items": [ { - "items": [ - "chemlib:tin" - ] + "items": "chemlib:tin" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:tin_ingot_to_nugget" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_tin", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tin" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tin_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tin_nugget_to_ingot.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tin_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tin_nugget_to_ingot.json index 6e3c1fca..4edbe815 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tin_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tin_nugget_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:tin_nugget_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_tin": { + "has_chemlib:tin": { "conditions": { "items": [ { - "items": [ - "chemlib:tin" - ] + "items": "chemlib:tin" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:tin_nugget_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_tin", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tin" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_block_to_ingot.json index e60491e6..7bcaf3b2 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_block_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:titanium_block_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_titanium": { + "has_chemlib:titanium": { "conditions": { "items": [ { - "items": [ - "chemlib:titanium" - ] + "items": "chemlib:titanium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:titanium_block_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_titanium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:titanium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_ingot_from_blasting_titanium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_ingot_from_blasting_titanium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_ingot_from_blasting_titanium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_ingot_from_blasting_titanium_dust.json index 63798562..a791b368 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_ingot_from_blasting_titanium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_ingot_from_blasting_titanium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:titanium_ingot_from_blasting_titanium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_titanium": { + "has_chemlib:titanium": { "conditions": { "items": [ { - "items": [ - "chemlib:titanium" - ] + "items": "chemlib:titanium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:titanium_ingot_from_blasting_titanium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_titanium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:titanium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_ingot_from_smelting_titanium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_ingot_from_smelting_titanium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_ingot_from_smelting_titanium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_ingot_from_smelting_titanium_dust.json index 9c2dd0bd..a58146a7 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_ingot_from_smelting_titanium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_ingot_from_smelting_titanium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:titanium_ingot_from_smelting_titanium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_titanium": { + "has_chemlib:titanium": { "conditions": { "items": [ { - "items": [ - "chemlib:titanium" - ] + "items": "chemlib:titanium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:titanium_ingot_from_smelting_titanium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_titanium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:titanium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_ingot_to_block.json index 143a1387..d7a50749 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_ingot_to_block.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:titanium_ingot_to_block" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_titanium": { + "has_chemlib:titanium": { "conditions": { "items": [ { - "items": [ - "chemlib:titanium" - ] + "items": "chemlib:titanium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:titanium_ingot_to_block" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_titanium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:titanium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_ingot_to_nugget.json index b15041c3..e3de3fbe 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_ingot_to_nugget.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:titanium_ingot_to_nugget" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_titanium": { + "has_chemlib:titanium": { "conditions": { "items": [ { - "items": [ - "chemlib:titanium" - ] + "items": "chemlib:titanium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:titanium_ingot_to_nugget" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_titanium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:titanium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_nugget_to_ingot.json index dbb374ab..13e93808 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/titanium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/titanium_nugget_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:titanium_nugget_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_titanium": { + "has_chemlib:titanium": { "conditions": { "items": [ { - "items": [ - "chemlib:titanium" - ] + "items": "chemlib:titanium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:titanium_nugget_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_titanium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:titanium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_block_to_ingot.json index 3b69ba0c..b0a48505 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_block_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:tungsten_block_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_tungsten": { + "has_chemlib:tungsten": { "conditions": { "items": [ { - "items": [ - "chemlib:tungsten" - ] + "items": "chemlib:tungsten" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:tungsten_block_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_tungsten", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tungsten" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_ingot_from_blasting_tungsten_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_ingot_from_blasting_tungsten_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_ingot_from_blasting_tungsten_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_ingot_from_blasting_tungsten_dust.json index 9c1659da..d71754f8 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_ingot_from_blasting_tungsten_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_ingot_from_blasting_tungsten_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:tungsten_ingot_from_blasting_tungsten_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_tungsten": { + "has_chemlib:tungsten": { "conditions": { "items": [ { - "items": [ - "chemlib:tungsten" - ] + "items": "chemlib:tungsten" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:tungsten_ingot_from_blasting_tungsten_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_tungsten", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tungsten" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_ingot_from_smelting_tungsten_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_ingot_from_smelting_tungsten_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_ingot_from_smelting_tungsten_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_ingot_from_smelting_tungsten_dust.json index 972515b5..e338d0a0 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_ingot_from_smelting_tungsten_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_ingot_from_smelting_tungsten_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:tungsten_ingot_from_smelting_tungsten_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_tungsten": { + "has_chemlib:tungsten": { "conditions": { "items": [ { - "items": [ - "chemlib:tungsten" - ] + "items": "chemlib:tungsten" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:tungsten_ingot_from_smelting_tungsten_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_tungsten", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tungsten" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_ingot_to_block.json index a0c75f66..59f42f67 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_ingot_to_block.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:tungsten_ingot_to_block" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_tungsten": { + "has_chemlib:tungsten": { "conditions": { "items": [ { - "items": [ - "chemlib:tungsten" - ] + "items": "chemlib:tungsten" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:tungsten_ingot_to_block" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_tungsten", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tungsten" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_ingot_to_nugget.json index 79993d7d..f4bf8e48 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_ingot_to_nugget.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:tungsten_ingot_to_nugget" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_tungsten": { + "has_chemlib:tungsten": { "conditions": { "items": [ { - "items": [ - "chemlib:tungsten" - ] + "items": "chemlib:tungsten" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:tungsten_ingot_to_nugget" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_tungsten", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tungsten" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_nugget_to_ingot.json index 9f868458..d2f40924 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/tungsten_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/tungsten_nugget_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:tungsten_nugget_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_tungsten": { + "has_chemlib:tungsten": { "conditions": { "items": [ { - "items": [ - "chemlib:tungsten" - ] + "items": "chemlib:tungsten" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:tungsten_nugget_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_tungsten", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:tungsten" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_block_to_ingot.json index 237d2576..e3038574 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_block_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:uranium_block_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_uranium": { + "has_chemlib:uranium": { "conditions": { "items": [ { - "items": [ - "chemlib:uranium" - ] + "items": "chemlib:uranium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:uranium_block_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_uranium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:uranium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_ingot_from_blasting_uranium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_ingot_from_blasting_uranium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_ingot_from_blasting_uranium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_ingot_from_blasting_uranium_dust.json index 94bec632..402a40d5 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_ingot_from_blasting_uranium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_ingot_from_blasting_uranium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:uranium_ingot_from_blasting_uranium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_uranium": { + "has_chemlib:uranium": { "conditions": { "items": [ { - "items": [ - "chemlib:uranium" - ] + "items": "chemlib:uranium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:uranium_ingot_from_blasting_uranium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_uranium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:uranium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_ingot_from_smelting_uranium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_ingot_from_smelting_uranium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_ingot_from_smelting_uranium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_ingot_from_smelting_uranium_dust.json index ed83612e..d2d472fe 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_ingot_from_smelting_uranium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_ingot_from_smelting_uranium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:uranium_ingot_from_smelting_uranium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_uranium": { + "has_chemlib:uranium": { "conditions": { "items": [ { - "items": [ - "chemlib:uranium" - ] + "items": "chemlib:uranium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:uranium_ingot_from_smelting_uranium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_uranium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:uranium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_ingot_to_block.json index ac4b6550..87783d75 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_ingot_to_block.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:uranium_ingot_to_block" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_uranium": { + "has_chemlib:uranium": { "conditions": { "items": [ { - "items": [ - "chemlib:uranium" - ] + "items": "chemlib:uranium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:uranium_ingot_to_block" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_uranium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:uranium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_ingot_to_nugget.json index 4e886a79..19482f85 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_ingot_to_nugget.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:uranium_ingot_to_nugget" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_uranium": { + "has_chemlib:uranium": { "conditions": { "items": [ { - "items": [ - "chemlib:uranium" - ] + "items": "chemlib:uranium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:uranium_ingot_to_nugget" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_uranium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:uranium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_nugget_to_ingot.json index 3974554b..f5a8e853 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/uranium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/uranium_nugget_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:uranium_nugget_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_uranium": { + "has_chemlib:uranium": { "conditions": { "items": [ { - "items": [ - "chemlib:uranium" - ] + "items": "chemlib:uranium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:uranium_nugget_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_uranium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:uranium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_block_to_ingot.json index e143042f..b7799f13 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_block_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:vanadium_block_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_vanadium": { + "has_chemlib:vanadium": { "conditions": { "items": [ { - "items": [ - "chemlib:vanadium" - ] + "items": "chemlib:vanadium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:vanadium_block_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_vanadium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:vanadium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_ingot_from_blasting_vanadium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_ingot_from_blasting_vanadium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_ingot_from_blasting_vanadium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_ingot_from_blasting_vanadium_dust.json index 7e9aaa80..de2f4266 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_ingot_from_blasting_vanadium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_ingot_from_blasting_vanadium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:vanadium_ingot_from_blasting_vanadium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_vanadium": { + "has_chemlib:vanadium": { "conditions": { "items": [ { - "items": [ - "chemlib:vanadium" - ] + "items": "chemlib:vanadium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:vanadium_ingot_from_blasting_vanadium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_vanadium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:vanadium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_ingot_from_smelting_vanadium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_ingot_from_smelting_vanadium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_ingot_from_smelting_vanadium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_ingot_from_smelting_vanadium_dust.json index 2eb4bfae..bdf8501b 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_ingot_from_smelting_vanadium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_ingot_from_smelting_vanadium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:vanadium_ingot_from_smelting_vanadium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_vanadium": { + "has_chemlib:vanadium": { "conditions": { "items": [ { - "items": [ - "chemlib:vanadium" - ] + "items": "chemlib:vanadium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:vanadium_ingot_from_smelting_vanadium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_vanadium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:vanadium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_ingot_to_block.json index d5a34f29..837b6a52 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_ingot_to_block.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:vanadium_ingot_to_block" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_vanadium": { + "has_chemlib:vanadium": { "conditions": { "items": [ { - "items": [ - "chemlib:vanadium" - ] + "items": "chemlib:vanadium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:vanadium_ingot_to_block" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_vanadium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:vanadium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_ingot_to_nugget.json index e54c4bc8..ca0cc85f 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_ingot_to_nugget.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:vanadium_ingot_to_nugget" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_vanadium": { + "has_chemlib:vanadium": { "conditions": { "items": [ { - "items": [ - "chemlib:vanadium" - ] + "items": "chemlib:vanadium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:vanadium_ingot_to_nugget" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_vanadium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:vanadium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_nugget_to_ingot.json index 262f402a..d3e989ec 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/vanadium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/vanadium_nugget_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:vanadium_nugget_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_vanadium": { + "has_chemlib:vanadium": { "conditions": { "items": [ { - "items": [ - "chemlib:vanadium" - ] + "items": "chemlib:vanadium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:vanadium_nugget_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_vanadium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:vanadium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/xenon_lamp_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/xenon_lamp_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/xenon_lamp_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/xenon_lamp_block.json index 0e5ac20e..64f2fc82 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/xenon_lamp_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/xenon_lamp_block.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:xenon_lamp_block" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_xenon": { + "has_chemlib:xenon": { "conditions": { "items": [ { - "items": [ - "chemlib:xenon" - ] + "items": "chemlib:xenon" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:xenon_lamp_block" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_xenon", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:xenon" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_block_to_ingot.json index 7a7e1809..d7d4f1aa 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_block_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:ytterbium_block_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_ytterbium": { + "has_chemlib:ytterbium": { "conditions": { "items": [ { - "items": [ - "chemlib:ytterbium" - ] + "items": "chemlib:ytterbium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:ytterbium_block_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_ytterbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:ytterbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_ingot_from_blasting_ytterbium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_ingot_from_blasting_ytterbium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_ingot_from_blasting_ytterbium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_ingot_from_blasting_ytterbium_dust.json index f47c272b..d7efaffc 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_ingot_from_blasting_ytterbium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_ingot_from_blasting_ytterbium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:ytterbium_ingot_from_blasting_ytterbium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_ytterbium": { + "has_chemlib:ytterbium": { "conditions": { "items": [ { - "items": [ - "chemlib:ytterbium" - ] + "items": "chemlib:ytterbium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:ytterbium_ingot_from_blasting_ytterbium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_ytterbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:ytterbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_ingot_from_smelting_ytterbium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_ingot_from_smelting_ytterbium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_ingot_from_smelting_ytterbium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_ingot_from_smelting_ytterbium_dust.json index eff57a83..0cc9617f 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_ingot_from_smelting_ytterbium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_ingot_from_smelting_ytterbium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:ytterbium_ingot_from_smelting_ytterbium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_ytterbium": { + "has_chemlib:ytterbium": { "conditions": { "items": [ { - "items": [ - "chemlib:ytterbium" - ] + "items": "chemlib:ytterbium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:ytterbium_ingot_from_smelting_ytterbium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_ytterbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:ytterbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_ingot_to_block.json index 71fa849f..eda340b7 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_ingot_to_block.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:ytterbium_ingot_to_block" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_ytterbium": { + "has_chemlib:ytterbium": { "conditions": { "items": [ { - "items": [ - "chemlib:ytterbium" - ] + "items": "chemlib:ytterbium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:ytterbium_ingot_to_block" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_ytterbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:ytterbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_ingot_to_nugget.json index 8cd0b09f..d4fcd02d 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_ingot_to_nugget.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:ytterbium_ingot_to_nugget" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_ytterbium": { + "has_chemlib:ytterbium": { "conditions": { "items": [ { - "items": [ - "chemlib:ytterbium" - ] + "items": "chemlib:ytterbium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:ytterbium_ingot_to_nugget" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_ytterbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:ytterbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_nugget_to_ingot.json index 280f4e5a..61a4a8e1 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/ytterbium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/ytterbium_nugget_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:ytterbium_nugget_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_ytterbium": { + "has_chemlib:ytterbium": { "conditions": { "items": [ { - "items": [ - "chemlib:ytterbium" - ] + "items": "chemlib:ytterbium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:ytterbium_nugget_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_ytterbium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:ytterbium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_block_to_ingot.json index 9d7946f0..9e4512ce 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_block_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:yttrium_block_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_yttrium": { + "has_chemlib:yttrium": { "conditions": { "items": [ { - "items": [ - "chemlib:yttrium" - ] + "items": "chemlib:yttrium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:yttrium_block_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_yttrium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:yttrium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_ingot_from_blasting_yttrium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_ingot_from_blasting_yttrium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_ingot_from_blasting_yttrium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_ingot_from_blasting_yttrium_dust.json index c37d3a68..062bbccc 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_ingot_from_blasting_yttrium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_ingot_from_blasting_yttrium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:yttrium_ingot_from_blasting_yttrium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_yttrium": { + "has_chemlib:yttrium": { "conditions": { "items": [ { - "items": [ - "chemlib:yttrium" - ] + "items": "chemlib:yttrium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:yttrium_ingot_from_blasting_yttrium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_yttrium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:yttrium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_ingot_from_smelting_yttrium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_ingot_from_smelting_yttrium_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_ingot_from_smelting_yttrium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_ingot_from_smelting_yttrium_dust.json index a4c16e20..0b6898ba 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_ingot_from_smelting_yttrium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_ingot_from_smelting_yttrium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:yttrium_ingot_from_smelting_yttrium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_yttrium": { + "has_chemlib:yttrium": { "conditions": { "items": [ { - "items": [ - "chemlib:yttrium" - ] + "items": "chemlib:yttrium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:yttrium_ingot_from_smelting_yttrium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_yttrium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:yttrium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_ingot_to_block.json index 5a0a5825..1f2cc7b6 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_ingot_to_block.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:yttrium_ingot_to_block" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_yttrium": { + "has_chemlib:yttrium": { "conditions": { "items": [ { - "items": [ - "chemlib:yttrium" - ] + "items": "chemlib:yttrium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:yttrium_ingot_to_block" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_yttrium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:yttrium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_ingot_to_nugget.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_ingot_to_nugget.json index 081084f6..0787c5f8 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_ingot_to_nugget.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:yttrium_ingot_to_nugget" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_yttrium": { + "has_chemlib:yttrium": { "conditions": { "items": [ { - "items": [ - "chemlib:yttrium" - ] + "items": "chemlib:yttrium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:yttrium_ingot_to_nugget" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_yttrium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:yttrium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_nugget_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_nugget_to_ingot.json index e46e186f..82a3dc4e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/yttrium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/yttrium_nugget_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:yttrium_nugget_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_yttrium": { + "has_chemlib:yttrium": { "conditions": { "items": [ { - "items": [ - "chemlib:yttrium" - ] + "items": "chemlib:yttrium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:yttrium_nugget_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_yttrium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:yttrium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_block_to_ingot.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_block_to_ingot.json index 685cd46b..e2ba8994 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_block_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:zinc_block_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_zinc": { + "has_chemlib:zinc": { "conditions": { "items": [ { - "items": [ - "chemlib:zinc" - ] + "items": "chemlib:zinc" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:zinc_block_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_zinc", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:zinc" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_ingot_from_blasting_zinc_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_ingot_from_blasting_zinc_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_ingot_from_blasting_zinc_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_ingot_from_blasting_zinc_dust.json index 27ce6130..b8b697f3 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_ingot_from_blasting_zinc_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_ingot_from_blasting_zinc_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:zinc_ingot_from_blasting_zinc_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_zinc": { + "has_chemlib:zinc": { "conditions": { "items": [ { - "items": [ - "chemlib:zinc" - ] + "items": "chemlib:zinc" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:zinc_ingot_from_blasting_zinc_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_zinc", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:zinc" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_ingot_from_smelting_zinc_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_ingot_from_smelting_zinc_dust.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_ingot_from_smelting_zinc_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_ingot_from_smelting_zinc_dust.json index 6442cf9a..8c0c0486 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_ingot_from_smelting_zinc_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_ingot_from_smelting_zinc_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:zinc_ingot_from_smelting_zinc_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_zinc": { + "has_chemlib:zinc": { "conditions": { "items": [ { - "items": [ - "chemlib:zinc" - ] + "items": "chemlib:zinc" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:zinc_ingot_from_smelting_zinc_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_zinc", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:zinc" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_ingot_to_block.json index b85eb099..988ff7a6 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_ingot_to_block.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:zinc_ingot_to_block" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_zinc": { + "has_chemlib:zinc": { "conditions": { "items": [ { - "items": [ - "chemlib:zinc" - ] + "items": "chemlib:zinc" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:zinc_ingot_to_block" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_zinc", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:zinc" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_ingot_to_nugget.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_ingot_to_nugget.json index 6e3388c2..17fd3230 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_ingot_to_nugget.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:zinc_ingot_to_nugget" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_zinc": { + "has_chemlib:zinc": { "conditions": { "items": [ { - "items": [ - "chemlib:zinc" - ] + "items": "chemlib:zinc" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:zinc_ingot_to_nugget" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_zinc", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:zinc" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_nugget_to_ingot.json similarity index 79% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_nugget_to_ingot.json index 7d322bd7..9d0e0793 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/zinc_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/zinc_nugget_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:zinc_nugget_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_zinc": { + "has_chemlib:zinc": { "conditions": { "items": [ { - "items": [ - "chemlib:zinc" - ] + "items": "chemlib:zinc" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:zinc_nugget_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_zinc", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:zinc" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_block_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_block_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_block_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_block_to_ingot.json index 201ceff1..f1fd45d5 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_block_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:zirconium_block_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_zirconium": { + "has_chemlib:zirconium": { "conditions": { "items": [ { - "items": [ - "chemlib:zirconium" - ] + "items": "chemlib:zirconium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:zirconium_block_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_zirconium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:zirconium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_ingot_from_blasting_zirconium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_ingot_from_blasting_zirconium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_ingot_from_blasting_zirconium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_ingot_from_blasting_zirconium_dust.json index 01cbe07d..b0f42518 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_ingot_from_blasting_zirconium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_ingot_from_blasting_zirconium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:zirconium_ingot_from_blasting_zirconium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_zirconium": { + "has_chemlib:zirconium": { "conditions": { "items": [ { - "items": [ - "chemlib:zirconium" - ] + "items": "chemlib:zirconium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:zirconium_ingot_from_blasting_zirconium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_zirconium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:zirconium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_ingot_from_smelting_zirconium_dust.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_ingot_from_smelting_zirconium_dust.json similarity index 78% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_ingot_from_smelting_zirconium_dust.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_ingot_from_smelting_zirconium_dust.json index 8a16dd82..fe17001e 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_ingot_from_smelting_zirconium_dust.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_ingot_from_smelting_zirconium_dust.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:zirconium_ingot_from_smelting_zirconium_dust" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_zirconium": { + "has_chemlib:zirconium": { "conditions": { "items": [ { - "items": [ - "chemlib:zirconium" - ] + "items": "chemlib:zirconium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:zirconium_ingot_from_smelting_zirconium_dust" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_zirconium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:zirconium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_ingot_to_block.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_ingot_to_block.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_ingot_to_block.json index cb244387..0a7b2d60 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_ingot_to_block.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:zirconium_ingot_to_block" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_zirconium": { + "has_chemlib:zirconium": { "conditions": { "items": [ { - "items": [ - "chemlib:zirconium" - ] + "items": "chemlib:zirconium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:zirconium_ingot_to_block" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_zirconium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:zirconium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_ingot_to_nugget.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_ingot_to_nugget.json index fe4ba6b3..f9f0963c 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_ingot_to_nugget.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:zirconium_ingot_to_nugget" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_zirconium": { + "has_chemlib:zirconium": { "conditions": { "items": [ { - "items": [ - "chemlib:zirconium" - ] + "items": "chemlib:zirconium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:zirconium_ingot_to_nugget" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_zirconium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:zirconium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_nugget_to_ingot.json similarity index 77% rename from src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_nugget_to_ingot.json index 35fb3e23..815b8d70 100644 --- a/src/generated/resources/data/chemlib/advancements/recipes/misc/zirconium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/advancement/recipes/misc/zirconium_nugget_to_ingot.json @@ -1,29 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_the_recipe": { - "conditions": { - "recipe": "chemlib:zirconium_nugget_to_ingot" - }, - "trigger": "minecraft:recipe_unlocked" - }, - "has_zirconium": { + "has_chemlib:zirconium": { "conditions": { "items": [ { - "items": [ - "chemlib:zirconium" - ] + "items": "chemlib:zirconium" } ] }, "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "chemlib:zirconium_nugget_to_ingot" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_zirconium", - "has_the_recipe" + "has_the_recipe", + "has_chemlib:zirconium" ] ], "rewards": { diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/actinium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/actinium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/actinium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/actinium_metal_block.json index 0768bcc6..d028d362 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/actinium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/actinium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/actinium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/aluminum_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/aluminum_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/aluminum_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/aluminum_metal_block.json index d954bfea..976a5836 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/aluminum_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/aluminum_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/aluminum_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/argon_lamp_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/argon_lamp_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/argon_lamp_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/argon_lamp_block.json index bf29353c..9111b413 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/argon_lamp_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/argon_lamp_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/argon_lamp_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/barium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/barium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/barium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/barium_metal_block.json index 38625303..27d1b400 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/barium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/barium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/barium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/beryllium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/beryllium_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/beryllium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/beryllium_metal_block.json index 9a433e4c..e6a27036 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/beryllium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/beryllium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/beryllium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/bismuth_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/bismuth_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/bismuth_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/bismuth_metal_block.json index 7c15e65d..b336e482 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/bismuth_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/bismuth_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/bismuth_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/cadmium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/cadmium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/cadmium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/cadmium_metal_block.json index 9ac7b113..e4a5c7ce 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/cadmium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/cadmium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/cadmium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/calcium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/calcium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/calcium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/calcium_metal_block.json index 1c2bf744..5cdc18e9 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/calcium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/calcium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/calcium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/cerium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/cerium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/cerium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/cerium_metal_block.json index 8fb0201c..08626f3e 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/cerium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/cerium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/cerium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/cesium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/cesium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/cesium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/cesium_metal_block.json index daf1ac11..cebb9195 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/cesium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/cesium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/cesium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/chromium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/chromium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/chromium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/chromium_metal_block.json index e4f1325a..894586e5 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/chromium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/chromium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/chromium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/cobalt_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/cobalt_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/cobalt_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/cobalt_metal_block.json index 35b2a33f..28022d80 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/cobalt_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/cobalt_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/cobalt_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/dysprosium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/dysprosium_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/dysprosium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/dysprosium_metal_block.json index d70a8c16..4f20df74 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/dysprosium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/dysprosium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/dysprosium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/erbium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/erbium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/erbium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/erbium_metal_block.json index 3fe09a88..0d4825b6 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/erbium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/erbium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/erbium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/europium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/europium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/europium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/europium_metal_block.json index 401fea78..b3df4a6c 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/europium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/europium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/europium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/francium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/francium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/francium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/francium_metal_block.json index b8795ed8..fde3d784 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/francium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/francium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/francium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/gadolinium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/gadolinium_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/gadolinium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/gadolinium_metal_block.json index 1829a1b5..70bbc69a 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/gadolinium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/gadolinium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/gadolinium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/gallium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/gallium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/gallium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/gallium_metal_block.json index de537048..baeb6a26 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/gallium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/gallium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/gallium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/hafnium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/hafnium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/hafnium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/hafnium_metal_block.json index 45173a36..c95b499e 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/hafnium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/hafnium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/hafnium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/helium_lamp_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/helium_lamp_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/helium_lamp_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/helium_lamp_block.json index 5bbc3076..a4d2cb89 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/helium_lamp_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/helium_lamp_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/helium_lamp_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/holmium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/holmium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/holmium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/holmium_metal_block.json index 77fd4c8b..d5836004 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/holmium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/holmium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/holmium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/indium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/indium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/indium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/indium_metal_block.json index ea6ecbd4..926f241e 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/indium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/indium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/indium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/iridium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/iridium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/iridium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/iridium_metal_block.json index 6be64400..da78a35b 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/iridium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/iridium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/iridium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/krypton_lamp_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/krypton_lamp_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/krypton_lamp_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/krypton_lamp_block.json index 9ea89fed..ca479a63 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/krypton_lamp_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/krypton_lamp_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/krypton_lamp_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/lanthanum_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/lanthanum_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/lanthanum_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/lanthanum_metal_block.json index 9e09ebb0..15e76a1a 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/lanthanum_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/lanthanum_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/lanthanum_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/lead_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/lead_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/lead_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/lead_metal_block.json index 03425971..b3fd9b69 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/lead_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/lead_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/lead_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/lithium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/lithium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/lithium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/lithium_metal_block.json index d74b52b2..5f411911 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/lithium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/lithium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/lithium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/lutetium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/lutetium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/lutetium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/lutetium_metal_block.json index 015a1565..a1db5318 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/lutetium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/lutetium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/lutetium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/magnesium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/magnesium_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/magnesium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/magnesium_metal_block.json index 9cc02bfe..69e41675 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/magnesium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/magnesium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/magnesium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/manganese_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/manganese_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/manganese_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/manganese_metal_block.json index 8f0a22ea..324b6a43 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/manganese_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/manganese_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/manganese_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/molybdenum_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/molybdenum_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/molybdenum_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/molybdenum_metal_block.json index ab50f897..e66fa0d5 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/molybdenum_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/molybdenum_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/molybdenum_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/neodymium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/neodymium_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/neodymium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/neodymium_metal_block.json index fec63f9a..b517ab87 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/neodymium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/neodymium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/neodymium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/neon_lamp_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/neon_lamp_block.json similarity index 85% rename from src/generated/resources/data/chemlib/loot_tables/blocks/neon_lamp_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/neon_lamp_block.json index db13a588..c895f204 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/neon_lamp_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/neon_lamp_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/neon_lamp_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/nickel_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/nickel_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/nickel_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/nickel_metal_block.json index 7110d208..c0626f28 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/nickel_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/nickel_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/nickel_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/niobium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/niobium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/niobium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/niobium_metal_block.json index 22998929..8225d3df 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/niobium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/niobium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/niobium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/osmium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/osmium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/osmium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/osmium_metal_block.json index 4bfebdde..c768fd7b 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/osmium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/osmium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/osmium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/palladium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/palladium_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/palladium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/palladium_metal_block.json index f939bab0..cf7c0605 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/palladium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/palladium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/palladium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/platinum_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/platinum_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/platinum_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/platinum_metal_block.json index b694e5af..203f3ac2 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/platinum_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/platinum_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/platinum_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/polonium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/polonium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/polonium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/polonium_metal_block.json index d2a812f7..f89b7b52 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/polonium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/polonium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/polonium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/potassium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/potassium_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/potassium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/potassium_metal_block.json index cb8c1ae1..f864b6c0 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/potassium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/potassium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/potassium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/praseodymium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/praseodymium_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/praseodymium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/praseodymium_metal_block.json index f601a9b6..5df8f3b6 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/praseodymium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/praseodymium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/praseodymium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/protactinium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/protactinium_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/protactinium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/protactinium_metal_block.json index 0a9c8da6..a78ea570 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/protactinium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/protactinium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/protactinium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/radium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/radium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/radium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/radium_metal_block.json index 3d02c0d2..e47c55d7 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/radium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/radium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/radium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/radon_lamp_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/radon_lamp_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/radon_lamp_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/radon_lamp_block.json index c1e2b7a2..c4cd6923 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/radon_lamp_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/radon_lamp_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/radon_lamp_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/rhenium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/rhenium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/rhenium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/rhenium_metal_block.json index e89b8062..236f9c9d 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/rhenium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/rhenium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/rhenium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/rhodium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/rhodium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/rhodium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/rhodium_metal_block.json index 62cb841a..7ba5f44f 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/rhodium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/rhodium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/rhodium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/rubidium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/rubidium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/rubidium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/rubidium_metal_block.json index f9740150..7243e237 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/rubidium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/rubidium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/rubidium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/ruthenium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/ruthenium_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/ruthenium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/ruthenium_metal_block.json index 5a26513d..5673feb3 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/ruthenium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/ruthenium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/ruthenium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/samarium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/samarium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/samarium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/samarium_metal_block.json index 579eb74a..edadf283 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/samarium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/samarium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/samarium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/scandium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/scandium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/scandium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/scandium_metal_block.json index aedfbfae..ca6bdf18 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/scandium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/scandium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/scandium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/silver_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/silver_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/silver_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/silver_metal_block.json index c49619cc..c57e9ec3 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/silver_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/silver_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/silver_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/sodium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/sodium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/sodium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/sodium_metal_block.json index c174a660..f4ffd291 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/sodium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/sodium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/sodium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/strontium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/strontium_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/strontium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/strontium_metal_block.json index 334542d0..4ddf7d38 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/strontium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/strontium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/strontium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/tantalum_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/tantalum_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/tantalum_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/tantalum_metal_block.json index f5a98d6b..07c59d7b 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/tantalum_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/tantalum_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/tantalum_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/terbium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/terbium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/terbium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/terbium_metal_block.json index db640e75..09100c50 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/terbium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/terbium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/terbium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/thallium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/thallium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/thallium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/thallium_metal_block.json index e64801a3..e2bd4bfb 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/thallium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/thallium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/thallium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/thorium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/thorium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/thorium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/thorium_metal_block.json index 873e1bdf..745fe467 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/thorium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/thorium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/thorium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/thulium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/thulium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/thulium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/thulium_metal_block.json index 1b40cbd4..e6f774cc 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/thulium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/thulium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/thulium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/tin_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/tin_metal_block.json similarity index 85% rename from src/generated/resources/data/chemlib/loot_tables/blocks/tin_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/tin_metal_block.json index 748ee620..e3d3adff 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/tin_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/tin_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/tin_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/titanium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/titanium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/titanium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/titanium_metal_block.json index 1f019b21..7b5f5d6a 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/titanium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/titanium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/titanium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/tungsten_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/tungsten_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/tungsten_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/tungsten_metal_block.json index a98ec461..caa6d38e 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/tungsten_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/tungsten_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/tungsten_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/uranium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/uranium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/uranium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/uranium_metal_block.json index 870adb3b..5cba3b25 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/uranium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/uranium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/uranium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/vanadium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/vanadium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/vanadium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/vanadium_metal_block.json index 6cc23ef3..d4cbd41e 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/vanadium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/vanadium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/vanadium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/xenon_lamp_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/xenon_lamp_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/xenon_lamp_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/xenon_lamp_block.json index be8420ae..e16c7e51 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/xenon_lamp_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/xenon_lamp_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/xenon_lamp_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/ytterbium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/ytterbium_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/ytterbium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/ytterbium_metal_block.json index d505749a..97e669dd 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/ytterbium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/ytterbium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/ytterbium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/yttrium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/yttrium_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/yttrium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/yttrium_metal_block.json index c2b6b1c4..a4680710 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/yttrium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/yttrium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/yttrium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/zinc_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/zinc_metal_block.json similarity index 84% rename from src/generated/resources/data/chemlib/loot_tables/blocks/zinc_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/zinc_metal_block.json index a0ca4293..e8e12e4d 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/zinc_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/zinc_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/zinc_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/loot_tables/blocks/zirconium_metal_block.json b/src/generated/resources/data/chemlib/loot_table/blocks/zirconium_metal_block.json similarity index 83% rename from src/generated/resources/data/chemlib/loot_tables/blocks/zirconium_metal_block.json rename to src/generated/resources/data/chemlib/loot_table/blocks/zirconium_metal_block.json index 1a51a4b2..736d157d 100644 --- a/src/generated/resources/data/chemlib/loot_tables/blocks/zirconium_metal_block.json +++ b/src/generated/resources/data/chemlib/loot_table/blocks/zirconium_metal_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "chemlib:blocks/zirconium_metal_block" } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/actinium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/actinium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/actinium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/actinium_block_to_ingot.json index 4e053bc9..b5749459 100644 --- a/src/generated/resources/data/chemlib/recipes/actinium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/actinium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:actinium_ingot" + "id": "chemlib:actinium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/actinium_ingot_from_blasting_actinium_dust.json b/src/generated/resources/data/chemlib/recipe/actinium_ingot_from_blasting_actinium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/actinium_ingot_from_blasting_actinium_dust.json rename to src/generated/resources/data/chemlib/recipe/actinium_ingot_from_blasting_actinium_dust.json index e33e3a95..a9d00f93 100644 --- a/src/generated/resources/data/chemlib/recipes/actinium_ingot_from_blasting_actinium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/actinium_ingot_from_blasting_actinium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:actinium_dust" }, - "result": "chemlib:actinium_ingot" + "result": { + "count": 1, + "id": "chemlib:actinium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/actinium_ingot_from_smelting_actinium_dust.json b/src/generated/resources/data/chemlib/recipe/actinium_ingot_from_smelting_actinium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/actinium_ingot_from_smelting_actinium_dust.json rename to src/generated/resources/data/chemlib/recipe/actinium_ingot_from_smelting_actinium_dust.json index bdb7841c..1871630e 100644 --- a/src/generated/resources/data/chemlib/recipes/actinium_ingot_from_smelting_actinium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/actinium_ingot_from_smelting_actinium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:actinium_dust" }, - "result": "chemlib:actinium_ingot" + "result": { + "count": 1, + "id": "chemlib:actinium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/actinium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/actinium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/actinium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/actinium_ingot_to_block.json index d99217e4..16d4a208 100644 --- a/src/generated/resources/data/chemlib/recipes/actinium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/actinium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:actinium_metal_block" + "count": 1, + "id": "chemlib:actinium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/actinium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/actinium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/actinium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/actinium_ingot_to_nugget.json index 1ccfbbcc..1d6c052b 100644 --- a/src/generated/resources/data/chemlib/recipes/actinium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/actinium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:actinium_nugget" + "id": "chemlib:actinium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/actinium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/actinium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/actinium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/actinium_nugget_to_ingot.json index 90981917..20cf1a7a 100644 --- a/src/generated/resources/data/chemlib/recipes/actinium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/actinium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:actinium_ingot" + "count": 1, + "id": "chemlib:actinium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/aluminum_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/aluminum_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/aluminum_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/aluminum_block_to_ingot.json index ca1eb6bb..89096c1e 100644 --- a/src/generated/resources/data/chemlib/recipes/aluminum_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/aluminum_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:aluminum_ingot" + "id": "chemlib:aluminum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/aluminum_ingot_from_blasting_aluminum_dust.json b/src/generated/resources/data/chemlib/recipe/aluminum_ingot_from_blasting_aluminum_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/aluminum_ingot_from_blasting_aluminum_dust.json rename to src/generated/resources/data/chemlib/recipe/aluminum_ingot_from_blasting_aluminum_dust.json index c326f2f9..3574e5a9 100644 --- a/src/generated/resources/data/chemlib/recipes/aluminum_ingot_from_blasting_aluminum_dust.json +++ b/src/generated/resources/data/chemlib/recipe/aluminum_ingot_from_blasting_aluminum_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:aluminum_dust" }, - "result": "chemlib:aluminum_ingot" + "result": { + "count": 1, + "id": "chemlib:aluminum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/aluminum_ingot_from_smelting_aluminum_dust.json b/src/generated/resources/data/chemlib/recipe/aluminum_ingot_from_smelting_aluminum_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/aluminum_ingot_from_smelting_aluminum_dust.json rename to src/generated/resources/data/chemlib/recipe/aluminum_ingot_from_smelting_aluminum_dust.json index 2a97c532..e22223f9 100644 --- a/src/generated/resources/data/chemlib/recipes/aluminum_ingot_from_smelting_aluminum_dust.json +++ b/src/generated/resources/data/chemlib/recipe/aluminum_ingot_from_smelting_aluminum_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:aluminum_dust" }, - "result": "chemlib:aluminum_ingot" + "result": { + "count": 1, + "id": "chemlib:aluminum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/aluminum_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/aluminum_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/aluminum_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/aluminum_ingot_to_block.json index 9ca814c4..74bea43f 100644 --- a/src/generated/resources/data/chemlib/recipes/aluminum_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/aluminum_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:aluminum_metal_block" + "count": 1, + "id": "chemlib:aluminum_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/aluminum_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/aluminum_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/aluminum_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/aluminum_ingot_to_nugget.json index 17b4375d..9460fe06 100644 --- a/src/generated/resources/data/chemlib/recipes/aluminum_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/aluminum_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:aluminum_nugget" + "id": "chemlib:aluminum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/aluminum_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/aluminum_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/aluminum_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/aluminum_nugget_to_ingot.json index 7280fd64..00150c77 100644 --- a/src/generated/resources/data/chemlib/recipes/aluminum_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/aluminum_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:aluminum_ingot" + "count": 1, + "id": "chemlib:aluminum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/argon_lamp_block.json b/src/generated/resources/data/chemlib/recipe/argon_lamp_block.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/argon_lamp_block.json rename to src/generated/resources/data/chemlib/recipe/argon_lamp_block.json index 42d532f7..5b3bf2ac 100644 --- a/src/generated/resources/data/chemlib/recipes/argon_lamp_block.json +++ b/src/generated/resources/data/chemlib/recipe/argon_lamp_block.json @@ -6,7 +6,7 @@ "item": "chemlib:argon" }, "G": { - "tag": "forge:glass" + "tag": "c:glass_blocks/cheap" } }, "pattern": [ @@ -15,6 +15,7 @@ "GEG" ], "result": { - "item": "chemlib:argon_lamp_block" + "count": 1, + "id": "chemlib:argon_lamp_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/barium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/barium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/barium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/barium_block_to_ingot.json index f7663882..b26cfe11 100644 --- a/src/generated/resources/data/chemlib/recipes/barium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/barium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:barium_ingot" + "id": "chemlib:barium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/barium_ingot_from_blasting_barium_dust.json b/src/generated/resources/data/chemlib/recipe/barium_ingot_from_blasting_barium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/barium_ingot_from_blasting_barium_dust.json rename to src/generated/resources/data/chemlib/recipe/barium_ingot_from_blasting_barium_dust.json index 8a05ab25..e8ed9303 100644 --- a/src/generated/resources/data/chemlib/recipes/barium_ingot_from_blasting_barium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/barium_ingot_from_blasting_barium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:barium_dust" }, - "result": "chemlib:barium_ingot" + "result": { + "count": 1, + "id": "chemlib:barium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/barium_ingot_from_smelting_barium_dust.json b/src/generated/resources/data/chemlib/recipe/barium_ingot_from_smelting_barium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/barium_ingot_from_smelting_barium_dust.json rename to src/generated/resources/data/chemlib/recipe/barium_ingot_from_smelting_barium_dust.json index ff0574b5..cf0e1e4c 100644 --- a/src/generated/resources/data/chemlib/recipes/barium_ingot_from_smelting_barium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/barium_ingot_from_smelting_barium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:barium_dust" }, - "result": "chemlib:barium_ingot" + "result": { + "count": 1, + "id": "chemlib:barium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/barium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/barium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/barium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/barium_ingot_to_block.json index e69d5976..5efe36d5 100644 --- a/src/generated/resources/data/chemlib/recipes/barium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/barium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:barium_metal_block" + "count": 1, + "id": "chemlib:barium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/barium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/barium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/barium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/barium_ingot_to_nugget.json index 1188a2bd..5ce5cf99 100644 --- a/src/generated/resources/data/chemlib/recipes/barium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/barium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:barium_nugget" + "id": "chemlib:barium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/barium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/barium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/barium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/barium_nugget_to_ingot.json index bb3bf1c4..3a95e39e 100644 --- a/src/generated/resources/data/chemlib/recipes/barium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/barium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:barium_ingot" + "count": 1, + "id": "chemlib:barium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/beryllium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/beryllium_block_to_ingot.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/beryllium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/beryllium_block_to_ingot.json index eea69f7d..8dc1f685 100644 --- a/src/generated/resources/data/chemlib/recipes/beryllium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/beryllium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:beryllium_ingot" + "id": "chemlib:beryllium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/beryllium_ingot_from_blasting_beryllium_dust.json b/src/generated/resources/data/chemlib/recipe/beryllium_ingot_from_blasting_beryllium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/beryllium_ingot_from_blasting_beryllium_dust.json rename to src/generated/resources/data/chemlib/recipe/beryllium_ingot_from_blasting_beryllium_dust.json index 77e27016..3ae6d234 100644 --- a/src/generated/resources/data/chemlib/recipes/beryllium_ingot_from_blasting_beryllium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/beryllium_ingot_from_blasting_beryllium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:beryllium_dust" }, - "result": "chemlib:beryllium_ingot" + "result": { + "count": 1, + "id": "chemlib:beryllium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/beryllium_ingot_from_smelting_beryllium_dust.json b/src/generated/resources/data/chemlib/recipe/beryllium_ingot_from_smelting_beryllium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/beryllium_ingot_from_smelting_beryllium_dust.json rename to src/generated/resources/data/chemlib/recipe/beryllium_ingot_from_smelting_beryllium_dust.json index 70924c25..4b4c25d1 100644 --- a/src/generated/resources/data/chemlib/recipes/beryllium_ingot_from_smelting_beryllium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/beryllium_ingot_from_smelting_beryllium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:beryllium_dust" }, - "result": "chemlib:beryllium_ingot" + "result": { + "count": 1, + "id": "chemlib:beryllium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/beryllium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/beryllium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/beryllium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/beryllium_ingot_to_block.json index 4c31d6de..093a4033 100644 --- a/src/generated/resources/data/chemlib/recipes/beryllium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/beryllium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:beryllium_metal_block" + "count": 1, + "id": "chemlib:beryllium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/beryllium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/beryllium_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/beryllium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/beryllium_ingot_to_nugget.json index 2b71a5d1..2da39d87 100644 --- a/src/generated/resources/data/chemlib/recipes/beryllium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/beryllium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:beryllium_nugget" + "id": "chemlib:beryllium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/beryllium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/beryllium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/beryllium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/beryllium_nugget_to_ingot.json index 9dd63e57..aaa036ca 100644 --- a/src/generated/resources/data/chemlib/recipes/beryllium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/beryllium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:beryllium_ingot" + "count": 1, + "id": "chemlib:beryllium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/bismuth_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/bismuth_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/bismuth_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/bismuth_block_to_ingot.json index eeb4af11..13d7f5eb 100644 --- a/src/generated/resources/data/chemlib/recipes/bismuth_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/bismuth_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:bismuth_ingot" + "id": "chemlib:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/bismuth_ingot_from_blasting_bismuth_dust.json b/src/generated/resources/data/chemlib/recipe/bismuth_ingot_from_blasting_bismuth_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/bismuth_ingot_from_blasting_bismuth_dust.json rename to src/generated/resources/data/chemlib/recipe/bismuth_ingot_from_blasting_bismuth_dust.json index 4fccdc52..71bbcb36 100644 --- a/src/generated/resources/data/chemlib/recipes/bismuth_ingot_from_blasting_bismuth_dust.json +++ b/src/generated/resources/data/chemlib/recipe/bismuth_ingot_from_blasting_bismuth_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:bismuth_dust" }, - "result": "chemlib:bismuth_ingot" + "result": { + "count": 1, + "id": "chemlib:bismuth_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/bismuth_ingot_from_smelting_bismuth_dust.json b/src/generated/resources/data/chemlib/recipe/bismuth_ingot_from_smelting_bismuth_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/bismuth_ingot_from_smelting_bismuth_dust.json rename to src/generated/resources/data/chemlib/recipe/bismuth_ingot_from_smelting_bismuth_dust.json index 585824da..a2c9eb16 100644 --- a/src/generated/resources/data/chemlib/recipes/bismuth_ingot_from_smelting_bismuth_dust.json +++ b/src/generated/resources/data/chemlib/recipe/bismuth_ingot_from_smelting_bismuth_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:bismuth_dust" }, - "result": "chemlib:bismuth_ingot" + "result": { + "count": 1, + "id": "chemlib:bismuth_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/bismuth_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/bismuth_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/bismuth_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/bismuth_ingot_to_block.json index 2a3cc6d1..48437ff6 100644 --- a/src/generated/resources/data/chemlib/recipes/bismuth_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/bismuth_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:bismuth_metal_block" + "count": 1, + "id": "chemlib:bismuth_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/bismuth_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/bismuth_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/bismuth_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/bismuth_ingot_to_nugget.json index a08ff2f4..79c379cd 100644 --- a/src/generated/resources/data/chemlib/recipes/bismuth_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/bismuth_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:bismuth_nugget" + "id": "chemlib:bismuth_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/bismuth_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/bismuth_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/bismuth_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/bismuth_nugget_to_ingot.json index a2431aed..5ed5152a 100644 --- a/src/generated/resources/data/chemlib/recipes/bismuth_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/bismuth_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:bismuth_ingot" + "count": 1, + "id": "chemlib:bismuth_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cadmium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/cadmium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/cadmium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/cadmium_block_to_ingot.json index 74397180..6e4e8c20 100644 --- a/src/generated/resources/data/chemlib/recipes/cadmium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/cadmium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:cadmium_ingot" + "id": "chemlib:cadmium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cadmium_ingot_from_blasting_cadmium_dust.json b/src/generated/resources/data/chemlib/recipe/cadmium_ingot_from_blasting_cadmium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/cadmium_ingot_from_blasting_cadmium_dust.json rename to src/generated/resources/data/chemlib/recipe/cadmium_ingot_from_blasting_cadmium_dust.json index abe3cb05..a268246a 100644 --- a/src/generated/resources/data/chemlib/recipes/cadmium_ingot_from_blasting_cadmium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/cadmium_ingot_from_blasting_cadmium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:cadmium_dust" }, - "result": "chemlib:cadmium_ingot" + "result": { + "count": 1, + "id": "chemlib:cadmium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cadmium_ingot_from_smelting_cadmium_dust.json b/src/generated/resources/data/chemlib/recipe/cadmium_ingot_from_smelting_cadmium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/cadmium_ingot_from_smelting_cadmium_dust.json rename to src/generated/resources/data/chemlib/recipe/cadmium_ingot_from_smelting_cadmium_dust.json index 20d777ee..65f62ea4 100644 --- a/src/generated/resources/data/chemlib/recipes/cadmium_ingot_from_smelting_cadmium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/cadmium_ingot_from_smelting_cadmium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:cadmium_dust" }, - "result": "chemlib:cadmium_ingot" + "result": { + "count": 1, + "id": "chemlib:cadmium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cadmium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/cadmium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/cadmium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/cadmium_ingot_to_block.json index b1a2219e..f0d42148 100644 --- a/src/generated/resources/data/chemlib/recipes/cadmium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/cadmium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:cadmium_metal_block" + "count": 1, + "id": "chemlib:cadmium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cadmium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/cadmium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/cadmium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/cadmium_ingot_to_nugget.json index c37ccb68..eb1a6a76 100644 --- a/src/generated/resources/data/chemlib/recipes/cadmium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/cadmium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:cadmium_nugget" + "id": "chemlib:cadmium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cadmium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/cadmium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/cadmium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/cadmium_nugget_to_ingot.json index e5c44b30..1710c42f 100644 --- a/src/generated/resources/data/chemlib/recipes/cadmium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/cadmium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:cadmium_ingot" + "count": 1, + "id": "chemlib:cadmium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/calcium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/calcium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/calcium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/calcium_block_to_ingot.json index 1c79be83..6910be8e 100644 --- a/src/generated/resources/data/chemlib/recipes/calcium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/calcium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:calcium_ingot" + "id": "chemlib:calcium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/calcium_ingot_from_blasting_calcium_dust.json b/src/generated/resources/data/chemlib/recipe/calcium_ingot_from_blasting_calcium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/calcium_ingot_from_blasting_calcium_dust.json rename to src/generated/resources/data/chemlib/recipe/calcium_ingot_from_blasting_calcium_dust.json index 5c838bb8..0b8cbb32 100644 --- a/src/generated/resources/data/chemlib/recipes/calcium_ingot_from_blasting_calcium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/calcium_ingot_from_blasting_calcium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:calcium_dust" }, - "result": "chemlib:calcium_ingot" + "result": { + "count": 1, + "id": "chemlib:calcium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/calcium_ingot_from_smelting_calcium_dust.json b/src/generated/resources/data/chemlib/recipe/calcium_ingot_from_smelting_calcium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/calcium_ingot_from_smelting_calcium_dust.json rename to src/generated/resources/data/chemlib/recipe/calcium_ingot_from_smelting_calcium_dust.json index 1532f254..4ccbf4e9 100644 --- a/src/generated/resources/data/chemlib/recipes/calcium_ingot_from_smelting_calcium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/calcium_ingot_from_smelting_calcium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:calcium_dust" }, - "result": "chemlib:calcium_ingot" + "result": { + "count": 1, + "id": "chemlib:calcium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/calcium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/calcium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/calcium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/calcium_ingot_to_block.json index 59ea0776..2bd302c1 100644 --- a/src/generated/resources/data/chemlib/recipes/calcium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/calcium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:calcium_metal_block" + "count": 1, + "id": "chemlib:calcium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/calcium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/calcium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/calcium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/calcium_ingot_to_nugget.json index 8f9b71fb..9eadcd1f 100644 --- a/src/generated/resources/data/chemlib/recipes/calcium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/calcium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:calcium_nugget" + "id": "chemlib:calcium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/calcium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/calcium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/calcium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/calcium_nugget_to_ingot.json index b9f9aded..baa3f2a0 100644 --- a/src/generated/resources/data/chemlib/recipes/calcium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/calcium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:calcium_ingot" + "count": 1, + "id": "chemlib:calcium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cerium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/cerium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/cerium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/cerium_block_to_ingot.json index fa024098..0bdb49b8 100644 --- a/src/generated/resources/data/chemlib/recipes/cerium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/cerium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:cerium_ingot" + "id": "chemlib:cerium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cerium_ingot_from_blasting_cerium_dust.json b/src/generated/resources/data/chemlib/recipe/cerium_ingot_from_blasting_cerium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/cerium_ingot_from_blasting_cerium_dust.json rename to src/generated/resources/data/chemlib/recipe/cerium_ingot_from_blasting_cerium_dust.json index ed223ce1..4f5fbcb7 100644 --- a/src/generated/resources/data/chemlib/recipes/cerium_ingot_from_blasting_cerium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/cerium_ingot_from_blasting_cerium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:cerium_dust" }, - "result": "chemlib:cerium_ingot" + "result": { + "count": 1, + "id": "chemlib:cerium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cerium_ingot_from_smelting_cerium_dust.json b/src/generated/resources/data/chemlib/recipe/cerium_ingot_from_smelting_cerium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/cerium_ingot_from_smelting_cerium_dust.json rename to src/generated/resources/data/chemlib/recipe/cerium_ingot_from_smelting_cerium_dust.json index 1c030cd5..e83d6a67 100644 --- a/src/generated/resources/data/chemlib/recipes/cerium_ingot_from_smelting_cerium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/cerium_ingot_from_smelting_cerium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:cerium_dust" }, - "result": "chemlib:cerium_ingot" + "result": { + "count": 1, + "id": "chemlib:cerium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cerium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/cerium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/cerium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/cerium_ingot_to_block.json index c3c94c60..9ce9ca4a 100644 --- a/src/generated/resources/data/chemlib/recipes/cerium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/cerium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:cerium_metal_block" + "count": 1, + "id": "chemlib:cerium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cerium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/cerium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/cerium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/cerium_ingot_to_nugget.json index 20a91797..af600516 100644 --- a/src/generated/resources/data/chemlib/recipes/cerium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/cerium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:cerium_nugget" + "id": "chemlib:cerium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cerium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/cerium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/cerium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/cerium_nugget_to_ingot.json index 5d24709d..f8543b45 100644 --- a/src/generated/resources/data/chemlib/recipes/cerium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/cerium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:cerium_ingot" + "count": 1, + "id": "chemlib:cerium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cesium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/cesium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/cesium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/cesium_block_to_ingot.json index 1e70ecc2..4d1fc6ce 100644 --- a/src/generated/resources/data/chemlib/recipes/cesium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/cesium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:cesium_ingot" + "id": "chemlib:cesium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cesium_ingot_from_blasting_cesium_dust.json b/src/generated/resources/data/chemlib/recipe/cesium_ingot_from_blasting_cesium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/cesium_ingot_from_blasting_cesium_dust.json rename to src/generated/resources/data/chemlib/recipe/cesium_ingot_from_blasting_cesium_dust.json index 9541ae25..4582239f 100644 --- a/src/generated/resources/data/chemlib/recipes/cesium_ingot_from_blasting_cesium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/cesium_ingot_from_blasting_cesium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:cesium_dust" }, - "result": "chemlib:cesium_ingot" + "result": { + "count": 1, + "id": "chemlib:cesium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cesium_ingot_from_smelting_cesium_dust.json b/src/generated/resources/data/chemlib/recipe/cesium_ingot_from_smelting_cesium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/cesium_ingot_from_smelting_cesium_dust.json rename to src/generated/resources/data/chemlib/recipe/cesium_ingot_from_smelting_cesium_dust.json index 1af0d767..70d46e46 100644 --- a/src/generated/resources/data/chemlib/recipes/cesium_ingot_from_smelting_cesium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/cesium_ingot_from_smelting_cesium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:cesium_dust" }, - "result": "chemlib:cesium_ingot" + "result": { + "count": 1, + "id": "chemlib:cesium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cesium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/cesium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/cesium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/cesium_ingot_to_block.json index 8ec9e3f2..cd4176a2 100644 --- a/src/generated/resources/data/chemlib/recipes/cesium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/cesium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:cesium_metal_block" + "count": 1, + "id": "chemlib:cesium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cesium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/cesium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/cesium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/cesium_ingot_to_nugget.json index b6db6057..74884334 100644 --- a/src/generated/resources/data/chemlib/recipes/cesium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/cesium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:cesium_nugget" + "id": "chemlib:cesium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cesium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/cesium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/cesium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/cesium_nugget_to_ingot.json index b6bb1842..6e50bf79 100644 --- a/src/generated/resources/data/chemlib/recipes/cesium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/cesium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:cesium_ingot" + "count": 1, + "id": "chemlib:cesium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/chromium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/chromium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/chromium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/chromium_block_to_ingot.json index 5173dcb3..6a72f1b6 100644 --- a/src/generated/resources/data/chemlib/recipes/chromium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/chromium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:chromium_ingot" + "id": "chemlib:chromium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/chromium_ingot_from_blasting_chromium_dust.json b/src/generated/resources/data/chemlib/recipe/chromium_ingot_from_blasting_chromium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/chromium_ingot_from_blasting_chromium_dust.json rename to src/generated/resources/data/chemlib/recipe/chromium_ingot_from_blasting_chromium_dust.json index 9b692cc2..f5c23b7e 100644 --- a/src/generated/resources/data/chemlib/recipes/chromium_ingot_from_blasting_chromium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/chromium_ingot_from_blasting_chromium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:chromium_dust" }, - "result": "chemlib:chromium_ingot" + "result": { + "count": 1, + "id": "chemlib:chromium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/chromium_ingot_from_smelting_chromium_dust.json b/src/generated/resources/data/chemlib/recipe/chromium_ingot_from_smelting_chromium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/chromium_ingot_from_smelting_chromium_dust.json rename to src/generated/resources/data/chemlib/recipe/chromium_ingot_from_smelting_chromium_dust.json index fc35d430..b7534735 100644 --- a/src/generated/resources/data/chemlib/recipes/chromium_ingot_from_smelting_chromium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/chromium_ingot_from_smelting_chromium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:chromium_dust" }, - "result": "chemlib:chromium_ingot" + "result": { + "count": 1, + "id": "chemlib:chromium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/chromium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/chromium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/chromium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/chromium_ingot_to_block.json index 06571095..0aa5ddce 100644 --- a/src/generated/resources/data/chemlib/recipes/chromium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/chromium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:chromium_metal_block" + "count": 1, + "id": "chemlib:chromium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/chromium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/chromium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/chromium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/chromium_ingot_to_nugget.json index 3463e898..a1fb2629 100644 --- a/src/generated/resources/data/chemlib/recipes/chromium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/chromium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:chromium_nugget" + "id": "chemlib:chromium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/chromium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/chromium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/chromium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/chromium_nugget_to_ingot.json index 599f25a8..0402210c 100644 --- a/src/generated/resources/data/chemlib/recipes/chromium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/chromium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:chromium_ingot" + "count": 1, + "id": "chemlib:chromium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cobalt_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/cobalt_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/cobalt_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/cobalt_block_to_ingot.json index f108352f..30dbcb03 100644 --- a/src/generated/resources/data/chemlib/recipes/cobalt_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/cobalt_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:cobalt_ingot" + "id": "chemlib:cobalt_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cobalt_ingot_from_blasting_cobalt_dust.json b/src/generated/resources/data/chemlib/recipe/cobalt_ingot_from_blasting_cobalt_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/cobalt_ingot_from_blasting_cobalt_dust.json rename to src/generated/resources/data/chemlib/recipe/cobalt_ingot_from_blasting_cobalt_dust.json index f0629024..922632a3 100644 --- a/src/generated/resources/data/chemlib/recipes/cobalt_ingot_from_blasting_cobalt_dust.json +++ b/src/generated/resources/data/chemlib/recipe/cobalt_ingot_from_blasting_cobalt_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:cobalt_dust" }, - "result": "chemlib:cobalt_ingot" + "result": { + "count": 1, + "id": "chemlib:cobalt_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cobalt_ingot_from_smelting_cobalt_dust.json b/src/generated/resources/data/chemlib/recipe/cobalt_ingot_from_smelting_cobalt_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/cobalt_ingot_from_smelting_cobalt_dust.json rename to src/generated/resources/data/chemlib/recipe/cobalt_ingot_from_smelting_cobalt_dust.json index 7aafd9cd..f9d6d09d 100644 --- a/src/generated/resources/data/chemlib/recipes/cobalt_ingot_from_smelting_cobalt_dust.json +++ b/src/generated/resources/data/chemlib/recipe/cobalt_ingot_from_smelting_cobalt_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:cobalt_dust" }, - "result": "chemlib:cobalt_ingot" + "result": { + "count": 1, + "id": "chemlib:cobalt_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cobalt_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/cobalt_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/cobalt_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/cobalt_ingot_to_block.json index c7bddd99..3dd0c4ea 100644 --- a/src/generated/resources/data/chemlib/recipes/cobalt_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/cobalt_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:cobalt_metal_block" + "count": 1, + "id": "chemlib:cobalt_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cobalt_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/cobalt_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/cobalt_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/cobalt_ingot_to_nugget.json index 1c3a1fb9..8bd0122a 100644 --- a/src/generated/resources/data/chemlib/recipes/cobalt_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/cobalt_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:cobalt_nugget" + "id": "chemlib:cobalt_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/cobalt_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/cobalt_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/cobalt_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/cobalt_nugget_to_ingot.json index 382e6ecf..5dffef81 100644 --- a/src/generated/resources/data/chemlib/recipes/cobalt_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/cobalt_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:cobalt_ingot" + "count": 1, + "id": "chemlib:cobalt_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/copper_ingot_from_blasting_copper_dust.json b/src/generated/resources/data/chemlib/recipe/copper_ingot_from_blasting_copper_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/copper_ingot_from_blasting_copper_dust.json rename to src/generated/resources/data/chemlib/recipe/copper_ingot_from_blasting_copper_dust.json index c5c4e2e3..aec1f354 100644 --- a/src/generated/resources/data/chemlib/recipes/copper_ingot_from_blasting_copper_dust.json +++ b/src/generated/resources/data/chemlib/recipe/copper_ingot_from_blasting_copper_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:copper_dust" }, - "result": "minecraft:copper_ingot" + "result": { + "count": 1, + "id": "minecraft:copper_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/copper_ingot_from_smelting_copper_dust.json b/src/generated/resources/data/chemlib/recipe/copper_ingot_from_smelting_copper_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/copper_ingot_from_smelting_copper_dust.json rename to src/generated/resources/data/chemlib/recipe/copper_ingot_from_smelting_copper_dust.json index 296aa3d4..cec33a23 100644 --- a/src/generated/resources/data/chemlib/recipes/copper_ingot_from_smelting_copper_dust.json +++ b/src/generated/resources/data/chemlib/recipe/copper_ingot_from_smelting_copper_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:copper_dust" }, - "result": "minecraft:copper_ingot" + "result": { + "count": 1, + "id": "minecraft:copper_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/dysprosium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/dysprosium_block_to_ingot.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/dysprosium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/dysprosium_block_to_ingot.json index c724ae25..b1cec521 100644 --- a/src/generated/resources/data/chemlib/recipes/dysprosium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/dysprosium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:dysprosium_ingot" + "id": "chemlib:dysprosium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/dysprosium_ingot_from_blasting_dysprosium_dust.json b/src/generated/resources/data/chemlib/recipe/dysprosium_ingot_from_blasting_dysprosium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/dysprosium_ingot_from_blasting_dysprosium_dust.json rename to src/generated/resources/data/chemlib/recipe/dysprosium_ingot_from_blasting_dysprosium_dust.json index c2f1e749..ebf1d6d2 100644 --- a/src/generated/resources/data/chemlib/recipes/dysprosium_ingot_from_blasting_dysprosium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/dysprosium_ingot_from_blasting_dysprosium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:dysprosium_dust" }, - "result": "chemlib:dysprosium_ingot" + "result": { + "count": 1, + "id": "chemlib:dysprosium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/dysprosium_ingot_from_smelting_dysprosium_dust.json b/src/generated/resources/data/chemlib/recipe/dysprosium_ingot_from_smelting_dysprosium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/dysprosium_ingot_from_smelting_dysprosium_dust.json rename to src/generated/resources/data/chemlib/recipe/dysprosium_ingot_from_smelting_dysprosium_dust.json index e8ff89d8..cde49243 100644 --- a/src/generated/resources/data/chemlib/recipes/dysprosium_ingot_from_smelting_dysprosium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/dysprosium_ingot_from_smelting_dysprosium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:dysprosium_dust" }, - "result": "chemlib:dysprosium_ingot" + "result": { + "count": 1, + "id": "chemlib:dysprosium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/dysprosium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/dysprosium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/recipes/dysprosium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/dysprosium_ingot_to_block.json index e0aaa1df..abdd8026 100644 --- a/src/generated/resources/data/chemlib/recipes/dysprosium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/dysprosium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:dysprosium_metal_block" + "count": 1, + "id": "chemlib:dysprosium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/dysprosium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/dysprosium_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/dysprosium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/dysprosium_ingot_to_nugget.json index e3e8e705..3ff41a9d 100644 --- a/src/generated/resources/data/chemlib/recipes/dysprosium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/dysprosium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:dysprosium_nugget" + "id": "chemlib:dysprosium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/dysprosium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/dysprosium_nugget_to_ingot.json similarity index 79% rename from src/generated/resources/data/chemlib/recipes/dysprosium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/dysprosium_nugget_to_ingot.json index cdef91ca..ea2816a3 100644 --- a/src/generated/resources/data/chemlib/recipes/dysprosium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/dysprosium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:dysprosium_ingot" + "count": 1, + "id": "chemlib:dysprosium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/erbium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/erbium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/erbium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/erbium_block_to_ingot.json index d210d3f0..96205e1e 100644 --- a/src/generated/resources/data/chemlib/recipes/erbium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/erbium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:erbium_ingot" + "id": "chemlib:erbium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/erbium_ingot_from_blasting_erbium_dust.json b/src/generated/resources/data/chemlib/recipe/erbium_ingot_from_blasting_erbium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/erbium_ingot_from_blasting_erbium_dust.json rename to src/generated/resources/data/chemlib/recipe/erbium_ingot_from_blasting_erbium_dust.json index b9086962..0abf8d1a 100644 --- a/src/generated/resources/data/chemlib/recipes/erbium_ingot_from_blasting_erbium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/erbium_ingot_from_blasting_erbium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:erbium_dust" }, - "result": "chemlib:erbium_ingot" + "result": { + "count": 1, + "id": "chemlib:erbium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/erbium_ingot_from_smelting_erbium_dust.json b/src/generated/resources/data/chemlib/recipe/erbium_ingot_from_smelting_erbium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/erbium_ingot_from_smelting_erbium_dust.json rename to src/generated/resources/data/chemlib/recipe/erbium_ingot_from_smelting_erbium_dust.json index ca0b1fdd..19c8d1af 100644 --- a/src/generated/resources/data/chemlib/recipes/erbium_ingot_from_smelting_erbium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/erbium_ingot_from_smelting_erbium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:erbium_dust" }, - "result": "chemlib:erbium_ingot" + "result": { + "count": 1, + "id": "chemlib:erbium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/erbium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/erbium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/erbium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/erbium_ingot_to_block.json index 40e00503..7c2fceb5 100644 --- a/src/generated/resources/data/chemlib/recipes/erbium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/erbium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:erbium_metal_block" + "count": 1, + "id": "chemlib:erbium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/erbium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/erbium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/erbium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/erbium_ingot_to_nugget.json index df244e25..f064a750 100644 --- a/src/generated/resources/data/chemlib/recipes/erbium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/erbium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:erbium_nugget" + "id": "chemlib:erbium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/erbium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/erbium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/erbium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/erbium_nugget_to_ingot.json index b968dd0a..c39bba19 100644 --- a/src/generated/resources/data/chemlib/recipes/erbium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/erbium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:erbium_ingot" + "count": 1, + "id": "chemlib:erbium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/europium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/europium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/europium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/europium_block_to_ingot.json index 2688f242..7cb08360 100644 --- a/src/generated/resources/data/chemlib/recipes/europium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/europium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:europium_ingot" + "id": "chemlib:europium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/europium_ingot_from_blasting_europium_dust.json b/src/generated/resources/data/chemlib/recipe/europium_ingot_from_blasting_europium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/europium_ingot_from_blasting_europium_dust.json rename to src/generated/resources/data/chemlib/recipe/europium_ingot_from_blasting_europium_dust.json index d0e0bd8f..8ccf624c 100644 --- a/src/generated/resources/data/chemlib/recipes/europium_ingot_from_blasting_europium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/europium_ingot_from_blasting_europium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:europium_dust" }, - "result": "chemlib:europium_ingot" + "result": { + "count": 1, + "id": "chemlib:europium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/europium_ingot_from_smelting_europium_dust.json b/src/generated/resources/data/chemlib/recipe/europium_ingot_from_smelting_europium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/europium_ingot_from_smelting_europium_dust.json rename to src/generated/resources/data/chemlib/recipe/europium_ingot_from_smelting_europium_dust.json index ef21172b..7dbe7268 100644 --- a/src/generated/resources/data/chemlib/recipes/europium_ingot_from_smelting_europium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/europium_ingot_from_smelting_europium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:europium_dust" }, - "result": "chemlib:europium_ingot" + "result": { + "count": 1, + "id": "chemlib:europium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/europium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/europium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/europium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/europium_ingot_to_block.json index 421b7da7..81966298 100644 --- a/src/generated/resources/data/chemlib/recipes/europium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/europium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:europium_metal_block" + "count": 1, + "id": "chemlib:europium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/europium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/europium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/europium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/europium_ingot_to_nugget.json index 7542b9c7..ab593c6e 100644 --- a/src/generated/resources/data/chemlib/recipes/europium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/europium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:europium_nugget" + "id": "chemlib:europium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/europium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/europium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/europium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/europium_nugget_to_ingot.json index 41184548..f27aca1f 100644 --- a/src/generated/resources/data/chemlib/recipes/europium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/europium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:europium_ingot" + "count": 1, + "id": "chemlib:europium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/francium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/francium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/francium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/francium_block_to_ingot.json index 4f321f27..487d849f 100644 --- a/src/generated/resources/data/chemlib/recipes/francium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/francium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:francium_ingot" + "id": "chemlib:francium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/francium_ingot_from_blasting_francium_dust.json b/src/generated/resources/data/chemlib/recipe/francium_ingot_from_blasting_francium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/francium_ingot_from_blasting_francium_dust.json rename to src/generated/resources/data/chemlib/recipe/francium_ingot_from_blasting_francium_dust.json index a2817765..3ca6face 100644 --- a/src/generated/resources/data/chemlib/recipes/francium_ingot_from_blasting_francium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/francium_ingot_from_blasting_francium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:francium_dust" }, - "result": "chemlib:francium_ingot" + "result": { + "count": 1, + "id": "chemlib:francium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/francium_ingot_from_smelting_francium_dust.json b/src/generated/resources/data/chemlib/recipe/francium_ingot_from_smelting_francium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/francium_ingot_from_smelting_francium_dust.json rename to src/generated/resources/data/chemlib/recipe/francium_ingot_from_smelting_francium_dust.json index 79344f45..278b7693 100644 --- a/src/generated/resources/data/chemlib/recipes/francium_ingot_from_smelting_francium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/francium_ingot_from_smelting_francium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:francium_dust" }, - "result": "chemlib:francium_ingot" + "result": { + "count": 1, + "id": "chemlib:francium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/francium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/francium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/francium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/francium_ingot_to_block.json index c079a3a9..c2239f01 100644 --- a/src/generated/resources/data/chemlib/recipes/francium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/francium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:francium_metal_block" + "count": 1, + "id": "chemlib:francium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/francium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/francium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/francium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/francium_ingot_to_nugget.json index 50af3d70..ad3213f4 100644 --- a/src/generated/resources/data/chemlib/recipes/francium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/francium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:francium_nugget" + "id": "chemlib:francium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/francium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/francium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/francium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/francium_nugget_to_ingot.json index f0ef5c2d..a2cbd33d 100644 --- a/src/generated/resources/data/chemlib/recipes/francium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/francium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:francium_ingot" + "count": 1, + "id": "chemlib:francium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/gadolinium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/gadolinium_block_to_ingot.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/gadolinium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/gadolinium_block_to_ingot.json index 8eaef3aa..5a3eb588 100644 --- a/src/generated/resources/data/chemlib/recipes/gadolinium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/gadolinium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:gadolinium_ingot" + "id": "chemlib:gadolinium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/gadolinium_ingot_from_blasting_gadolinium_dust.json b/src/generated/resources/data/chemlib/recipe/gadolinium_ingot_from_blasting_gadolinium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/gadolinium_ingot_from_blasting_gadolinium_dust.json rename to src/generated/resources/data/chemlib/recipe/gadolinium_ingot_from_blasting_gadolinium_dust.json index c43e0218..e30524f5 100644 --- a/src/generated/resources/data/chemlib/recipes/gadolinium_ingot_from_blasting_gadolinium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/gadolinium_ingot_from_blasting_gadolinium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:gadolinium_dust" }, - "result": "chemlib:gadolinium_ingot" + "result": { + "count": 1, + "id": "chemlib:gadolinium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/gadolinium_ingot_from_smelting_gadolinium_dust.json b/src/generated/resources/data/chemlib/recipe/gadolinium_ingot_from_smelting_gadolinium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/gadolinium_ingot_from_smelting_gadolinium_dust.json rename to src/generated/resources/data/chemlib/recipe/gadolinium_ingot_from_smelting_gadolinium_dust.json index ed5e7cff..61a577a7 100644 --- a/src/generated/resources/data/chemlib/recipes/gadolinium_ingot_from_smelting_gadolinium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/gadolinium_ingot_from_smelting_gadolinium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:gadolinium_dust" }, - "result": "chemlib:gadolinium_ingot" + "result": { + "count": 1, + "id": "chemlib:gadolinium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/gadolinium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/gadolinium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/recipes/gadolinium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/gadolinium_ingot_to_block.json index 1e7e7bac..c3b9e66d 100644 --- a/src/generated/resources/data/chemlib/recipes/gadolinium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/gadolinium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:gadolinium_metal_block" + "count": 1, + "id": "chemlib:gadolinium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/gadolinium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/gadolinium_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/gadolinium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/gadolinium_ingot_to_nugget.json index 2a6f97af..8e3e7d67 100644 --- a/src/generated/resources/data/chemlib/recipes/gadolinium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/gadolinium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:gadolinium_nugget" + "id": "chemlib:gadolinium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/gadolinium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/gadolinium_nugget_to_ingot.json similarity index 79% rename from src/generated/resources/data/chemlib/recipes/gadolinium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/gadolinium_nugget_to_ingot.json index fe6069e7..10791797 100644 --- a/src/generated/resources/data/chemlib/recipes/gadolinium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/gadolinium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:gadolinium_ingot" + "count": 1, + "id": "chemlib:gadolinium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/gallium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/gallium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/gallium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/gallium_block_to_ingot.json index 677156c5..a990e9a2 100644 --- a/src/generated/resources/data/chemlib/recipes/gallium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/gallium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:gallium_ingot" + "id": "chemlib:gallium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/gallium_ingot_from_blasting_gallium_dust.json b/src/generated/resources/data/chemlib/recipe/gallium_ingot_from_blasting_gallium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/gallium_ingot_from_blasting_gallium_dust.json rename to src/generated/resources/data/chemlib/recipe/gallium_ingot_from_blasting_gallium_dust.json index d3e34efc..e45c0190 100644 --- a/src/generated/resources/data/chemlib/recipes/gallium_ingot_from_blasting_gallium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/gallium_ingot_from_blasting_gallium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:gallium_dust" }, - "result": "chemlib:gallium_ingot" + "result": { + "count": 1, + "id": "chemlib:gallium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/gallium_ingot_from_smelting_gallium_dust.json b/src/generated/resources/data/chemlib/recipe/gallium_ingot_from_smelting_gallium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/gallium_ingot_from_smelting_gallium_dust.json rename to src/generated/resources/data/chemlib/recipe/gallium_ingot_from_smelting_gallium_dust.json index effcdaf4..e25ff76a 100644 --- a/src/generated/resources/data/chemlib/recipes/gallium_ingot_from_smelting_gallium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/gallium_ingot_from_smelting_gallium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:gallium_dust" }, - "result": "chemlib:gallium_ingot" + "result": { + "count": 1, + "id": "chemlib:gallium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/gallium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/gallium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/gallium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/gallium_ingot_to_block.json index 77ef6e85..4ba43361 100644 --- a/src/generated/resources/data/chemlib/recipes/gallium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/gallium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:gallium_metal_block" + "count": 1, + "id": "chemlib:gallium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/gallium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/gallium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/gallium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/gallium_ingot_to_nugget.json index 7a4c87e8..5d53f9d4 100644 --- a/src/generated/resources/data/chemlib/recipes/gallium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/gallium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:gallium_nugget" + "id": "chemlib:gallium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/gallium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/gallium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/gallium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/gallium_nugget_to_ingot.json index 0b05c4ba..79bb557f 100644 --- a/src/generated/resources/data/chemlib/recipes/gallium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/gallium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:gallium_ingot" + "count": 1, + "id": "chemlib:gallium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/gold_ingot_from_blasting_gold_dust.json b/src/generated/resources/data/chemlib/recipe/gold_ingot_from_blasting_gold_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/gold_ingot_from_blasting_gold_dust.json rename to src/generated/resources/data/chemlib/recipe/gold_ingot_from_blasting_gold_dust.json index 200aea64..a9954f51 100644 --- a/src/generated/resources/data/chemlib/recipes/gold_ingot_from_blasting_gold_dust.json +++ b/src/generated/resources/data/chemlib/recipe/gold_ingot_from_blasting_gold_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:gold_dust" }, - "result": "minecraft:gold_ingot" + "result": { + "count": 1, + "id": "minecraft:gold_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/gold_ingot_from_smelting_gold_dust.json b/src/generated/resources/data/chemlib/recipe/gold_ingot_from_smelting_gold_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/gold_ingot_from_smelting_gold_dust.json rename to src/generated/resources/data/chemlib/recipe/gold_ingot_from_smelting_gold_dust.json index a36e51d1..84c201d4 100644 --- a/src/generated/resources/data/chemlib/recipes/gold_ingot_from_smelting_gold_dust.json +++ b/src/generated/resources/data/chemlib/recipe/gold_ingot_from_smelting_gold_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:gold_dust" }, - "result": "minecraft:gold_ingot" + "result": { + "count": 1, + "id": "minecraft:gold_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/hafnium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/hafnium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/hafnium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/hafnium_block_to_ingot.json index 6fdad435..9ae58cc8 100644 --- a/src/generated/resources/data/chemlib/recipes/hafnium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/hafnium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:hafnium_ingot" + "id": "chemlib:hafnium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/hafnium_ingot_from_blasting_hafnium_dust.json b/src/generated/resources/data/chemlib/recipe/hafnium_ingot_from_blasting_hafnium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/hafnium_ingot_from_blasting_hafnium_dust.json rename to src/generated/resources/data/chemlib/recipe/hafnium_ingot_from_blasting_hafnium_dust.json index f2eba7b4..546ffab8 100644 --- a/src/generated/resources/data/chemlib/recipes/hafnium_ingot_from_blasting_hafnium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/hafnium_ingot_from_blasting_hafnium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:hafnium_dust" }, - "result": "chemlib:hafnium_ingot" + "result": { + "count": 1, + "id": "chemlib:hafnium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/hafnium_ingot_from_smelting_hafnium_dust.json b/src/generated/resources/data/chemlib/recipe/hafnium_ingot_from_smelting_hafnium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/hafnium_ingot_from_smelting_hafnium_dust.json rename to src/generated/resources/data/chemlib/recipe/hafnium_ingot_from_smelting_hafnium_dust.json index e14a8e0d..3b785b57 100644 --- a/src/generated/resources/data/chemlib/recipes/hafnium_ingot_from_smelting_hafnium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/hafnium_ingot_from_smelting_hafnium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:hafnium_dust" }, - "result": "chemlib:hafnium_ingot" + "result": { + "count": 1, + "id": "chemlib:hafnium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/hafnium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/hafnium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/hafnium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/hafnium_ingot_to_block.json index 5baff724..ce4242c1 100644 --- a/src/generated/resources/data/chemlib/recipes/hafnium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/hafnium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:hafnium_metal_block" + "count": 1, + "id": "chemlib:hafnium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/hafnium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/hafnium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/hafnium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/hafnium_ingot_to_nugget.json index bd81fcf9..15ee17ad 100644 --- a/src/generated/resources/data/chemlib/recipes/hafnium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/hafnium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:hafnium_nugget" + "id": "chemlib:hafnium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/hafnium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/hafnium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/hafnium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/hafnium_nugget_to_ingot.json index 7a10d773..31f318b5 100644 --- a/src/generated/resources/data/chemlib/recipes/hafnium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/hafnium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:hafnium_ingot" + "count": 1, + "id": "chemlib:hafnium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/helium_lamp_block.json b/src/generated/resources/data/chemlib/recipe/helium_lamp_block.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/helium_lamp_block.json rename to src/generated/resources/data/chemlib/recipe/helium_lamp_block.json index 392653d3..3d2acd35 100644 --- a/src/generated/resources/data/chemlib/recipes/helium_lamp_block.json +++ b/src/generated/resources/data/chemlib/recipe/helium_lamp_block.json @@ -6,7 +6,7 @@ "item": "chemlib:helium" }, "G": { - "tag": "forge:glass" + "tag": "c:glass_blocks/cheap" } }, "pattern": [ @@ -15,6 +15,7 @@ "GEG" ], "result": { - "item": "chemlib:helium_lamp_block" + "count": 1, + "id": "chemlib:helium_lamp_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/holmium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/holmium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/holmium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/holmium_block_to_ingot.json index 51fdb979..8227e760 100644 --- a/src/generated/resources/data/chemlib/recipes/holmium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/holmium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:holmium_ingot" + "id": "chemlib:holmium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/holmium_ingot_from_blasting_holmium_dust.json b/src/generated/resources/data/chemlib/recipe/holmium_ingot_from_blasting_holmium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/holmium_ingot_from_blasting_holmium_dust.json rename to src/generated/resources/data/chemlib/recipe/holmium_ingot_from_blasting_holmium_dust.json index 28ea8cd2..7517e2b3 100644 --- a/src/generated/resources/data/chemlib/recipes/holmium_ingot_from_blasting_holmium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/holmium_ingot_from_blasting_holmium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:holmium_dust" }, - "result": "chemlib:holmium_ingot" + "result": { + "count": 1, + "id": "chemlib:holmium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/holmium_ingot_from_smelting_holmium_dust.json b/src/generated/resources/data/chemlib/recipe/holmium_ingot_from_smelting_holmium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/holmium_ingot_from_smelting_holmium_dust.json rename to src/generated/resources/data/chemlib/recipe/holmium_ingot_from_smelting_holmium_dust.json index 8f62d604..1f7588e2 100644 --- a/src/generated/resources/data/chemlib/recipes/holmium_ingot_from_smelting_holmium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/holmium_ingot_from_smelting_holmium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:holmium_dust" }, - "result": "chemlib:holmium_ingot" + "result": { + "count": 1, + "id": "chemlib:holmium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/holmium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/holmium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/holmium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/holmium_ingot_to_block.json index 8fabaded..c92d0fe9 100644 --- a/src/generated/resources/data/chemlib/recipes/holmium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/holmium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:holmium_metal_block" + "count": 1, + "id": "chemlib:holmium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/holmium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/holmium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/holmium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/holmium_ingot_to_nugget.json index 51b787fd..d470315a 100644 --- a/src/generated/resources/data/chemlib/recipes/holmium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/holmium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:holmium_nugget" + "id": "chemlib:holmium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/holmium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/holmium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/holmium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/holmium_nugget_to_ingot.json index 771760ec..a9ebabc6 100644 --- a/src/generated/resources/data/chemlib/recipes/holmium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/holmium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:holmium_ingot" + "count": 1, + "id": "chemlib:holmium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/indium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/indium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/indium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/indium_block_to_ingot.json index 64c563b8..97d4733d 100644 --- a/src/generated/resources/data/chemlib/recipes/indium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/indium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:indium_ingot" + "id": "chemlib:indium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/indium_ingot_from_blasting_indium_dust.json b/src/generated/resources/data/chemlib/recipe/indium_ingot_from_blasting_indium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/indium_ingot_from_blasting_indium_dust.json rename to src/generated/resources/data/chemlib/recipe/indium_ingot_from_blasting_indium_dust.json index 2e345b1d..49a1005f 100644 --- a/src/generated/resources/data/chemlib/recipes/indium_ingot_from_blasting_indium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/indium_ingot_from_blasting_indium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:indium_dust" }, - "result": "chemlib:indium_ingot" + "result": { + "count": 1, + "id": "chemlib:indium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/indium_ingot_from_smelting_indium_dust.json b/src/generated/resources/data/chemlib/recipe/indium_ingot_from_smelting_indium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/indium_ingot_from_smelting_indium_dust.json rename to src/generated/resources/data/chemlib/recipe/indium_ingot_from_smelting_indium_dust.json index 9f0644dc..4c54d7bd 100644 --- a/src/generated/resources/data/chemlib/recipes/indium_ingot_from_smelting_indium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/indium_ingot_from_smelting_indium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:indium_dust" }, - "result": "chemlib:indium_ingot" + "result": { + "count": 1, + "id": "chemlib:indium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/indium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/indium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/indium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/indium_ingot_to_block.json index 5c6b0e42..5cc74005 100644 --- a/src/generated/resources/data/chemlib/recipes/indium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/indium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:indium_metal_block" + "count": 1, + "id": "chemlib:indium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/indium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/indium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/indium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/indium_ingot_to_nugget.json index 76d5c5d0..a292f8fe 100644 --- a/src/generated/resources/data/chemlib/recipes/indium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/indium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:indium_nugget" + "id": "chemlib:indium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/indium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/indium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/indium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/indium_nugget_to_ingot.json index 7ac6851a..1442a246 100644 --- a/src/generated/resources/data/chemlib/recipes/indium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/indium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:indium_ingot" + "count": 1, + "id": "chemlib:indium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/iridium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/iridium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/iridium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/iridium_block_to_ingot.json index 8b192cb8..1825ce2d 100644 --- a/src/generated/resources/data/chemlib/recipes/iridium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/iridium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:iridium_ingot" + "id": "chemlib:iridium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/iridium_ingot_from_blasting_iridium_dust.json b/src/generated/resources/data/chemlib/recipe/iridium_ingot_from_blasting_iridium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/iridium_ingot_from_blasting_iridium_dust.json rename to src/generated/resources/data/chemlib/recipe/iridium_ingot_from_blasting_iridium_dust.json index 4aa33462..200b961b 100644 --- a/src/generated/resources/data/chemlib/recipes/iridium_ingot_from_blasting_iridium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/iridium_ingot_from_blasting_iridium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:iridium_dust" }, - "result": "chemlib:iridium_ingot" + "result": { + "count": 1, + "id": "chemlib:iridium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/iridium_ingot_from_smelting_iridium_dust.json b/src/generated/resources/data/chemlib/recipe/iridium_ingot_from_smelting_iridium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/iridium_ingot_from_smelting_iridium_dust.json rename to src/generated/resources/data/chemlib/recipe/iridium_ingot_from_smelting_iridium_dust.json index a3826dfe..665663fe 100644 --- a/src/generated/resources/data/chemlib/recipes/iridium_ingot_from_smelting_iridium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/iridium_ingot_from_smelting_iridium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:iridium_dust" }, - "result": "chemlib:iridium_ingot" + "result": { + "count": 1, + "id": "chemlib:iridium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/iridium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/iridium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/iridium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/iridium_ingot_to_block.json index add725b1..cdaf1bc2 100644 --- a/src/generated/resources/data/chemlib/recipes/iridium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/iridium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:iridium_metal_block" + "count": 1, + "id": "chemlib:iridium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/iridium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/iridium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/iridium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/iridium_ingot_to_nugget.json index d94b0ddc..87a8e28b 100644 --- a/src/generated/resources/data/chemlib/recipes/iridium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/iridium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:iridium_nugget" + "id": "chemlib:iridium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/iridium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/iridium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/iridium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/iridium_nugget_to_ingot.json index b3f69ae4..78d4a136 100644 --- a/src/generated/resources/data/chemlib/recipes/iridium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/iridium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:iridium_ingot" + "count": 1, + "id": "chemlib:iridium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/iron_ingot_from_blasting_iron_dust.json b/src/generated/resources/data/chemlib/recipe/iron_ingot_from_blasting_iron_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/iron_ingot_from_blasting_iron_dust.json rename to src/generated/resources/data/chemlib/recipe/iron_ingot_from_blasting_iron_dust.json index 9ace49b7..ff3a9d1c 100644 --- a/src/generated/resources/data/chemlib/recipes/iron_ingot_from_blasting_iron_dust.json +++ b/src/generated/resources/data/chemlib/recipe/iron_ingot_from_blasting_iron_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:iron_dust" }, - "result": "minecraft:iron_ingot" + "result": { + "count": 1, + "id": "minecraft:iron_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/iron_ingot_from_smelting_iron_dust.json b/src/generated/resources/data/chemlib/recipe/iron_ingot_from_smelting_iron_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/iron_ingot_from_smelting_iron_dust.json rename to src/generated/resources/data/chemlib/recipe/iron_ingot_from_smelting_iron_dust.json index 0ce88534..1adb91da 100644 --- a/src/generated/resources/data/chemlib/recipes/iron_ingot_from_smelting_iron_dust.json +++ b/src/generated/resources/data/chemlib/recipe/iron_ingot_from_smelting_iron_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:iron_dust" }, - "result": "minecraft:iron_ingot" + "result": { + "count": 1, + "id": "minecraft:iron_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/krypton_lamp_block.json b/src/generated/resources/data/chemlib/recipe/krypton_lamp_block.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/krypton_lamp_block.json rename to src/generated/resources/data/chemlib/recipe/krypton_lamp_block.json index 7a25d188..cfd39238 100644 --- a/src/generated/resources/data/chemlib/recipes/krypton_lamp_block.json +++ b/src/generated/resources/data/chemlib/recipe/krypton_lamp_block.json @@ -6,7 +6,7 @@ "item": "chemlib:krypton" }, "G": { - "tag": "forge:glass" + "tag": "c:glass_blocks/cheap" } }, "pattern": [ @@ -15,6 +15,7 @@ "GEG" ], "result": { - "item": "chemlib:krypton_lamp_block" + "count": 1, + "id": "chemlib:krypton_lamp_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lanthanum_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/lanthanum_block_to_ingot.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/lanthanum_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/lanthanum_block_to_ingot.json index aa9396c9..ece15774 100644 --- a/src/generated/resources/data/chemlib/recipes/lanthanum_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/lanthanum_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:lanthanum_ingot" + "id": "chemlib:lanthanum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lanthanum_ingot_from_blasting_lanthanum_dust.json b/src/generated/resources/data/chemlib/recipe/lanthanum_ingot_from_blasting_lanthanum_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/lanthanum_ingot_from_blasting_lanthanum_dust.json rename to src/generated/resources/data/chemlib/recipe/lanthanum_ingot_from_blasting_lanthanum_dust.json index 6d6a9880..e4cd8290 100644 --- a/src/generated/resources/data/chemlib/recipes/lanthanum_ingot_from_blasting_lanthanum_dust.json +++ b/src/generated/resources/data/chemlib/recipe/lanthanum_ingot_from_blasting_lanthanum_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:lanthanum_dust" }, - "result": "chemlib:lanthanum_ingot" + "result": { + "count": 1, + "id": "chemlib:lanthanum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lanthanum_ingot_from_smelting_lanthanum_dust.json b/src/generated/resources/data/chemlib/recipe/lanthanum_ingot_from_smelting_lanthanum_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/lanthanum_ingot_from_smelting_lanthanum_dust.json rename to src/generated/resources/data/chemlib/recipe/lanthanum_ingot_from_smelting_lanthanum_dust.json index 1b80e2e4..4ecf7126 100644 --- a/src/generated/resources/data/chemlib/recipes/lanthanum_ingot_from_smelting_lanthanum_dust.json +++ b/src/generated/resources/data/chemlib/recipe/lanthanum_ingot_from_smelting_lanthanum_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:lanthanum_dust" }, - "result": "chemlib:lanthanum_ingot" + "result": { + "count": 1, + "id": "chemlib:lanthanum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lanthanum_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/lanthanum_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/lanthanum_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/lanthanum_ingot_to_block.json index af175b7d..aefe269c 100644 --- a/src/generated/resources/data/chemlib/recipes/lanthanum_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/lanthanum_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:lanthanum_metal_block" + "count": 1, + "id": "chemlib:lanthanum_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lanthanum_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/lanthanum_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/lanthanum_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/lanthanum_ingot_to_nugget.json index c99a9a4d..a3cd8fa5 100644 --- a/src/generated/resources/data/chemlib/recipes/lanthanum_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/lanthanum_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:lanthanum_nugget" + "id": "chemlib:lanthanum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lanthanum_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/lanthanum_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/lanthanum_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/lanthanum_nugget_to_ingot.json index a1a4d282..4d18b65f 100644 --- a/src/generated/resources/data/chemlib/recipes/lanthanum_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/lanthanum_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:lanthanum_ingot" + "count": 1, + "id": "chemlib:lanthanum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lead_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/lead_block_to_ingot.json similarity index 84% rename from src/generated/resources/data/chemlib/recipes/lead_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/lead_block_to_ingot.json index 00faecaa..1400f862 100644 --- a/src/generated/resources/data/chemlib/recipes/lead_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/lead_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:lead_ingot" + "id": "chemlib:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lead_ingot_from_blasting_lead_dust.json b/src/generated/resources/data/chemlib/recipe/lead_ingot_from_blasting_lead_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/lead_ingot_from_blasting_lead_dust.json rename to src/generated/resources/data/chemlib/recipe/lead_ingot_from_blasting_lead_dust.json index 86fe97cf..247fc63b 100644 --- a/src/generated/resources/data/chemlib/recipes/lead_ingot_from_blasting_lead_dust.json +++ b/src/generated/resources/data/chemlib/recipe/lead_ingot_from_blasting_lead_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:lead_dust" }, - "result": "chemlib:lead_ingot" + "result": { + "count": 1, + "id": "chemlib:lead_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lead_ingot_from_smelting_lead_dust.json b/src/generated/resources/data/chemlib/recipe/lead_ingot_from_smelting_lead_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/lead_ingot_from_smelting_lead_dust.json rename to src/generated/resources/data/chemlib/recipe/lead_ingot_from_smelting_lead_dust.json index c00873b2..cc06adde 100644 --- a/src/generated/resources/data/chemlib/recipes/lead_ingot_from_smelting_lead_dust.json +++ b/src/generated/resources/data/chemlib/recipe/lead_ingot_from_smelting_lead_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:lead_dust" }, - "result": "chemlib:lead_ingot" + "result": { + "count": 1, + "id": "chemlib:lead_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lead_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/lead_ingot_to_block.json similarity index 79% rename from src/generated/resources/data/chemlib/recipes/lead_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/lead_ingot_to_block.json index e246be48..19a24f4d 100644 --- a/src/generated/resources/data/chemlib/recipes/lead_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/lead_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:lead_metal_block" + "count": 1, + "id": "chemlib:lead_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lead_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/lead_ingot_to_nugget.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/lead_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/lead_ingot_to_nugget.json index 6c4d168a..74483edf 100644 --- a/src/generated/resources/data/chemlib/recipes/lead_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/lead_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:lead_nugget" + "id": "chemlib:lead_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lead_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/lead_nugget_to_ingot.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/lead_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/lead_nugget_to_ingot.json index ea5ae209..490335f7 100644 --- a/src/generated/resources/data/chemlib/recipes/lead_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/lead_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:lead_ingot" + "count": 1, + "id": "chemlib:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lithium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/lithium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/lithium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/lithium_block_to_ingot.json index ad489180..33becab6 100644 --- a/src/generated/resources/data/chemlib/recipes/lithium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/lithium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:lithium_ingot" + "id": "chemlib:lithium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lithium_ingot_from_blasting_lithium_dust.json b/src/generated/resources/data/chemlib/recipe/lithium_ingot_from_blasting_lithium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/lithium_ingot_from_blasting_lithium_dust.json rename to src/generated/resources/data/chemlib/recipe/lithium_ingot_from_blasting_lithium_dust.json index 9e35fc23..6093d7d5 100644 --- a/src/generated/resources/data/chemlib/recipes/lithium_ingot_from_blasting_lithium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/lithium_ingot_from_blasting_lithium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:lithium_dust" }, - "result": "chemlib:lithium_ingot" + "result": { + "count": 1, + "id": "chemlib:lithium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lithium_ingot_from_smelting_lithium_dust.json b/src/generated/resources/data/chemlib/recipe/lithium_ingot_from_smelting_lithium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/lithium_ingot_from_smelting_lithium_dust.json rename to src/generated/resources/data/chemlib/recipe/lithium_ingot_from_smelting_lithium_dust.json index 05638bf3..dfc9ebca 100644 --- a/src/generated/resources/data/chemlib/recipes/lithium_ingot_from_smelting_lithium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/lithium_ingot_from_smelting_lithium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:lithium_dust" }, - "result": "chemlib:lithium_ingot" + "result": { + "count": 1, + "id": "chemlib:lithium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lithium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/lithium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/lithium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/lithium_ingot_to_block.json index c59851b0..720aef07 100644 --- a/src/generated/resources/data/chemlib/recipes/lithium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/lithium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:lithium_metal_block" + "count": 1, + "id": "chemlib:lithium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lithium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/lithium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/lithium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/lithium_ingot_to_nugget.json index f223a3eb..4ff54fb3 100644 --- a/src/generated/resources/data/chemlib/recipes/lithium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/lithium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:lithium_nugget" + "id": "chemlib:lithium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lithium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/lithium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/lithium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/lithium_nugget_to_ingot.json index 3486746a..33c7ee3a 100644 --- a/src/generated/resources/data/chemlib/recipes/lithium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/lithium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:lithium_ingot" + "count": 1, + "id": "chemlib:lithium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lutetium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/lutetium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/lutetium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/lutetium_block_to_ingot.json index 7fffb429..8afa005c 100644 --- a/src/generated/resources/data/chemlib/recipes/lutetium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/lutetium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:lutetium_ingot" + "id": "chemlib:lutetium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lutetium_ingot_from_blasting_lutetium_dust.json b/src/generated/resources/data/chemlib/recipe/lutetium_ingot_from_blasting_lutetium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/lutetium_ingot_from_blasting_lutetium_dust.json rename to src/generated/resources/data/chemlib/recipe/lutetium_ingot_from_blasting_lutetium_dust.json index d12a0e0b..5dbf2634 100644 --- a/src/generated/resources/data/chemlib/recipes/lutetium_ingot_from_blasting_lutetium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/lutetium_ingot_from_blasting_lutetium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:lutetium_dust" }, - "result": "chemlib:lutetium_ingot" + "result": { + "count": 1, + "id": "chemlib:lutetium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lutetium_ingot_from_smelting_lutetium_dust.json b/src/generated/resources/data/chemlib/recipe/lutetium_ingot_from_smelting_lutetium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/lutetium_ingot_from_smelting_lutetium_dust.json rename to src/generated/resources/data/chemlib/recipe/lutetium_ingot_from_smelting_lutetium_dust.json index bb3d3fc9..3ca62325 100644 --- a/src/generated/resources/data/chemlib/recipes/lutetium_ingot_from_smelting_lutetium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/lutetium_ingot_from_smelting_lutetium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:lutetium_dust" }, - "result": "chemlib:lutetium_ingot" + "result": { + "count": 1, + "id": "chemlib:lutetium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lutetium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/lutetium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/lutetium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/lutetium_ingot_to_block.json index fa4df9a4..5f15993b 100644 --- a/src/generated/resources/data/chemlib/recipes/lutetium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/lutetium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:lutetium_metal_block" + "count": 1, + "id": "chemlib:lutetium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lutetium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/lutetium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/lutetium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/lutetium_ingot_to_nugget.json index 800ab27a..911de604 100644 --- a/src/generated/resources/data/chemlib/recipes/lutetium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/lutetium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:lutetium_nugget" + "id": "chemlib:lutetium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/lutetium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/lutetium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/lutetium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/lutetium_nugget_to_ingot.json index 52b47c8a..5d83684a 100644 --- a/src/generated/resources/data/chemlib/recipes/lutetium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/lutetium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:lutetium_ingot" + "count": 1, + "id": "chemlib:lutetium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/magnesium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/magnesium_block_to_ingot.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/magnesium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/magnesium_block_to_ingot.json index 372cf35d..2917c77d 100644 --- a/src/generated/resources/data/chemlib/recipes/magnesium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/magnesium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:magnesium_ingot" + "id": "chemlib:magnesium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/magnesium_ingot_from_blasting_magnesium_dust.json b/src/generated/resources/data/chemlib/recipe/magnesium_ingot_from_blasting_magnesium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/magnesium_ingot_from_blasting_magnesium_dust.json rename to src/generated/resources/data/chemlib/recipe/magnesium_ingot_from_blasting_magnesium_dust.json index a65ac3c0..8df1312f 100644 --- a/src/generated/resources/data/chemlib/recipes/magnesium_ingot_from_blasting_magnesium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/magnesium_ingot_from_blasting_magnesium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:magnesium_dust" }, - "result": "chemlib:magnesium_ingot" + "result": { + "count": 1, + "id": "chemlib:magnesium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/magnesium_ingot_from_smelting_magnesium_dust.json b/src/generated/resources/data/chemlib/recipe/magnesium_ingot_from_smelting_magnesium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/magnesium_ingot_from_smelting_magnesium_dust.json rename to src/generated/resources/data/chemlib/recipe/magnesium_ingot_from_smelting_magnesium_dust.json index aea12398..b2291b4f 100644 --- a/src/generated/resources/data/chemlib/recipes/magnesium_ingot_from_smelting_magnesium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/magnesium_ingot_from_smelting_magnesium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:magnesium_dust" }, - "result": "chemlib:magnesium_ingot" + "result": { + "count": 1, + "id": "chemlib:magnesium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/magnesium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/magnesium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/magnesium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/magnesium_ingot_to_block.json index 7fa311b3..ed862062 100644 --- a/src/generated/resources/data/chemlib/recipes/magnesium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/magnesium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:magnesium_metal_block" + "count": 1, + "id": "chemlib:magnesium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/magnesium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/magnesium_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/magnesium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/magnesium_ingot_to_nugget.json index fa308124..ed291daa 100644 --- a/src/generated/resources/data/chemlib/recipes/magnesium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/magnesium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:magnesium_nugget" + "id": "chemlib:magnesium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/magnesium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/magnesium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/magnesium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/magnesium_nugget_to_ingot.json index 1e07b236..6589271e 100644 --- a/src/generated/resources/data/chemlib/recipes/magnesium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/magnesium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:magnesium_ingot" + "count": 1, + "id": "chemlib:magnesium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/manganese_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/manganese_block_to_ingot.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/manganese_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/manganese_block_to_ingot.json index ce052372..e366a5e1 100644 --- a/src/generated/resources/data/chemlib/recipes/manganese_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/manganese_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:manganese_ingot" + "id": "chemlib:manganese_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/manganese_ingot_from_blasting_manganese_dust.json b/src/generated/resources/data/chemlib/recipe/manganese_ingot_from_blasting_manganese_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/manganese_ingot_from_blasting_manganese_dust.json rename to src/generated/resources/data/chemlib/recipe/manganese_ingot_from_blasting_manganese_dust.json index 83c196ec..da049616 100644 --- a/src/generated/resources/data/chemlib/recipes/manganese_ingot_from_blasting_manganese_dust.json +++ b/src/generated/resources/data/chemlib/recipe/manganese_ingot_from_blasting_manganese_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:manganese_dust" }, - "result": "chemlib:manganese_ingot" + "result": { + "count": 1, + "id": "chemlib:manganese_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/manganese_ingot_from_smelting_manganese_dust.json b/src/generated/resources/data/chemlib/recipe/manganese_ingot_from_smelting_manganese_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/manganese_ingot_from_smelting_manganese_dust.json rename to src/generated/resources/data/chemlib/recipe/manganese_ingot_from_smelting_manganese_dust.json index f1ea5dcf..7d2f6448 100644 --- a/src/generated/resources/data/chemlib/recipes/manganese_ingot_from_smelting_manganese_dust.json +++ b/src/generated/resources/data/chemlib/recipe/manganese_ingot_from_smelting_manganese_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:manganese_dust" }, - "result": "chemlib:manganese_ingot" + "result": { + "count": 1, + "id": "chemlib:manganese_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/manganese_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/manganese_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/manganese_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/manganese_ingot_to_block.json index a7be0a2d..9c4288d3 100644 --- a/src/generated/resources/data/chemlib/recipes/manganese_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/manganese_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:manganese_metal_block" + "count": 1, + "id": "chemlib:manganese_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/manganese_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/manganese_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/manganese_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/manganese_ingot_to_nugget.json index fa86cdd4..2efefc08 100644 --- a/src/generated/resources/data/chemlib/recipes/manganese_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/manganese_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:manganese_nugget" + "id": "chemlib:manganese_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/manganese_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/manganese_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/manganese_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/manganese_nugget_to_ingot.json index 749c0e3f..75934942 100644 --- a/src/generated/resources/data/chemlib/recipes/manganese_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/manganese_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:manganese_ingot" + "count": 1, + "id": "chemlib:manganese_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/molybdenum_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/molybdenum_block_to_ingot.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/molybdenum_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/molybdenum_block_to_ingot.json index 65073ab9..e098ba47 100644 --- a/src/generated/resources/data/chemlib/recipes/molybdenum_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/molybdenum_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:molybdenum_ingot" + "id": "chemlib:molybdenum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/molybdenum_ingot_from_blasting_molybdenum_dust.json b/src/generated/resources/data/chemlib/recipe/molybdenum_ingot_from_blasting_molybdenum_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/molybdenum_ingot_from_blasting_molybdenum_dust.json rename to src/generated/resources/data/chemlib/recipe/molybdenum_ingot_from_blasting_molybdenum_dust.json index 6a575362..d50d5db3 100644 --- a/src/generated/resources/data/chemlib/recipes/molybdenum_ingot_from_blasting_molybdenum_dust.json +++ b/src/generated/resources/data/chemlib/recipe/molybdenum_ingot_from_blasting_molybdenum_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:molybdenum_dust" }, - "result": "chemlib:molybdenum_ingot" + "result": { + "count": 1, + "id": "chemlib:molybdenum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/molybdenum_ingot_from_smelting_molybdenum_dust.json b/src/generated/resources/data/chemlib/recipe/molybdenum_ingot_from_smelting_molybdenum_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/molybdenum_ingot_from_smelting_molybdenum_dust.json rename to src/generated/resources/data/chemlib/recipe/molybdenum_ingot_from_smelting_molybdenum_dust.json index 945138a0..ebbbc320 100644 --- a/src/generated/resources/data/chemlib/recipes/molybdenum_ingot_from_smelting_molybdenum_dust.json +++ b/src/generated/resources/data/chemlib/recipe/molybdenum_ingot_from_smelting_molybdenum_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:molybdenum_dust" }, - "result": "chemlib:molybdenum_ingot" + "result": { + "count": 1, + "id": "chemlib:molybdenum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/molybdenum_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/molybdenum_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/recipes/molybdenum_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/molybdenum_ingot_to_block.json index 4cd2a348..3975bd8e 100644 --- a/src/generated/resources/data/chemlib/recipes/molybdenum_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/molybdenum_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:molybdenum_metal_block" + "count": 1, + "id": "chemlib:molybdenum_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/molybdenum_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/molybdenum_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/molybdenum_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/molybdenum_ingot_to_nugget.json index d015d2d9..d0bef6cc 100644 --- a/src/generated/resources/data/chemlib/recipes/molybdenum_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/molybdenum_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:molybdenum_nugget" + "id": "chemlib:molybdenum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/molybdenum_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/molybdenum_nugget_to_ingot.json similarity index 79% rename from src/generated/resources/data/chemlib/recipes/molybdenum_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/molybdenum_nugget_to_ingot.json index 83018eea..07bf8562 100644 --- a/src/generated/resources/data/chemlib/recipes/molybdenum_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/molybdenum_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:molybdenum_ingot" + "count": 1, + "id": "chemlib:molybdenum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/neodymium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/neodymium_block_to_ingot.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/neodymium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/neodymium_block_to_ingot.json index 423a2592..1e2cd7e6 100644 --- a/src/generated/resources/data/chemlib/recipes/neodymium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/neodymium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:neodymium_ingot" + "id": "chemlib:neodymium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/neodymium_ingot_from_blasting_neodymium_dust.json b/src/generated/resources/data/chemlib/recipe/neodymium_ingot_from_blasting_neodymium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/neodymium_ingot_from_blasting_neodymium_dust.json rename to src/generated/resources/data/chemlib/recipe/neodymium_ingot_from_blasting_neodymium_dust.json index dac0ff93..b21affc2 100644 --- a/src/generated/resources/data/chemlib/recipes/neodymium_ingot_from_blasting_neodymium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/neodymium_ingot_from_blasting_neodymium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:neodymium_dust" }, - "result": "chemlib:neodymium_ingot" + "result": { + "count": 1, + "id": "chemlib:neodymium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/neodymium_ingot_from_smelting_neodymium_dust.json b/src/generated/resources/data/chemlib/recipe/neodymium_ingot_from_smelting_neodymium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/neodymium_ingot_from_smelting_neodymium_dust.json rename to src/generated/resources/data/chemlib/recipe/neodymium_ingot_from_smelting_neodymium_dust.json index 8127d3a6..a42ef42b 100644 --- a/src/generated/resources/data/chemlib/recipes/neodymium_ingot_from_smelting_neodymium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/neodymium_ingot_from_smelting_neodymium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:neodymium_dust" }, - "result": "chemlib:neodymium_ingot" + "result": { + "count": 1, + "id": "chemlib:neodymium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/neodymium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/neodymium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/neodymium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/neodymium_ingot_to_block.json index f12f60e5..ad7c378e 100644 --- a/src/generated/resources/data/chemlib/recipes/neodymium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/neodymium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:neodymium_metal_block" + "count": 1, + "id": "chemlib:neodymium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/neodymium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/neodymium_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/neodymium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/neodymium_ingot_to_nugget.json index 5e84c7af..54f353ba 100644 --- a/src/generated/resources/data/chemlib/recipes/neodymium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/neodymium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:neodymium_nugget" + "id": "chemlib:neodymium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/neodymium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/neodymium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/neodymium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/neodymium_nugget_to_ingot.json index da7e6de9..f3c59f0f 100644 --- a/src/generated/resources/data/chemlib/recipes/neodymium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/neodymium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:neodymium_ingot" + "count": 1, + "id": "chemlib:neodymium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/neon_lamp_block.json b/src/generated/resources/data/chemlib/recipe/neon_lamp_block.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/neon_lamp_block.json rename to src/generated/resources/data/chemlib/recipe/neon_lamp_block.json index 9a03459b..14c72a1d 100644 --- a/src/generated/resources/data/chemlib/recipes/neon_lamp_block.json +++ b/src/generated/resources/data/chemlib/recipe/neon_lamp_block.json @@ -6,7 +6,7 @@ "item": "chemlib:neon" }, "G": { - "tag": "forge:glass" + "tag": "c:glass_blocks/cheap" } }, "pattern": [ @@ -15,6 +15,7 @@ "GEG" ], "result": { - "item": "chemlib:neon_lamp_block" + "count": 1, + "id": "chemlib:neon_lamp_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/nickel_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/nickel_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/nickel_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/nickel_block_to_ingot.json index 0506ea23..8673ffd8 100644 --- a/src/generated/resources/data/chemlib/recipes/nickel_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/nickel_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:nickel_ingot" + "id": "chemlib:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/nickel_ingot_from_blasting_nickel_dust.json b/src/generated/resources/data/chemlib/recipe/nickel_ingot_from_blasting_nickel_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/nickel_ingot_from_blasting_nickel_dust.json rename to src/generated/resources/data/chemlib/recipe/nickel_ingot_from_blasting_nickel_dust.json index 230f5e14..64d17429 100644 --- a/src/generated/resources/data/chemlib/recipes/nickel_ingot_from_blasting_nickel_dust.json +++ b/src/generated/resources/data/chemlib/recipe/nickel_ingot_from_blasting_nickel_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:nickel_dust" }, - "result": "chemlib:nickel_ingot" + "result": { + "count": 1, + "id": "chemlib:nickel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/nickel_ingot_from_smelting_nickel_dust.json b/src/generated/resources/data/chemlib/recipe/nickel_ingot_from_smelting_nickel_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/nickel_ingot_from_smelting_nickel_dust.json rename to src/generated/resources/data/chemlib/recipe/nickel_ingot_from_smelting_nickel_dust.json index 58c1e068..384485ff 100644 --- a/src/generated/resources/data/chemlib/recipes/nickel_ingot_from_smelting_nickel_dust.json +++ b/src/generated/resources/data/chemlib/recipe/nickel_ingot_from_smelting_nickel_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:nickel_dust" }, - "result": "chemlib:nickel_ingot" + "result": { + "count": 1, + "id": "chemlib:nickel_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/nickel_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/nickel_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/nickel_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/nickel_ingot_to_block.json index c0791e79..e8575cd0 100644 --- a/src/generated/resources/data/chemlib/recipes/nickel_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/nickel_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:nickel_metal_block" + "count": 1, + "id": "chemlib:nickel_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/nickel_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/nickel_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/nickel_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/nickel_ingot_to_nugget.json index d86a88b6..715e64c2 100644 --- a/src/generated/resources/data/chemlib/recipes/nickel_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/nickel_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:nickel_nugget" + "id": "chemlib:nickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/nickel_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/nickel_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/nickel_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/nickel_nugget_to_ingot.json index 80b18d93..6294a320 100644 --- a/src/generated/resources/data/chemlib/recipes/nickel_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/nickel_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:nickel_ingot" + "count": 1, + "id": "chemlib:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/niobium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/niobium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/niobium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/niobium_block_to_ingot.json index 4fb8bc43..c74860ce 100644 --- a/src/generated/resources/data/chemlib/recipes/niobium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/niobium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:niobium_ingot" + "id": "chemlib:niobium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/niobium_ingot_from_blasting_niobium_dust.json b/src/generated/resources/data/chemlib/recipe/niobium_ingot_from_blasting_niobium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/niobium_ingot_from_blasting_niobium_dust.json rename to src/generated/resources/data/chemlib/recipe/niobium_ingot_from_blasting_niobium_dust.json index f34332aa..1b675b94 100644 --- a/src/generated/resources/data/chemlib/recipes/niobium_ingot_from_blasting_niobium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/niobium_ingot_from_blasting_niobium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:niobium_dust" }, - "result": "chemlib:niobium_ingot" + "result": { + "count": 1, + "id": "chemlib:niobium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/niobium_ingot_from_smelting_niobium_dust.json b/src/generated/resources/data/chemlib/recipe/niobium_ingot_from_smelting_niobium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/niobium_ingot_from_smelting_niobium_dust.json rename to src/generated/resources/data/chemlib/recipe/niobium_ingot_from_smelting_niobium_dust.json index 1d3f9afb..c000f536 100644 --- a/src/generated/resources/data/chemlib/recipes/niobium_ingot_from_smelting_niobium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/niobium_ingot_from_smelting_niobium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:niobium_dust" }, - "result": "chemlib:niobium_ingot" + "result": { + "count": 1, + "id": "chemlib:niobium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/niobium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/niobium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/niobium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/niobium_ingot_to_block.json index a92a9c87..63b95b12 100644 --- a/src/generated/resources/data/chemlib/recipes/niobium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/niobium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:niobium_metal_block" + "count": 1, + "id": "chemlib:niobium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/niobium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/niobium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/niobium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/niobium_ingot_to_nugget.json index 30d535c0..3bcbd827 100644 --- a/src/generated/resources/data/chemlib/recipes/niobium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/niobium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:niobium_nugget" + "id": "chemlib:niobium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/niobium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/niobium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/niobium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/niobium_nugget_to_ingot.json index c6706e7b..8413a329 100644 --- a/src/generated/resources/data/chemlib/recipes/niobium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/niobium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:niobium_ingot" + "count": 1, + "id": "chemlib:niobium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/osmium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/osmium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/osmium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/osmium_block_to_ingot.json index 1e99cba1..01b82acc 100644 --- a/src/generated/resources/data/chemlib/recipes/osmium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/osmium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:osmium_ingot" + "id": "chemlib:osmium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/osmium_ingot_from_blasting_osmium_dust.json b/src/generated/resources/data/chemlib/recipe/osmium_ingot_from_blasting_osmium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/osmium_ingot_from_blasting_osmium_dust.json rename to src/generated/resources/data/chemlib/recipe/osmium_ingot_from_blasting_osmium_dust.json index 222b5d26..427cb3a9 100644 --- a/src/generated/resources/data/chemlib/recipes/osmium_ingot_from_blasting_osmium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/osmium_ingot_from_blasting_osmium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:osmium_dust" }, - "result": "chemlib:osmium_ingot" + "result": { + "count": 1, + "id": "chemlib:osmium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/osmium_ingot_from_smelting_osmium_dust.json b/src/generated/resources/data/chemlib/recipe/osmium_ingot_from_smelting_osmium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/osmium_ingot_from_smelting_osmium_dust.json rename to src/generated/resources/data/chemlib/recipe/osmium_ingot_from_smelting_osmium_dust.json index 02213fd1..8ceaa16e 100644 --- a/src/generated/resources/data/chemlib/recipes/osmium_ingot_from_smelting_osmium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/osmium_ingot_from_smelting_osmium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:osmium_dust" }, - "result": "chemlib:osmium_ingot" + "result": { + "count": 1, + "id": "chemlib:osmium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/osmium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/osmium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/osmium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/osmium_ingot_to_block.json index 3a7b4250..28bcfd10 100644 --- a/src/generated/resources/data/chemlib/recipes/osmium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/osmium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:osmium_metal_block" + "count": 1, + "id": "chemlib:osmium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/osmium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/osmium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/osmium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/osmium_ingot_to_nugget.json index 92ae52ec..5effe713 100644 --- a/src/generated/resources/data/chemlib/recipes/osmium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/osmium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:osmium_nugget" + "id": "chemlib:osmium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/osmium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/osmium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/osmium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/osmium_nugget_to_ingot.json index 43abb823..0c80eef2 100644 --- a/src/generated/resources/data/chemlib/recipes/osmium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/osmium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:osmium_ingot" + "count": 1, + "id": "chemlib:osmium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/palladium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/palladium_block_to_ingot.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/palladium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/palladium_block_to_ingot.json index 109a2db3..1335c4c9 100644 --- a/src/generated/resources/data/chemlib/recipes/palladium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/palladium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:palladium_ingot" + "id": "chemlib:palladium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/palladium_ingot_from_blasting_palladium_dust.json b/src/generated/resources/data/chemlib/recipe/palladium_ingot_from_blasting_palladium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/palladium_ingot_from_blasting_palladium_dust.json rename to src/generated/resources/data/chemlib/recipe/palladium_ingot_from_blasting_palladium_dust.json index 66a9b659..08945dab 100644 --- a/src/generated/resources/data/chemlib/recipes/palladium_ingot_from_blasting_palladium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/palladium_ingot_from_blasting_palladium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:palladium_dust" }, - "result": "chemlib:palladium_ingot" + "result": { + "count": 1, + "id": "chemlib:palladium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/palladium_ingot_from_smelting_palladium_dust.json b/src/generated/resources/data/chemlib/recipe/palladium_ingot_from_smelting_palladium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/palladium_ingot_from_smelting_palladium_dust.json rename to src/generated/resources/data/chemlib/recipe/palladium_ingot_from_smelting_palladium_dust.json index c5612264..88ea9213 100644 --- a/src/generated/resources/data/chemlib/recipes/palladium_ingot_from_smelting_palladium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/palladium_ingot_from_smelting_palladium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:palladium_dust" }, - "result": "chemlib:palladium_ingot" + "result": { + "count": 1, + "id": "chemlib:palladium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/palladium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/palladium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/palladium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/palladium_ingot_to_block.json index 8081f64b..6811beb3 100644 --- a/src/generated/resources/data/chemlib/recipes/palladium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/palladium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:palladium_metal_block" + "count": 1, + "id": "chemlib:palladium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/palladium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/palladium_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/palladium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/palladium_ingot_to_nugget.json index 3f24ef4c..516dd737 100644 --- a/src/generated/resources/data/chemlib/recipes/palladium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/palladium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:palladium_nugget" + "id": "chemlib:palladium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/palladium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/palladium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/palladium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/palladium_nugget_to_ingot.json index df4728e3..794a20b9 100644 --- a/src/generated/resources/data/chemlib/recipes/palladium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/palladium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:palladium_ingot" + "count": 1, + "id": "chemlib:palladium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/periodic_table.json b/src/generated/resources/data/chemlib/recipe/periodic_table.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/periodic_table.json rename to src/generated/resources/data/chemlib/recipe/periodic_table.json index 900c02e0..0f4db0cc 100644 --- a/src/generated/resources/data/chemlib/recipes/periodic_table.json +++ b/src/generated/resources/data/chemlib/recipe/periodic_table.json @@ -15,6 +15,7 @@ "HHH" ], "result": { - "item": "chemlib:periodic_table" + "count": 1, + "id": "chemlib:periodic_table" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/platinum_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/platinum_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/platinum_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/platinum_block_to_ingot.json index d470d93f..5d498508 100644 --- a/src/generated/resources/data/chemlib/recipes/platinum_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/platinum_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:platinum_ingot" + "id": "chemlib:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/platinum_ingot_from_blasting_platinum_dust.json b/src/generated/resources/data/chemlib/recipe/platinum_ingot_from_blasting_platinum_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/platinum_ingot_from_blasting_platinum_dust.json rename to src/generated/resources/data/chemlib/recipe/platinum_ingot_from_blasting_platinum_dust.json index a4ed2fa5..bfa69dd1 100644 --- a/src/generated/resources/data/chemlib/recipes/platinum_ingot_from_blasting_platinum_dust.json +++ b/src/generated/resources/data/chemlib/recipe/platinum_ingot_from_blasting_platinum_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:platinum_dust" }, - "result": "chemlib:platinum_ingot" + "result": { + "count": 1, + "id": "chemlib:platinum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/platinum_ingot_from_smelting_platinum_dust.json b/src/generated/resources/data/chemlib/recipe/platinum_ingot_from_smelting_platinum_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/platinum_ingot_from_smelting_platinum_dust.json rename to src/generated/resources/data/chemlib/recipe/platinum_ingot_from_smelting_platinum_dust.json index 4e4a94eb..0f72f24e 100644 --- a/src/generated/resources/data/chemlib/recipes/platinum_ingot_from_smelting_platinum_dust.json +++ b/src/generated/resources/data/chemlib/recipe/platinum_ingot_from_smelting_platinum_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:platinum_dust" }, - "result": "chemlib:platinum_ingot" + "result": { + "count": 1, + "id": "chemlib:platinum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/platinum_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/platinum_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/platinum_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/platinum_ingot_to_block.json index 96d1e8d6..0cae9572 100644 --- a/src/generated/resources/data/chemlib/recipes/platinum_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/platinum_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:platinum_metal_block" + "count": 1, + "id": "chemlib:platinum_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/platinum_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/platinum_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/platinum_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/platinum_ingot_to_nugget.json index e3dc8bef..6e59cceb 100644 --- a/src/generated/resources/data/chemlib/recipes/platinum_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/platinum_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:platinum_nugget" + "id": "chemlib:platinum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/platinum_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/platinum_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/platinum_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/platinum_nugget_to_ingot.json index 01b0cfcf..b02af64a 100644 --- a/src/generated/resources/data/chemlib/recipes/platinum_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/platinum_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:platinum_ingot" + "count": 1, + "id": "chemlib:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/polonium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/polonium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/polonium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/polonium_block_to_ingot.json index dc1aa44e..7e358095 100644 --- a/src/generated/resources/data/chemlib/recipes/polonium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/polonium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:polonium_ingot" + "id": "chemlib:polonium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/polonium_ingot_from_blasting_polonium_dust.json b/src/generated/resources/data/chemlib/recipe/polonium_ingot_from_blasting_polonium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/polonium_ingot_from_blasting_polonium_dust.json rename to src/generated/resources/data/chemlib/recipe/polonium_ingot_from_blasting_polonium_dust.json index 56f32bc2..5a388027 100644 --- a/src/generated/resources/data/chemlib/recipes/polonium_ingot_from_blasting_polonium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/polonium_ingot_from_blasting_polonium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:polonium_dust" }, - "result": "chemlib:polonium_ingot" + "result": { + "count": 1, + "id": "chemlib:polonium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/polonium_ingot_from_smelting_polonium_dust.json b/src/generated/resources/data/chemlib/recipe/polonium_ingot_from_smelting_polonium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/polonium_ingot_from_smelting_polonium_dust.json rename to src/generated/resources/data/chemlib/recipe/polonium_ingot_from_smelting_polonium_dust.json index 2d6ea481..bdd011a3 100644 --- a/src/generated/resources/data/chemlib/recipes/polonium_ingot_from_smelting_polonium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/polonium_ingot_from_smelting_polonium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:polonium_dust" }, - "result": "chemlib:polonium_ingot" + "result": { + "count": 1, + "id": "chemlib:polonium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/polonium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/polonium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/polonium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/polonium_ingot_to_block.json index 266b823b..3e8b5499 100644 --- a/src/generated/resources/data/chemlib/recipes/polonium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/polonium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:polonium_metal_block" + "count": 1, + "id": "chemlib:polonium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/polonium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/polonium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/polonium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/polonium_ingot_to_nugget.json index d2bc9f44..627cd78b 100644 --- a/src/generated/resources/data/chemlib/recipes/polonium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/polonium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:polonium_nugget" + "id": "chemlib:polonium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/polonium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/polonium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/polonium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/polonium_nugget_to_ingot.json index 4a2d9d5b..7345bc3d 100644 --- a/src/generated/resources/data/chemlib/recipes/polonium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/polonium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:polonium_ingot" + "count": 1, + "id": "chemlib:polonium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/potassium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/potassium_block_to_ingot.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/potassium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/potassium_block_to_ingot.json index 7912e36e..658078c3 100644 --- a/src/generated/resources/data/chemlib/recipes/potassium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/potassium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:potassium_ingot" + "id": "chemlib:potassium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/potassium_ingot_from_blasting_potassium_dust.json b/src/generated/resources/data/chemlib/recipe/potassium_ingot_from_blasting_potassium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/potassium_ingot_from_blasting_potassium_dust.json rename to src/generated/resources/data/chemlib/recipe/potassium_ingot_from_blasting_potassium_dust.json index 423eab96..78956faf 100644 --- a/src/generated/resources/data/chemlib/recipes/potassium_ingot_from_blasting_potassium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/potassium_ingot_from_blasting_potassium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:potassium_dust" }, - "result": "chemlib:potassium_ingot" + "result": { + "count": 1, + "id": "chemlib:potassium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/potassium_ingot_from_smelting_potassium_dust.json b/src/generated/resources/data/chemlib/recipe/potassium_ingot_from_smelting_potassium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/potassium_ingot_from_smelting_potassium_dust.json rename to src/generated/resources/data/chemlib/recipe/potassium_ingot_from_smelting_potassium_dust.json index 0562f174..6a7cfc5c 100644 --- a/src/generated/resources/data/chemlib/recipes/potassium_ingot_from_smelting_potassium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/potassium_ingot_from_smelting_potassium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:potassium_dust" }, - "result": "chemlib:potassium_ingot" + "result": { + "count": 1, + "id": "chemlib:potassium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/potassium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/potassium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/potassium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/potassium_ingot_to_block.json index 7232be7b..415c2260 100644 --- a/src/generated/resources/data/chemlib/recipes/potassium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/potassium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:potassium_metal_block" + "count": 1, + "id": "chemlib:potassium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/potassium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/potassium_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/potassium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/potassium_ingot_to_nugget.json index a41b9f81..7d0f1e57 100644 --- a/src/generated/resources/data/chemlib/recipes/potassium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/potassium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:potassium_nugget" + "id": "chemlib:potassium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/potassium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/potassium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/potassium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/potassium_nugget_to_ingot.json index b56ab0cd..f9d499a6 100644 --- a/src/generated/resources/data/chemlib/recipes/potassium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/potassium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:potassium_ingot" + "count": 1, + "id": "chemlib:potassium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/praseodymium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/praseodymium_block_to_ingot.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/praseodymium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/praseodymium_block_to_ingot.json index ccf6635a..d3953b4c 100644 --- a/src/generated/resources/data/chemlib/recipes/praseodymium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/praseodymium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:praseodymium_ingot" + "id": "chemlib:praseodymium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/praseodymium_ingot_from_blasting_praseodymium_dust.json b/src/generated/resources/data/chemlib/recipe/praseodymium_ingot_from_blasting_praseodymium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/praseodymium_ingot_from_blasting_praseodymium_dust.json rename to src/generated/resources/data/chemlib/recipe/praseodymium_ingot_from_blasting_praseodymium_dust.json index d78c38c3..6dd6aa12 100644 --- a/src/generated/resources/data/chemlib/recipes/praseodymium_ingot_from_blasting_praseodymium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/praseodymium_ingot_from_blasting_praseodymium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:praseodymium_dust" }, - "result": "chemlib:praseodymium_ingot" + "result": { + "count": 1, + "id": "chemlib:praseodymium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/praseodymium_ingot_from_smelting_praseodymium_dust.json b/src/generated/resources/data/chemlib/recipe/praseodymium_ingot_from_smelting_praseodymium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/praseodymium_ingot_from_smelting_praseodymium_dust.json rename to src/generated/resources/data/chemlib/recipe/praseodymium_ingot_from_smelting_praseodymium_dust.json index 7d030b28..0ecedcbe 100644 --- a/src/generated/resources/data/chemlib/recipes/praseodymium_ingot_from_smelting_praseodymium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/praseodymium_ingot_from_smelting_praseodymium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:praseodymium_dust" }, - "result": "chemlib:praseodymium_ingot" + "result": { + "count": 1, + "id": "chemlib:praseodymium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/praseodymium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/praseodymium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/recipes/praseodymium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/praseodymium_ingot_to_block.json index 1e9b14f4..5ddf9e2e 100644 --- a/src/generated/resources/data/chemlib/recipes/praseodymium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/praseodymium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:praseodymium_metal_block" + "count": 1, + "id": "chemlib:praseodymium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/praseodymium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/praseodymium_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/praseodymium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/praseodymium_ingot_to_nugget.json index 8a6b5f72..af045778 100644 --- a/src/generated/resources/data/chemlib/recipes/praseodymium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/praseodymium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:praseodymium_nugget" + "id": "chemlib:praseodymium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/praseodymium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/praseodymium_nugget_to_ingot.json similarity index 79% rename from src/generated/resources/data/chemlib/recipes/praseodymium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/praseodymium_nugget_to_ingot.json index 7347a501..9eebafd5 100644 --- a/src/generated/resources/data/chemlib/recipes/praseodymium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/praseodymium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:praseodymium_ingot" + "count": 1, + "id": "chemlib:praseodymium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/protactinium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/protactinium_block_to_ingot.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/protactinium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/protactinium_block_to_ingot.json index 49fc736f..113cd828 100644 --- a/src/generated/resources/data/chemlib/recipes/protactinium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/protactinium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:protactinium_ingot" + "id": "chemlib:protactinium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/protactinium_ingot_from_blasting_protactinium_dust.json b/src/generated/resources/data/chemlib/recipe/protactinium_ingot_from_blasting_protactinium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/protactinium_ingot_from_blasting_protactinium_dust.json rename to src/generated/resources/data/chemlib/recipe/protactinium_ingot_from_blasting_protactinium_dust.json index 93d3e16f..a7df961d 100644 --- a/src/generated/resources/data/chemlib/recipes/protactinium_ingot_from_blasting_protactinium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/protactinium_ingot_from_blasting_protactinium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:protactinium_dust" }, - "result": "chemlib:protactinium_ingot" + "result": { + "count": 1, + "id": "chemlib:protactinium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/protactinium_ingot_from_smelting_protactinium_dust.json b/src/generated/resources/data/chemlib/recipe/protactinium_ingot_from_smelting_protactinium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/protactinium_ingot_from_smelting_protactinium_dust.json rename to src/generated/resources/data/chemlib/recipe/protactinium_ingot_from_smelting_protactinium_dust.json index 048b3b97..88db9738 100644 --- a/src/generated/resources/data/chemlib/recipes/protactinium_ingot_from_smelting_protactinium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/protactinium_ingot_from_smelting_protactinium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:protactinium_dust" }, - "result": "chemlib:protactinium_ingot" + "result": { + "count": 1, + "id": "chemlib:protactinium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/protactinium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/protactinium_ingot_to_block.json similarity index 77% rename from src/generated/resources/data/chemlib/recipes/protactinium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/protactinium_ingot_to_block.json index b541f244..73d7e3b4 100644 --- a/src/generated/resources/data/chemlib/recipes/protactinium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/protactinium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:protactinium_metal_block" + "count": 1, + "id": "chemlib:protactinium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/protactinium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/protactinium_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/protactinium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/protactinium_ingot_to_nugget.json index be84cbc4..ed085cd3 100644 --- a/src/generated/resources/data/chemlib/recipes/protactinium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/protactinium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:protactinium_nugget" + "id": "chemlib:protactinium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/protactinium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/protactinium_nugget_to_ingot.json similarity index 79% rename from src/generated/resources/data/chemlib/recipes/protactinium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/protactinium_nugget_to_ingot.json index e7747dae..55798a80 100644 --- a/src/generated/resources/data/chemlib/recipes/protactinium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/protactinium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:protactinium_ingot" + "count": 1, + "id": "chemlib:protactinium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/radium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/radium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/radium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/radium_block_to_ingot.json index a2203a1e..509e0006 100644 --- a/src/generated/resources/data/chemlib/recipes/radium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/radium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:radium_ingot" + "id": "chemlib:radium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/radium_ingot_from_blasting_radium_dust.json b/src/generated/resources/data/chemlib/recipe/radium_ingot_from_blasting_radium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/radium_ingot_from_blasting_radium_dust.json rename to src/generated/resources/data/chemlib/recipe/radium_ingot_from_blasting_radium_dust.json index 1685e496..0209898a 100644 --- a/src/generated/resources/data/chemlib/recipes/radium_ingot_from_blasting_radium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/radium_ingot_from_blasting_radium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:radium_dust" }, - "result": "chemlib:radium_ingot" + "result": { + "count": 1, + "id": "chemlib:radium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/radium_ingot_from_smelting_radium_dust.json b/src/generated/resources/data/chemlib/recipe/radium_ingot_from_smelting_radium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/radium_ingot_from_smelting_radium_dust.json rename to src/generated/resources/data/chemlib/recipe/radium_ingot_from_smelting_radium_dust.json index 13036740..1b9b419a 100644 --- a/src/generated/resources/data/chemlib/recipes/radium_ingot_from_smelting_radium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/radium_ingot_from_smelting_radium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:radium_dust" }, - "result": "chemlib:radium_ingot" + "result": { + "count": 1, + "id": "chemlib:radium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/radium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/radium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/radium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/radium_ingot_to_block.json index 23bc5a49..3fc49440 100644 --- a/src/generated/resources/data/chemlib/recipes/radium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/radium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:radium_metal_block" + "count": 1, + "id": "chemlib:radium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/radium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/radium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/radium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/radium_ingot_to_nugget.json index 46876601..de26f2bb 100644 --- a/src/generated/resources/data/chemlib/recipes/radium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/radium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:radium_nugget" + "id": "chemlib:radium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/radium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/radium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/radium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/radium_nugget_to_ingot.json index 4e36b3b6..77bf3202 100644 --- a/src/generated/resources/data/chemlib/recipes/radium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/radium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:radium_ingot" + "count": 1, + "id": "chemlib:radium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/radon_lamp_block.json b/src/generated/resources/data/chemlib/recipe/radon_lamp_block.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/radon_lamp_block.json rename to src/generated/resources/data/chemlib/recipe/radon_lamp_block.json index c385bfdb..cb41e144 100644 --- a/src/generated/resources/data/chemlib/recipes/radon_lamp_block.json +++ b/src/generated/resources/data/chemlib/recipe/radon_lamp_block.json @@ -6,7 +6,7 @@ "item": "chemlib:radon" }, "G": { - "tag": "forge:glass" + "tag": "c:glass_blocks/cheap" } }, "pattern": [ @@ -15,6 +15,7 @@ "GEG" ], "result": { - "item": "chemlib:radon_lamp_block" + "count": 1, + "id": "chemlib:radon_lamp_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rhenium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/rhenium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/rhenium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/rhenium_block_to_ingot.json index dc6f0aa2..dd5da254 100644 --- a/src/generated/resources/data/chemlib/recipes/rhenium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/rhenium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:rhenium_ingot" + "id": "chemlib:rhenium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rhenium_ingot_from_blasting_rhenium_dust.json b/src/generated/resources/data/chemlib/recipe/rhenium_ingot_from_blasting_rhenium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/rhenium_ingot_from_blasting_rhenium_dust.json rename to src/generated/resources/data/chemlib/recipe/rhenium_ingot_from_blasting_rhenium_dust.json index 579c5fa9..d43be25e 100644 --- a/src/generated/resources/data/chemlib/recipes/rhenium_ingot_from_blasting_rhenium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/rhenium_ingot_from_blasting_rhenium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:rhenium_dust" }, - "result": "chemlib:rhenium_ingot" + "result": { + "count": 1, + "id": "chemlib:rhenium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rhenium_ingot_from_smelting_rhenium_dust.json b/src/generated/resources/data/chemlib/recipe/rhenium_ingot_from_smelting_rhenium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/rhenium_ingot_from_smelting_rhenium_dust.json rename to src/generated/resources/data/chemlib/recipe/rhenium_ingot_from_smelting_rhenium_dust.json index 6a4f61f1..cbc32f30 100644 --- a/src/generated/resources/data/chemlib/recipes/rhenium_ingot_from_smelting_rhenium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/rhenium_ingot_from_smelting_rhenium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:rhenium_dust" }, - "result": "chemlib:rhenium_ingot" + "result": { + "count": 1, + "id": "chemlib:rhenium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rhenium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/rhenium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/rhenium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/rhenium_ingot_to_block.json index 684d24e1..d90beb15 100644 --- a/src/generated/resources/data/chemlib/recipes/rhenium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/rhenium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:rhenium_metal_block" + "count": 1, + "id": "chemlib:rhenium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rhenium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/rhenium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/rhenium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/rhenium_ingot_to_nugget.json index c85e7d57..916d9ea6 100644 --- a/src/generated/resources/data/chemlib/recipes/rhenium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/rhenium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:rhenium_nugget" + "id": "chemlib:rhenium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rhenium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/rhenium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/rhenium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/rhenium_nugget_to_ingot.json index 646da1ea..9fe854c5 100644 --- a/src/generated/resources/data/chemlib/recipes/rhenium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/rhenium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:rhenium_ingot" + "count": 1, + "id": "chemlib:rhenium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rhodium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/rhodium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/rhodium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/rhodium_block_to_ingot.json index 0b2e9dff..99b922d0 100644 --- a/src/generated/resources/data/chemlib/recipes/rhodium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/rhodium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:rhodium_ingot" + "id": "chemlib:rhodium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rhodium_ingot_from_blasting_rhodium_dust.json b/src/generated/resources/data/chemlib/recipe/rhodium_ingot_from_blasting_rhodium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/rhodium_ingot_from_blasting_rhodium_dust.json rename to src/generated/resources/data/chemlib/recipe/rhodium_ingot_from_blasting_rhodium_dust.json index 21dd8ed8..de0ca0e1 100644 --- a/src/generated/resources/data/chemlib/recipes/rhodium_ingot_from_blasting_rhodium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/rhodium_ingot_from_blasting_rhodium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:rhodium_dust" }, - "result": "chemlib:rhodium_ingot" + "result": { + "count": 1, + "id": "chemlib:rhodium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rhodium_ingot_from_smelting_rhodium_dust.json b/src/generated/resources/data/chemlib/recipe/rhodium_ingot_from_smelting_rhodium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/rhodium_ingot_from_smelting_rhodium_dust.json rename to src/generated/resources/data/chemlib/recipe/rhodium_ingot_from_smelting_rhodium_dust.json index aaca926e..f7808e0e 100644 --- a/src/generated/resources/data/chemlib/recipes/rhodium_ingot_from_smelting_rhodium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/rhodium_ingot_from_smelting_rhodium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:rhodium_dust" }, - "result": "chemlib:rhodium_ingot" + "result": { + "count": 1, + "id": "chemlib:rhodium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rhodium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/rhodium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/rhodium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/rhodium_ingot_to_block.json index 67161ea4..75cf4726 100644 --- a/src/generated/resources/data/chemlib/recipes/rhodium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/rhodium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:rhodium_metal_block" + "count": 1, + "id": "chemlib:rhodium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rhodium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/rhodium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/rhodium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/rhodium_ingot_to_nugget.json index 5ff00b35..0504b094 100644 --- a/src/generated/resources/data/chemlib/recipes/rhodium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/rhodium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:rhodium_nugget" + "id": "chemlib:rhodium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rhodium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/rhodium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/rhodium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/rhodium_nugget_to_ingot.json index 29fa0699..6c5ca65b 100644 --- a/src/generated/resources/data/chemlib/recipes/rhodium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/rhodium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:rhodium_ingot" + "count": 1, + "id": "chemlib:rhodium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rubidium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/rubidium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/rubidium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/rubidium_block_to_ingot.json index 83228b31..ebef433f 100644 --- a/src/generated/resources/data/chemlib/recipes/rubidium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/rubidium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:rubidium_ingot" + "id": "chemlib:rubidium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rubidium_ingot_from_blasting_rubidium_dust.json b/src/generated/resources/data/chemlib/recipe/rubidium_ingot_from_blasting_rubidium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/rubidium_ingot_from_blasting_rubidium_dust.json rename to src/generated/resources/data/chemlib/recipe/rubidium_ingot_from_blasting_rubidium_dust.json index 69a03305..ac25a45c 100644 --- a/src/generated/resources/data/chemlib/recipes/rubidium_ingot_from_blasting_rubidium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/rubidium_ingot_from_blasting_rubidium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:rubidium_dust" }, - "result": "chemlib:rubidium_ingot" + "result": { + "count": 1, + "id": "chemlib:rubidium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rubidium_ingot_from_smelting_rubidium_dust.json b/src/generated/resources/data/chemlib/recipe/rubidium_ingot_from_smelting_rubidium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/rubidium_ingot_from_smelting_rubidium_dust.json rename to src/generated/resources/data/chemlib/recipe/rubidium_ingot_from_smelting_rubidium_dust.json index c0c98918..ef7d6903 100644 --- a/src/generated/resources/data/chemlib/recipes/rubidium_ingot_from_smelting_rubidium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/rubidium_ingot_from_smelting_rubidium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:rubidium_dust" }, - "result": "chemlib:rubidium_ingot" + "result": { + "count": 1, + "id": "chemlib:rubidium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rubidium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/rubidium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/rubidium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/rubidium_ingot_to_block.json index 77dcb5a8..e786d994 100644 --- a/src/generated/resources/data/chemlib/recipes/rubidium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/rubidium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:rubidium_metal_block" + "count": 1, + "id": "chemlib:rubidium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rubidium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/rubidium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/rubidium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/rubidium_ingot_to_nugget.json index dffdb55b..d62c19e1 100644 --- a/src/generated/resources/data/chemlib/recipes/rubidium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/rubidium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:rubidium_nugget" + "id": "chemlib:rubidium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/rubidium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/rubidium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/rubidium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/rubidium_nugget_to_ingot.json index e01dd4f0..fba8e5d0 100644 --- a/src/generated/resources/data/chemlib/recipes/rubidium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/rubidium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:rubidium_ingot" + "count": 1, + "id": "chemlib:rubidium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/ruthenium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/ruthenium_block_to_ingot.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/ruthenium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/ruthenium_block_to_ingot.json index 91c27b12..10396667 100644 --- a/src/generated/resources/data/chemlib/recipes/ruthenium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/ruthenium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:ruthenium_ingot" + "id": "chemlib:ruthenium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/ruthenium_ingot_from_blasting_ruthenium_dust.json b/src/generated/resources/data/chemlib/recipe/ruthenium_ingot_from_blasting_ruthenium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/ruthenium_ingot_from_blasting_ruthenium_dust.json rename to src/generated/resources/data/chemlib/recipe/ruthenium_ingot_from_blasting_ruthenium_dust.json index d23d9519..2c9ec4d4 100644 --- a/src/generated/resources/data/chemlib/recipes/ruthenium_ingot_from_blasting_ruthenium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/ruthenium_ingot_from_blasting_ruthenium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:ruthenium_dust" }, - "result": "chemlib:ruthenium_ingot" + "result": { + "count": 1, + "id": "chemlib:ruthenium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/ruthenium_ingot_from_smelting_ruthenium_dust.json b/src/generated/resources/data/chemlib/recipe/ruthenium_ingot_from_smelting_ruthenium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/ruthenium_ingot_from_smelting_ruthenium_dust.json rename to src/generated/resources/data/chemlib/recipe/ruthenium_ingot_from_smelting_ruthenium_dust.json index f8db9443..b37ec8d0 100644 --- a/src/generated/resources/data/chemlib/recipes/ruthenium_ingot_from_smelting_ruthenium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/ruthenium_ingot_from_smelting_ruthenium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:ruthenium_dust" }, - "result": "chemlib:ruthenium_ingot" + "result": { + "count": 1, + "id": "chemlib:ruthenium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/ruthenium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/ruthenium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/ruthenium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/ruthenium_ingot_to_block.json index 052f6f69..7158675e 100644 --- a/src/generated/resources/data/chemlib/recipes/ruthenium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/ruthenium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:ruthenium_metal_block" + "count": 1, + "id": "chemlib:ruthenium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/ruthenium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/ruthenium_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/ruthenium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/ruthenium_ingot_to_nugget.json index d54b1896..c7440ae9 100644 --- a/src/generated/resources/data/chemlib/recipes/ruthenium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/ruthenium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:ruthenium_nugget" + "id": "chemlib:ruthenium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/ruthenium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/ruthenium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/ruthenium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/ruthenium_nugget_to_ingot.json index acda6f01..66c20235 100644 --- a/src/generated/resources/data/chemlib/recipes/ruthenium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/ruthenium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:ruthenium_ingot" + "count": 1, + "id": "chemlib:ruthenium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/samarium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/samarium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/samarium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/samarium_block_to_ingot.json index 33ce57b8..0afec6fe 100644 --- a/src/generated/resources/data/chemlib/recipes/samarium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/samarium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:samarium_ingot" + "id": "chemlib:samarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/samarium_ingot_from_blasting_samarium_dust.json b/src/generated/resources/data/chemlib/recipe/samarium_ingot_from_blasting_samarium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/samarium_ingot_from_blasting_samarium_dust.json rename to src/generated/resources/data/chemlib/recipe/samarium_ingot_from_blasting_samarium_dust.json index b31ed5dd..42329f4c 100644 --- a/src/generated/resources/data/chemlib/recipes/samarium_ingot_from_blasting_samarium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/samarium_ingot_from_blasting_samarium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:samarium_dust" }, - "result": "chemlib:samarium_ingot" + "result": { + "count": 1, + "id": "chemlib:samarium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/samarium_ingot_from_smelting_samarium_dust.json b/src/generated/resources/data/chemlib/recipe/samarium_ingot_from_smelting_samarium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/samarium_ingot_from_smelting_samarium_dust.json rename to src/generated/resources/data/chemlib/recipe/samarium_ingot_from_smelting_samarium_dust.json index 79b1fb3b..8a8e73d3 100644 --- a/src/generated/resources/data/chemlib/recipes/samarium_ingot_from_smelting_samarium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/samarium_ingot_from_smelting_samarium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:samarium_dust" }, - "result": "chemlib:samarium_ingot" + "result": { + "count": 1, + "id": "chemlib:samarium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/samarium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/samarium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/samarium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/samarium_ingot_to_block.json index 8b0620c2..d6e7b5a6 100644 --- a/src/generated/resources/data/chemlib/recipes/samarium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/samarium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:samarium_metal_block" + "count": 1, + "id": "chemlib:samarium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/samarium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/samarium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/samarium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/samarium_ingot_to_nugget.json index 0d86c40c..5e672ed4 100644 --- a/src/generated/resources/data/chemlib/recipes/samarium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/samarium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:samarium_nugget" + "id": "chemlib:samarium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/samarium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/samarium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/samarium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/samarium_nugget_to_ingot.json index 7dceddd7..c54445e6 100644 --- a/src/generated/resources/data/chemlib/recipes/samarium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/samarium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:samarium_ingot" + "count": 1, + "id": "chemlib:samarium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/scandium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/scandium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/scandium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/scandium_block_to_ingot.json index 61102eb9..6b52e751 100644 --- a/src/generated/resources/data/chemlib/recipes/scandium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/scandium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:scandium_ingot" + "id": "chemlib:scandium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/scandium_ingot_from_blasting_scandium_dust.json b/src/generated/resources/data/chemlib/recipe/scandium_ingot_from_blasting_scandium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/scandium_ingot_from_blasting_scandium_dust.json rename to src/generated/resources/data/chemlib/recipe/scandium_ingot_from_blasting_scandium_dust.json index b8df6236..58d1a170 100644 --- a/src/generated/resources/data/chemlib/recipes/scandium_ingot_from_blasting_scandium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/scandium_ingot_from_blasting_scandium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:scandium_dust" }, - "result": "chemlib:scandium_ingot" + "result": { + "count": 1, + "id": "chemlib:scandium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/scandium_ingot_from_smelting_scandium_dust.json b/src/generated/resources/data/chemlib/recipe/scandium_ingot_from_smelting_scandium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/scandium_ingot_from_smelting_scandium_dust.json rename to src/generated/resources/data/chemlib/recipe/scandium_ingot_from_smelting_scandium_dust.json index 19a8b05e..687e7c15 100644 --- a/src/generated/resources/data/chemlib/recipes/scandium_ingot_from_smelting_scandium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/scandium_ingot_from_smelting_scandium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:scandium_dust" }, - "result": "chemlib:scandium_ingot" + "result": { + "count": 1, + "id": "chemlib:scandium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/scandium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/scandium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/scandium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/scandium_ingot_to_block.json index 15d459bb..36219e4c 100644 --- a/src/generated/resources/data/chemlib/recipes/scandium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/scandium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:scandium_metal_block" + "count": 1, + "id": "chemlib:scandium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/scandium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/scandium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/scandium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/scandium_ingot_to_nugget.json index 20b5d84c..fb88509a 100644 --- a/src/generated/resources/data/chemlib/recipes/scandium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/scandium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:scandium_nugget" + "id": "chemlib:scandium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/scandium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/scandium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/scandium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/scandium_nugget_to_ingot.json index eb78c692..42272817 100644 --- a/src/generated/resources/data/chemlib/recipes/scandium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/scandium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:scandium_ingot" + "count": 1, + "id": "chemlib:scandium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/silver_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/silver_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/silver_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/silver_block_to_ingot.json index 90fe676e..615f1a1d 100644 --- a/src/generated/resources/data/chemlib/recipes/silver_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/silver_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:silver_ingot" + "id": "chemlib:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/silver_ingot_from_blasting_silver_dust.json b/src/generated/resources/data/chemlib/recipe/silver_ingot_from_blasting_silver_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/silver_ingot_from_blasting_silver_dust.json rename to src/generated/resources/data/chemlib/recipe/silver_ingot_from_blasting_silver_dust.json index 6b40f688..c5b77e8f 100644 --- a/src/generated/resources/data/chemlib/recipes/silver_ingot_from_blasting_silver_dust.json +++ b/src/generated/resources/data/chemlib/recipe/silver_ingot_from_blasting_silver_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:silver_dust" }, - "result": "chemlib:silver_ingot" + "result": { + "count": 1, + "id": "chemlib:silver_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/silver_ingot_from_smelting_silver_dust.json b/src/generated/resources/data/chemlib/recipe/silver_ingot_from_smelting_silver_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/silver_ingot_from_smelting_silver_dust.json rename to src/generated/resources/data/chemlib/recipe/silver_ingot_from_smelting_silver_dust.json index c6a60a27..1d7276e7 100644 --- a/src/generated/resources/data/chemlib/recipes/silver_ingot_from_smelting_silver_dust.json +++ b/src/generated/resources/data/chemlib/recipe/silver_ingot_from_smelting_silver_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:silver_dust" }, - "result": "chemlib:silver_ingot" + "result": { + "count": 1, + "id": "chemlib:silver_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/silver_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/silver_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/silver_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/silver_ingot_to_block.json index 252ce11f..4cfdd3e1 100644 --- a/src/generated/resources/data/chemlib/recipes/silver_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/silver_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:silver_metal_block" + "count": 1, + "id": "chemlib:silver_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/silver_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/silver_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/silver_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/silver_ingot_to_nugget.json index 14247520..3db29a97 100644 --- a/src/generated/resources/data/chemlib/recipes/silver_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/silver_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:silver_nugget" + "id": "chemlib:silver_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/silver_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/silver_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/silver_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/silver_nugget_to_ingot.json index 528d44d5..cab4a00e 100644 --- a/src/generated/resources/data/chemlib/recipes/silver_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/silver_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:silver_ingot" + "count": 1, + "id": "chemlib:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/sodium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/sodium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/sodium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/sodium_block_to_ingot.json index d3ae0407..cb1bcc49 100644 --- a/src/generated/resources/data/chemlib/recipes/sodium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/sodium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:sodium_ingot" + "id": "chemlib:sodium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/sodium_ingot_from_blasting_sodium_dust.json b/src/generated/resources/data/chemlib/recipe/sodium_ingot_from_blasting_sodium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/sodium_ingot_from_blasting_sodium_dust.json rename to src/generated/resources/data/chemlib/recipe/sodium_ingot_from_blasting_sodium_dust.json index 22e2def3..2c6bdbfb 100644 --- a/src/generated/resources/data/chemlib/recipes/sodium_ingot_from_blasting_sodium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/sodium_ingot_from_blasting_sodium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:sodium_dust" }, - "result": "chemlib:sodium_ingot" + "result": { + "count": 1, + "id": "chemlib:sodium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/sodium_ingot_from_smelting_sodium_dust.json b/src/generated/resources/data/chemlib/recipe/sodium_ingot_from_smelting_sodium_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/sodium_ingot_from_smelting_sodium_dust.json rename to src/generated/resources/data/chemlib/recipe/sodium_ingot_from_smelting_sodium_dust.json index 2ea8502f..673ea3cd 100644 --- a/src/generated/resources/data/chemlib/recipes/sodium_ingot_from_smelting_sodium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/sodium_ingot_from_smelting_sodium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:sodium_dust" }, - "result": "chemlib:sodium_ingot" + "result": { + "count": 1, + "id": "chemlib:sodium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/sodium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/sodium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/sodium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/sodium_ingot_to_block.json index 041ec306..db5623fc 100644 --- a/src/generated/resources/data/chemlib/recipes/sodium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/sodium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:sodium_metal_block" + "count": 1, + "id": "chemlib:sodium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/sodium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/sodium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/sodium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/sodium_ingot_to_nugget.json index ffd4e2e7..c7969569 100644 --- a/src/generated/resources/data/chemlib/recipes/sodium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/sodium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:sodium_nugget" + "id": "chemlib:sodium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/sodium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/sodium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/sodium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/sodium_nugget_to_ingot.json index a0ee07bc..e457fa73 100644 --- a/src/generated/resources/data/chemlib/recipes/sodium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/sodium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:sodium_ingot" + "count": 1, + "id": "chemlib:sodium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/strontium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/strontium_block_to_ingot.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/strontium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/strontium_block_to_ingot.json index cf05e88e..f74538bf 100644 --- a/src/generated/resources/data/chemlib/recipes/strontium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/strontium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:strontium_ingot" + "id": "chemlib:strontium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/strontium_ingot_from_blasting_strontium_dust.json b/src/generated/resources/data/chemlib/recipe/strontium_ingot_from_blasting_strontium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/strontium_ingot_from_blasting_strontium_dust.json rename to src/generated/resources/data/chemlib/recipe/strontium_ingot_from_blasting_strontium_dust.json index f97b2441..cbb897cd 100644 --- a/src/generated/resources/data/chemlib/recipes/strontium_ingot_from_blasting_strontium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/strontium_ingot_from_blasting_strontium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:strontium_dust" }, - "result": "chemlib:strontium_ingot" + "result": { + "count": 1, + "id": "chemlib:strontium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/strontium_ingot_from_smelting_strontium_dust.json b/src/generated/resources/data/chemlib/recipe/strontium_ingot_from_smelting_strontium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/strontium_ingot_from_smelting_strontium_dust.json rename to src/generated/resources/data/chemlib/recipe/strontium_ingot_from_smelting_strontium_dust.json index f3392636..b0912bf7 100644 --- a/src/generated/resources/data/chemlib/recipes/strontium_ingot_from_smelting_strontium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/strontium_ingot_from_smelting_strontium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:strontium_dust" }, - "result": "chemlib:strontium_ingot" + "result": { + "count": 1, + "id": "chemlib:strontium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/strontium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/strontium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/strontium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/strontium_ingot_to_block.json index 52936e71..2fe7a153 100644 --- a/src/generated/resources/data/chemlib/recipes/strontium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/strontium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:strontium_metal_block" + "count": 1, + "id": "chemlib:strontium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/strontium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/strontium_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/strontium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/strontium_ingot_to_nugget.json index fd287d37..2c35ff67 100644 --- a/src/generated/resources/data/chemlib/recipes/strontium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/strontium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:strontium_nugget" + "id": "chemlib:strontium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/strontium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/strontium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/strontium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/strontium_nugget_to_ingot.json index 2375827c..d09338a5 100644 --- a/src/generated/resources/data/chemlib/recipes/strontium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/strontium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:strontium_ingot" + "count": 1, + "id": "chemlib:strontium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tantalum_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/tantalum_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/tantalum_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/tantalum_block_to_ingot.json index e9fd466b..1b8ea373 100644 --- a/src/generated/resources/data/chemlib/recipes/tantalum_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/tantalum_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:tantalum_ingot" + "id": "chemlib:tantalum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tantalum_ingot_from_blasting_tantalum_dust.json b/src/generated/resources/data/chemlib/recipe/tantalum_ingot_from_blasting_tantalum_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/tantalum_ingot_from_blasting_tantalum_dust.json rename to src/generated/resources/data/chemlib/recipe/tantalum_ingot_from_blasting_tantalum_dust.json index 60fe11c2..f9c312f4 100644 --- a/src/generated/resources/data/chemlib/recipes/tantalum_ingot_from_blasting_tantalum_dust.json +++ b/src/generated/resources/data/chemlib/recipe/tantalum_ingot_from_blasting_tantalum_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:tantalum_dust" }, - "result": "chemlib:tantalum_ingot" + "result": { + "count": 1, + "id": "chemlib:tantalum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tantalum_ingot_from_smelting_tantalum_dust.json b/src/generated/resources/data/chemlib/recipe/tantalum_ingot_from_smelting_tantalum_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/tantalum_ingot_from_smelting_tantalum_dust.json rename to src/generated/resources/data/chemlib/recipe/tantalum_ingot_from_smelting_tantalum_dust.json index d2eea9f0..79fd44cc 100644 --- a/src/generated/resources/data/chemlib/recipes/tantalum_ingot_from_smelting_tantalum_dust.json +++ b/src/generated/resources/data/chemlib/recipe/tantalum_ingot_from_smelting_tantalum_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:tantalum_dust" }, - "result": "chemlib:tantalum_ingot" + "result": { + "count": 1, + "id": "chemlib:tantalum_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tantalum_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/tantalum_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/tantalum_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/tantalum_ingot_to_block.json index 0d78022f..50366764 100644 --- a/src/generated/resources/data/chemlib/recipes/tantalum_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/tantalum_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:tantalum_metal_block" + "count": 1, + "id": "chemlib:tantalum_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tantalum_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/tantalum_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/tantalum_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/tantalum_ingot_to_nugget.json index 8d0b0964..8600f694 100644 --- a/src/generated/resources/data/chemlib/recipes/tantalum_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/tantalum_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:tantalum_nugget" + "id": "chemlib:tantalum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tantalum_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/tantalum_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/tantalum_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/tantalum_nugget_to_ingot.json index 64485ac9..394fcd66 100644 --- a/src/generated/resources/data/chemlib/recipes/tantalum_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/tantalum_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:tantalum_ingot" + "count": 1, + "id": "chemlib:tantalum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/terbium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/terbium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/terbium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/terbium_block_to_ingot.json index ef746c4c..bec554ff 100644 --- a/src/generated/resources/data/chemlib/recipes/terbium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/terbium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:terbium_ingot" + "id": "chemlib:terbium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/terbium_ingot_from_blasting_terbium_dust.json b/src/generated/resources/data/chemlib/recipe/terbium_ingot_from_blasting_terbium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/terbium_ingot_from_blasting_terbium_dust.json rename to src/generated/resources/data/chemlib/recipe/terbium_ingot_from_blasting_terbium_dust.json index 6e964848..a5433cfe 100644 --- a/src/generated/resources/data/chemlib/recipes/terbium_ingot_from_blasting_terbium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/terbium_ingot_from_blasting_terbium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:terbium_dust" }, - "result": "chemlib:terbium_ingot" + "result": { + "count": 1, + "id": "chemlib:terbium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/terbium_ingot_from_smelting_terbium_dust.json b/src/generated/resources/data/chemlib/recipe/terbium_ingot_from_smelting_terbium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/terbium_ingot_from_smelting_terbium_dust.json rename to src/generated/resources/data/chemlib/recipe/terbium_ingot_from_smelting_terbium_dust.json index 6ba5c184..17d0019c 100644 --- a/src/generated/resources/data/chemlib/recipes/terbium_ingot_from_smelting_terbium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/terbium_ingot_from_smelting_terbium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:terbium_dust" }, - "result": "chemlib:terbium_ingot" + "result": { + "count": 1, + "id": "chemlib:terbium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/terbium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/terbium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/terbium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/terbium_ingot_to_block.json index e39e3ffe..ae2c5872 100644 --- a/src/generated/resources/data/chemlib/recipes/terbium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/terbium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:terbium_metal_block" + "count": 1, + "id": "chemlib:terbium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/terbium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/terbium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/terbium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/terbium_ingot_to_nugget.json index db501518..80037da3 100644 --- a/src/generated/resources/data/chemlib/recipes/terbium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/terbium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:terbium_nugget" + "id": "chemlib:terbium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/terbium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/terbium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/terbium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/terbium_nugget_to_ingot.json index 088192c9..c5b44ffd 100644 --- a/src/generated/resources/data/chemlib/recipes/terbium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/terbium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:terbium_ingot" + "count": 1, + "id": "chemlib:terbium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thallium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/thallium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/thallium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/thallium_block_to_ingot.json index 8511df0f..30294655 100644 --- a/src/generated/resources/data/chemlib/recipes/thallium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/thallium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:thallium_ingot" + "id": "chemlib:thallium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thallium_ingot_from_blasting_thallium_dust.json b/src/generated/resources/data/chemlib/recipe/thallium_ingot_from_blasting_thallium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/thallium_ingot_from_blasting_thallium_dust.json rename to src/generated/resources/data/chemlib/recipe/thallium_ingot_from_blasting_thallium_dust.json index c58ec2cc..436b2b96 100644 --- a/src/generated/resources/data/chemlib/recipes/thallium_ingot_from_blasting_thallium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/thallium_ingot_from_blasting_thallium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:thallium_dust" }, - "result": "chemlib:thallium_ingot" + "result": { + "count": 1, + "id": "chemlib:thallium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thallium_ingot_from_smelting_thallium_dust.json b/src/generated/resources/data/chemlib/recipe/thallium_ingot_from_smelting_thallium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/thallium_ingot_from_smelting_thallium_dust.json rename to src/generated/resources/data/chemlib/recipe/thallium_ingot_from_smelting_thallium_dust.json index 434e5a9c..050fd532 100644 --- a/src/generated/resources/data/chemlib/recipes/thallium_ingot_from_smelting_thallium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/thallium_ingot_from_smelting_thallium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:thallium_dust" }, - "result": "chemlib:thallium_ingot" + "result": { + "count": 1, + "id": "chemlib:thallium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thallium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/thallium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/thallium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/thallium_ingot_to_block.json index eac8c66a..37e9969b 100644 --- a/src/generated/resources/data/chemlib/recipes/thallium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/thallium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:thallium_metal_block" + "count": 1, + "id": "chemlib:thallium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thallium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/thallium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/thallium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/thallium_ingot_to_nugget.json index 0ec0800c..579d2c22 100644 --- a/src/generated/resources/data/chemlib/recipes/thallium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/thallium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:thallium_nugget" + "id": "chemlib:thallium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thallium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/thallium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/thallium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/thallium_nugget_to_ingot.json index 41b0d8a8..17360b18 100644 --- a/src/generated/resources/data/chemlib/recipes/thallium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/thallium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:thallium_ingot" + "count": 1, + "id": "chemlib:thallium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thorium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/thorium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/thorium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/thorium_block_to_ingot.json index b9f11c50..a0ecb0e9 100644 --- a/src/generated/resources/data/chemlib/recipes/thorium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/thorium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:thorium_ingot" + "id": "chemlib:thorium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thorium_ingot_from_blasting_thorium_dust.json b/src/generated/resources/data/chemlib/recipe/thorium_ingot_from_blasting_thorium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/thorium_ingot_from_blasting_thorium_dust.json rename to src/generated/resources/data/chemlib/recipe/thorium_ingot_from_blasting_thorium_dust.json index 1e8876ef..873e1b19 100644 --- a/src/generated/resources/data/chemlib/recipes/thorium_ingot_from_blasting_thorium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/thorium_ingot_from_blasting_thorium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:thorium_dust" }, - "result": "chemlib:thorium_ingot" + "result": { + "count": 1, + "id": "chemlib:thorium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thorium_ingot_from_smelting_thorium_dust.json b/src/generated/resources/data/chemlib/recipe/thorium_ingot_from_smelting_thorium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/thorium_ingot_from_smelting_thorium_dust.json rename to src/generated/resources/data/chemlib/recipe/thorium_ingot_from_smelting_thorium_dust.json index 99c5121c..aede87b0 100644 --- a/src/generated/resources/data/chemlib/recipes/thorium_ingot_from_smelting_thorium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/thorium_ingot_from_smelting_thorium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:thorium_dust" }, - "result": "chemlib:thorium_ingot" + "result": { + "count": 1, + "id": "chemlib:thorium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thorium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/thorium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/thorium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/thorium_ingot_to_block.json index 557e7881..277a1ad6 100644 --- a/src/generated/resources/data/chemlib/recipes/thorium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/thorium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:thorium_metal_block" + "count": 1, + "id": "chemlib:thorium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thorium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/thorium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/thorium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/thorium_ingot_to_nugget.json index f1761906..d577de2c 100644 --- a/src/generated/resources/data/chemlib/recipes/thorium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/thorium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:thorium_nugget" + "id": "chemlib:thorium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thorium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/thorium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/thorium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/thorium_nugget_to_ingot.json index e93f6d79..b4d25eef 100644 --- a/src/generated/resources/data/chemlib/recipes/thorium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/thorium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:thorium_ingot" + "count": 1, + "id": "chemlib:thorium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thulium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/thulium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/thulium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/thulium_block_to_ingot.json index 049e512c..80ff4aea 100644 --- a/src/generated/resources/data/chemlib/recipes/thulium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/thulium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:thulium_ingot" + "id": "chemlib:thulium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thulium_ingot_from_blasting_thulium_dust.json b/src/generated/resources/data/chemlib/recipe/thulium_ingot_from_blasting_thulium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/thulium_ingot_from_blasting_thulium_dust.json rename to src/generated/resources/data/chemlib/recipe/thulium_ingot_from_blasting_thulium_dust.json index e87b6dd3..d18b8979 100644 --- a/src/generated/resources/data/chemlib/recipes/thulium_ingot_from_blasting_thulium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/thulium_ingot_from_blasting_thulium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:thulium_dust" }, - "result": "chemlib:thulium_ingot" + "result": { + "count": 1, + "id": "chemlib:thulium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thulium_ingot_from_smelting_thulium_dust.json b/src/generated/resources/data/chemlib/recipe/thulium_ingot_from_smelting_thulium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/thulium_ingot_from_smelting_thulium_dust.json rename to src/generated/resources/data/chemlib/recipe/thulium_ingot_from_smelting_thulium_dust.json index 7e799874..d9bbb9ff 100644 --- a/src/generated/resources/data/chemlib/recipes/thulium_ingot_from_smelting_thulium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/thulium_ingot_from_smelting_thulium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:thulium_dust" }, - "result": "chemlib:thulium_ingot" + "result": { + "count": 1, + "id": "chemlib:thulium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thulium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/thulium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/thulium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/thulium_ingot_to_block.json index 329a342f..51e10e82 100644 --- a/src/generated/resources/data/chemlib/recipes/thulium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/thulium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:thulium_metal_block" + "count": 1, + "id": "chemlib:thulium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thulium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/thulium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/thulium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/thulium_ingot_to_nugget.json index 4df51984..489b3537 100644 --- a/src/generated/resources/data/chemlib/recipes/thulium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/thulium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:thulium_nugget" + "id": "chemlib:thulium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/thulium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/thulium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/thulium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/thulium_nugget_to_ingot.json index fa103c3d..a2eefc98 100644 --- a/src/generated/resources/data/chemlib/recipes/thulium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/thulium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:thulium_ingot" + "count": 1, + "id": "chemlib:thulium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tin_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/tin_block_to_ingot.json similarity index 84% rename from src/generated/resources/data/chemlib/recipes/tin_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/tin_block_to_ingot.json index f70d583e..0c50086a 100644 --- a/src/generated/resources/data/chemlib/recipes/tin_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/tin_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:tin_ingot" + "id": "chemlib:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tin_ingot_from_blasting_tin_dust.json b/src/generated/resources/data/chemlib/recipe/tin_ingot_from_blasting_tin_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/tin_ingot_from_blasting_tin_dust.json rename to src/generated/resources/data/chemlib/recipe/tin_ingot_from_blasting_tin_dust.json index 414314c2..74ce60cf 100644 --- a/src/generated/resources/data/chemlib/recipes/tin_ingot_from_blasting_tin_dust.json +++ b/src/generated/resources/data/chemlib/recipe/tin_ingot_from_blasting_tin_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:tin_dust" }, - "result": "chemlib:tin_ingot" + "result": { + "count": 1, + "id": "chemlib:tin_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tin_ingot_from_smelting_tin_dust.json b/src/generated/resources/data/chemlib/recipe/tin_ingot_from_smelting_tin_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/tin_ingot_from_smelting_tin_dust.json rename to src/generated/resources/data/chemlib/recipe/tin_ingot_from_smelting_tin_dust.json index 4507cdb1..88b3160a 100644 --- a/src/generated/resources/data/chemlib/recipes/tin_ingot_from_smelting_tin_dust.json +++ b/src/generated/resources/data/chemlib/recipe/tin_ingot_from_smelting_tin_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:tin_dust" }, - "result": "chemlib:tin_ingot" + "result": { + "count": 1, + "id": "chemlib:tin_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tin_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/tin_ingot_to_block.json similarity index 79% rename from src/generated/resources/data/chemlib/recipes/tin_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/tin_ingot_to_block.json index 68f63583..67b8cea0 100644 --- a/src/generated/resources/data/chemlib/recipes/tin_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/tin_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:tin_metal_block" + "count": 1, + "id": "chemlib:tin_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tin_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/tin_ingot_to_nugget.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/tin_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/tin_ingot_to_nugget.json index 3994b7b8..b94d8b36 100644 --- a/src/generated/resources/data/chemlib/recipes/tin_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/tin_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:tin_nugget" + "id": "chemlib:tin_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tin_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/tin_nugget_to_ingot.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/tin_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/tin_nugget_to_ingot.json index 2e69d05d..06ddc018 100644 --- a/src/generated/resources/data/chemlib/recipes/tin_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/tin_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:tin_ingot" + "count": 1, + "id": "chemlib:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/titanium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/titanium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/titanium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/titanium_block_to_ingot.json index 2d944ebf..908667e1 100644 --- a/src/generated/resources/data/chemlib/recipes/titanium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/titanium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:titanium_ingot" + "id": "chemlib:titanium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/titanium_ingot_from_blasting_titanium_dust.json b/src/generated/resources/data/chemlib/recipe/titanium_ingot_from_blasting_titanium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/titanium_ingot_from_blasting_titanium_dust.json rename to src/generated/resources/data/chemlib/recipe/titanium_ingot_from_blasting_titanium_dust.json index 509a20ba..d5d1be24 100644 --- a/src/generated/resources/data/chemlib/recipes/titanium_ingot_from_blasting_titanium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/titanium_ingot_from_blasting_titanium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:titanium_dust" }, - "result": "chemlib:titanium_ingot" + "result": { + "count": 1, + "id": "chemlib:titanium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/titanium_ingot_from_smelting_titanium_dust.json b/src/generated/resources/data/chemlib/recipe/titanium_ingot_from_smelting_titanium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/titanium_ingot_from_smelting_titanium_dust.json rename to src/generated/resources/data/chemlib/recipe/titanium_ingot_from_smelting_titanium_dust.json index 07444d45..32f1b3e2 100644 --- a/src/generated/resources/data/chemlib/recipes/titanium_ingot_from_smelting_titanium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/titanium_ingot_from_smelting_titanium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:titanium_dust" }, - "result": "chemlib:titanium_ingot" + "result": { + "count": 1, + "id": "chemlib:titanium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/titanium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/titanium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/titanium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/titanium_ingot_to_block.json index da2dfdce..2db3541e 100644 --- a/src/generated/resources/data/chemlib/recipes/titanium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/titanium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:titanium_metal_block" + "count": 1, + "id": "chemlib:titanium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/titanium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/titanium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/titanium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/titanium_ingot_to_nugget.json index 8d969496..bf59ba15 100644 --- a/src/generated/resources/data/chemlib/recipes/titanium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/titanium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:titanium_nugget" + "id": "chemlib:titanium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/titanium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/titanium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/titanium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/titanium_nugget_to_ingot.json index eeedd106..81133eba 100644 --- a/src/generated/resources/data/chemlib/recipes/titanium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/titanium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:titanium_ingot" + "count": 1, + "id": "chemlib:titanium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tungsten_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/tungsten_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/tungsten_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/tungsten_block_to_ingot.json index 030fe78d..0b520423 100644 --- a/src/generated/resources/data/chemlib/recipes/tungsten_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/tungsten_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:tungsten_ingot" + "id": "chemlib:tungsten_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tungsten_ingot_from_blasting_tungsten_dust.json b/src/generated/resources/data/chemlib/recipe/tungsten_ingot_from_blasting_tungsten_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/tungsten_ingot_from_blasting_tungsten_dust.json rename to src/generated/resources/data/chemlib/recipe/tungsten_ingot_from_blasting_tungsten_dust.json index b8cbf163..5c7be345 100644 --- a/src/generated/resources/data/chemlib/recipes/tungsten_ingot_from_blasting_tungsten_dust.json +++ b/src/generated/resources/data/chemlib/recipe/tungsten_ingot_from_blasting_tungsten_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:tungsten_dust" }, - "result": "chemlib:tungsten_ingot" + "result": { + "count": 1, + "id": "chemlib:tungsten_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tungsten_ingot_from_smelting_tungsten_dust.json b/src/generated/resources/data/chemlib/recipe/tungsten_ingot_from_smelting_tungsten_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/tungsten_ingot_from_smelting_tungsten_dust.json rename to src/generated/resources/data/chemlib/recipe/tungsten_ingot_from_smelting_tungsten_dust.json index eba64973..dac647d3 100644 --- a/src/generated/resources/data/chemlib/recipes/tungsten_ingot_from_smelting_tungsten_dust.json +++ b/src/generated/resources/data/chemlib/recipe/tungsten_ingot_from_smelting_tungsten_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:tungsten_dust" }, - "result": "chemlib:tungsten_ingot" + "result": { + "count": 1, + "id": "chemlib:tungsten_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tungsten_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/tungsten_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/tungsten_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/tungsten_ingot_to_block.json index 7ded50a8..5f9e53e4 100644 --- a/src/generated/resources/data/chemlib/recipes/tungsten_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/tungsten_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:tungsten_metal_block" + "count": 1, + "id": "chemlib:tungsten_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tungsten_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/tungsten_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/tungsten_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/tungsten_ingot_to_nugget.json index 71e52a3c..f8941013 100644 --- a/src/generated/resources/data/chemlib/recipes/tungsten_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/tungsten_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:tungsten_nugget" + "id": "chemlib:tungsten_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/tungsten_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/tungsten_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/tungsten_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/tungsten_nugget_to_ingot.json index 2ee0437a..243abaab 100644 --- a/src/generated/resources/data/chemlib/recipes/tungsten_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/tungsten_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:tungsten_ingot" + "count": 1, + "id": "chemlib:tungsten_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/uranium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/uranium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/uranium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/uranium_block_to_ingot.json index 2bc54abe..85cb7c0d 100644 --- a/src/generated/resources/data/chemlib/recipes/uranium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/uranium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:uranium_ingot" + "id": "chemlib:uranium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/uranium_ingot_from_blasting_uranium_dust.json b/src/generated/resources/data/chemlib/recipe/uranium_ingot_from_blasting_uranium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/uranium_ingot_from_blasting_uranium_dust.json rename to src/generated/resources/data/chemlib/recipe/uranium_ingot_from_blasting_uranium_dust.json index 08d330fd..9d106c56 100644 --- a/src/generated/resources/data/chemlib/recipes/uranium_ingot_from_blasting_uranium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/uranium_ingot_from_blasting_uranium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:uranium_dust" }, - "result": "chemlib:uranium_ingot" + "result": { + "count": 1, + "id": "chemlib:uranium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/uranium_ingot_from_smelting_uranium_dust.json b/src/generated/resources/data/chemlib/recipe/uranium_ingot_from_smelting_uranium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/uranium_ingot_from_smelting_uranium_dust.json rename to src/generated/resources/data/chemlib/recipe/uranium_ingot_from_smelting_uranium_dust.json index d3ceb77c..c464554a 100644 --- a/src/generated/resources/data/chemlib/recipes/uranium_ingot_from_smelting_uranium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/uranium_ingot_from_smelting_uranium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:uranium_dust" }, - "result": "chemlib:uranium_ingot" + "result": { + "count": 1, + "id": "chemlib:uranium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/uranium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/uranium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/uranium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/uranium_ingot_to_block.json index fa4ee6c5..1c04f6b3 100644 --- a/src/generated/resources/data/chemlib/recipes/uranium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/uranium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:uranium_metal_block" + "count": 1, + "id": "chemlib:uranium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/uranium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/uranium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/uranium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/uranium_ingot_to_nugget.json index 7843f9da..7f3e6e80 100644 --- a/src/generated/resources/data/chemlib/recipes/uranium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/uranium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:uranium_nugget" + "id": "chemlib:uranium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/uranium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/uranium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/uranium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/uranium_nugget_to_ingot.json index b51772a8..e9d4ad65 100644 --- a/src/generated/resources/data/chemlib/recipes/uranium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/uranium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:uranium_ingot" + "count": 1, + "id": "chemlib:uranium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/vanadium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/vanadium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/vanadium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/vanadium_block_to_ingot.json index d417edc8..361007ab 100644 --- a/src/generated/resources/data/chemlib/recipes/vanadium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/vanadium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:vanadium_ingot" + "id": "chemlib:vanadium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/vanadium_ingot_from_blasting_vanadium_dust.json b/src/generated/resources/data/chemlib/recipe/vanadium_ingot_from_blasting_vanadium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/vanadium_ingot_from_blasting_vanadium_dust.json rename to src/generated/resources/data/chemlib/recipe/vanadium_ingot_from_blasting_vanadium_dust.json index ce619fa7..849d739a 100644 --- a/src/generated/resources/data/chemlib/recipes/vanadium_ingot_from_blasting_vanadium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/vanadium_ingot_from_blasting_vanadium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:vanadium_dust" }, - "result": "chemlib:vanadium_ingot" + "result": { + "count": 1, + "id": "chemlib:vanadium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/vanadium_ingot_from_smelting_vanadium_dust.json b/src/generated/resources/data/chemlib/recipe/vanadium_ingot_from_smelting_vanadium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/vanadium_ingot_from_smelting_vanadium_dust.json rename to src/generated/resources/data/chemlib/recipe/vanadium_ingot_from_smelting_vanadium_dust.json index d298348a..3d54e48d 100644 --- a/src/generated/resources/data/chemlib/recipes/vanadium_ingot_from_smelting_vanadium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/vanadium_ingot_from_smelting_vanadium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:vanadium_dust" }, - "result": "chemlib:vanadium_ingot" + "result": { + "count": 1, + "id": "chemlib:vanadium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/vanadium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/vanadium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/vanadium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/vanadium_ingot_to_block.json index a1109e4c..c0c34208 100644 --- a/src/generated/resources/data/chemlib/recipes/vanadium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/vanadium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:vanadium_metal_block" + "count": 1, + "id": "chemlib:vanadium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/vanadium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/vanadium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/vanadium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/vanadium_ingot_to_nugget.json index 45acffb5..36121b84 100644 --- a/src/generated/resources/data/chemlib/recipes/vanadium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/vanadium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:vanadium_nugget" + "id": "chemlib:vanadium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/vanadium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/vanadium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/vanadium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/vanadium_nugget_to_ingot.json index c3dd763d..a5a2c1ce 100644 --- a/src/generated/resources/data/chemlib/recipes/vanadium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/vanadium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:vanadium_ingot" + "count": 1, + "id": "chemlib:vanadium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/xenon_lamp_block.json b/src/generated/resources/data/chemlib/recipe/xenon_lamp_block.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/xenon_lamp_block.json rename to src/generated/resources/data/chemlib/recipe/xenon_lamp_block.json index dc3649ce..0101dd13 100644 --- a/src/generated/resources/data/chemlib/recipes/xenon_lamp_block.json +++ b/src/generated/resources/data/chemlib/recipe/xenon_lamp_block.json @@ -6,7 +6,7 @@ "item": "chemlib:xenon" }, "G": { - "tag": "forge:glass" + "tag": "c:glass_blocks/cheap" } }, "pattern": [ @@ -15,6 +15,7 @@ "GEG" ], "result": { - "item": "chemlib:xenon_lamp_block" + "count": 1, + "id": "chemlib:xenon_lamp_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/ytterbium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/ytterbium_block_to_ingot.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/ytterbium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/ytterbium_block_to_ingot.json index 92ddbb87..6dcd30de 100644 --- a/src/generated/resources/data/chemlib/recipes/ytterbium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/ytterbium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:ytterbium_ingot" + "id": "chemlib:ytterbium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/ytterbium_ingot_from_blasting_ytterbium_dust.json b/src/generated/resources/data/chemlib/recipe/ytterbium_ingot_from_blasting_ytterbium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/ytterbium_ingot_from_blasting_ytterbium_dust.json rename to src/generated/resources/data/chemlib/recipe/ytterbium_ingot_from_blasting_ytterbium_dust.json index e3349730..b8ad8914 100644 --- a/src/generated/resources/data/chemlib/recipes/ytterbium_ingot_from_blasting_ytterbium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/ytterbium_ingot_from_blasting_ytterbium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:ytterbium_dust" }, - "result": "chemlib:ytterbium_ingot" + "result": { + "count": 1, + "id": "chemlib:ytterbium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/ytterbium_ingot_from_smelting_ytterbium_dust.json b/src/generated/resources/data/chemlib/recipe/ytterbium_ingot_from_smelting_ytterbium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/ytterbium_ingot_from_smelting_ytterbium_dust.json rename to src/generated/resources/data/chemlib/recipe/ytterbium_ingot_from_smelting_ytterbium_dust.json index 29eea448..eb895a5a 100644 --- a/src/generated/resources/data/chemlib/recipes/ytterbium_ingot_from_smelting_ytterbium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/ytterbium_ingot_from_smelting_ytterbium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:ytterbium_dust" }, - "result": "chemlib:ytterbium_ingot" + "result": { + "count": 1, + "id": "chemlib:ytterbium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/ytterbium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/ytterbium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/ytterbium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/ytterbium_ingot_to_block.json index a264e374..6588f6c2 100644 --- a/src/generated/resources/data/chemlib/recipes/ytterbium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/ytterbium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:ytterbium_metal_block" + "count": 1, + "id": "chemlib:ytterbium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/ytterbium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/ytterbium_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/ytterbium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/ytterbium_ingot_to_nugget.json index dc709552..60d488aa 100644 --- a/src/generated/resources/data/chemlib/recipes/ytterbium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/ytterbium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:ytterbium_nugget" + "id": "chemlib:ytterbium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/ytterbium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/ytterbium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/ytterbium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/ytterbium_nugget_to_ingot.json index b084616b..450cc81e 100644 --- a/src/generated/resources/data/chemlib/recipes/ytterbium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/ytterbium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:ytterbium_ingot" + "count": 1, + "id": "chemlib:ytterbium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/yttrium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/yttrium_block_to_ingot.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/yttrium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/yttrium_block_to_ingot.json index 36f5915e..d54b9761 100644 --- a/src/generated/resources/data/chemlib/recipes/yttrium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/yttrium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:yttrium_ingot" + "id": "chemlib:yttrium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/yttrium_ingot_from_blasting_yttrium_dust.json b/src/generated/resources/data/chemlib/recipe/yttrium_ingot_from_blasting_yttrium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/yttrium_ingot_from_blasting_yttrium_dust.json rename to src/generated/resources/data/chemlib/recipe/yttrium_ingot_from_blasting_yttrium_dust.json index e5b69ef2..8caa60f9 100644 --- a/src/generated/resources/data/chemlib/recipes/yttrium_ingot_from_blasting_yttrium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/yttrium_ingot_from_blasting_yttrium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:yttrium_dust" }, - "result": "chemlib:yttrium_ingot" + "result": { + "count": 1, + "id": "chemlib:yttrium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/yttrium_ingot_from_smelting_yttrium_dust.json b/src/generated/resources/data/chemlib/recipe/yttrium_ingot_from_smelting_yttrium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/yttrium_ingot_from_smelting_yttrium_dust.json rename to src/generated/resources/data/chemlib/recipe/yttrium_ingot_from_smelting_yttrium_dust.json index 01b1da97..ef3cd16d 100644 --- a/src/generated/resources/data/chemlib/recipes/yttrium_ingot_from_smelting_yttrium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/yttrium_ingot_from_smelting_yttrium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:yttrium_dust" }, - "result": "chemlib:yttrium_ingot" + "result": { + "count": 1, + "id": "chemlib:yttrium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/yttrium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/yttrium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/yttrium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/yttrium_ingot_to_block.json index 5be56e43..dc5ba4c3 100644 --- a/src/generated/resources/data/chemlib/recipes/yttrium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/yttrium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:yttrium_metal_block" + "count": 1, + "id": "chemlib:yttrium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/yttrium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/yttrium_ingot_to_nugget.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/yttrium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/yttrium_ingot_to_nugget.json index 62097550..285c1e18 100644 --- a/src/generated/resources/data/chemlib/recipes/yttrium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/yttrium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:yttrium_nugget" + "id": "chemlib:yttrium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/yttrium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/yttrium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/yttrium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/yttrium_nugget_to_ingot.json index bd845015..396dbb59 100644 --- a/src/generated/resources/data/chemlib/recipes/yttrium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/yttrium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:yttrium_ingot" + "count": 1, + "id": "chemlib:yttrium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/zinc_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/zinc_block_to_ingot.json similarity index 84% rename from src/generated/resources/data/chemlib/recipes/zinc_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/zinc_block_to_ingot.json index 988f4060..0d733c05 100644 --- a/src/generated/resources/data/chemlib/recipes/zinc_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/zinc_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:zinc_ingot" + "id": "chemlib:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/zinc_ingot_from_blasting_zinc_dust.json b/src/generated/resources/data/chemlib/recipe/zinc_ingot_from_blasting_zinc_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/zinc_ingot_from_blasting_zinc_dust.json rename to src/generated/resources/data/chemlib/recipe/zinc_ingot_from_blasting_zinc_dust.json index ac296854..5709df1d 100644 --- a/src/generated/resources/data/chemlib/recipes/zinc_ingot_from_blasting_zinc_dust.json +++ b/src/generated/resources/data/chemlib/recipe/zinc_ingot_from_blasting_zinc_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:zinc_dust" }, - "result": "chemlib:zinc_ingot" + "result": { + "count": 1, + "id": "chemlib:zinc_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/zinc_ingot_from_smelting_zinc_dust.json b/src/generated/resources/data/chemlib/recipe/zinc_ingot_from_smelting_zinc_dust.json similarity index 70% rename from src/generated/resources/data/chemlib/recipes/zinc_ingot_from_smelting_zinc_dust.json rename to src/generated/resources/data/chemlib/recipe/zinc_ingot_from_smelting_zinc_dust.json index cffd8777..dc966fc0 100644 --- a/src/generated/resources/data/chemlib/recipes/zinc_ingot_from_smelting_zinc_dust.json +++ b/src/generated/resources/data/chemlib/recipe/zinc_ingot_from_smelting_zinc_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:zinc_dust" }, - "result": "chemlib:zinc_ingot" + "result": { + "count": 1, + "id": "chemlib:zinc_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/zinc_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/zinc_ingot_to_block.json similarity index 79% rename from src/generated/resources/data/chemlib/recipes/zinc_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/zinc_ingot_to_block.json index 93ca92d2..a83e3281 100644 --- a/src/generated/resources/data/chemlib/recipes/zinc_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/zinc_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:zinc_metal_block" + "count": 1, + "id": "chemlib:zinc_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/zinc_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/zinc_ingot_to_nugget.json similarity index 83% rename from src/generated/resources/data/chemlib/recipes/zinc_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/zinc_ingot_to_nugget.json index e634e66c..292033ff 100644 --- a/src/generated/resources/data/chemlib/recipes/zinc_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/zinc_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:zinc_nugget" + "id": "chemlib:zinc_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/zinc_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/zinc_nugget_to_ingot.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/zinc_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/zinc_nugget_to_ingot.json index 9b0cc8cc..d2a45b94 100644 --- a/src/generated/resources/data/chemlib/recipes/zinc_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/zinc_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:zinc_ingot" + "count": 1, + "id": "chemlib:zinc_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/zirconium_block_to_ingot.json b/src/generated/resources/data/chemlib/recipe/zirconium_block_to_ingot.json similarity index 82% rename from src/generated/resources/data/chemlib/recipes/zirconium_block_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/zirconium_block_to_ingot.json index 6b138a63..8633ea2c 100644 --- a/src/generated/resources/data/chemlib/recipes/zirconium_block_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/zirconium_block_to_ingot.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:zirconium_ingot" + "id": "chemlib:zirconium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/zirconium_ingot_from_blasting_zirconium_dust.json b/src/generated/resources/data/chemlib/recipe/zirconium_ingot_from_blasting_zirconium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/zirconium_ingot_from_blasting_zirconium_dust.json rename to src/generated/resources/data/chemlib/recipe/zirconium_ingot_from_blasting_zirconium_dust.json index 6dd9138d..8aae9187 100644 --- a/src/generated/resources/data/chemlib/recipes/zirconium_ingot_from_blasting_zirconium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/zirconium_ingot_from_blasting_zirconium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:zirconium_dust" }, - "result": "chemlib:zirconium_ingot" + "result": { + "count": 1, + "id": "chemlib:zirconium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/zirconium_ingot_from_smelting_zirconium_dust.json b/src/generated/resources/data/chemlib/recipe/zirconium_ingot_from_smelting_zirconium_dust.json similarity index 69% rename from src/generated/resources/data/chemlib/recipes/zirconium_ingot_from_smelting_zirconium_dust.json rename to src/generated/resources/data/chemlib/recipe/zirconium_ingot_from_smelting_zirconium_dust.json index 04889826..382fcdea 100644 --- a/src/generated/resources/data/chemlib/recipes/zirconium_ingot_from_smelting_zirconium_dust.json +++ b/src/generated/resources/data/chemlib/recipe/zirconium_ingot_from_smelting_zirconium_dust.json @@ -6,5 +6,8 @@ "ingredient": { "item": "chemlib:zirconium_dust" }, - "result": "chemlib:zirconium_ingot" + "result": { + "count": 1, + "id": "chemlib:zirconium_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/zirconium_ingot_to_block.json b/src/generated/resources/data/chemlib/recipe/zirconium_ingot_to_block.json similarity index 78% rename from src/generated/resources/data/chemlib/recipes/zirconium_ingot_to_block.json rename to src/generated/resources/data/chemlib/recipe/zirconium_ingot_to_block.json index 2cafee57..4047df4e 100644 --- a/src/generated/resources/data/chemlib/recipes/zirconium_ingot_to_block.json +++ b/src/generated/resources/data/chemlib/recipe/zirconium_ingot_to_block.json @@ -12,6 +12,7 @@ "III" ], "result": { - "item": "chemlib:zirconium_metal_block" + "count": 1, + "id": "chemlib:zirconium_metal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/zirconium_ingot_to_nugget.json b/src/generated/resources/data/chemlib/recipe/zirconium_ingot_to_nugget.json similarity index 81% rename from src/generated/resources/data/chemlib/recipes/zirconium_ingot_to_nugget.json rename to src/generated/resources/data/chemlib/recipe/zirconium_ingot_to_nugget.json index ce8aa59d..04cda7c6 100644 --- a/src/generated/resources/data/chemlib/recipes/zirconium_ingot_to_nugget.json +++ b/src/generated/resources/data/chemlib/recipe/zirconium_ingot_to_nugget.json @@ -8,6 +8,6 @@ ], "result": { "count": 9, - "item": "chemlib:zirconium_nugget" + "id": "chemlib:zirconium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/chemlib/recipes/zirconium_nugget_to_ingot.json b/src/generated/resources/data/chemlib/recipe/zirconium_nugget_to_ingot.json similarity index 80% rename from src/generated/resources/data/chemlib/recipes/zirconium_nugget_to_ingot.json rename to src/generated/resources/data/chemlib/recipe/zirconium_nugget_to_ingot.json index b1166ca6..06e42a45 100644 --- a/src/generated/resources/data/chemlib/recipes/zirconium_nugget_to_ingot.json +++ b/src/generated/resources/data/chemlib/recipe/zirconium_nugget_to_ingot.json @@ -12,6 +12,7 @@ "NNN" ], "result": { - "item": "chemlib:zirconium_ingot" + "count": 1, + "id": "chemlib:zirconium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json rename to src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json diff --git a/src/main/java/com/smashingmods/chemlib/ChemLib.java b/src/main/java/com/smashingmods/chemlib/ChemLib.java index 4b91f292..165dbead 100644 --- a/src/main/java/com/smashingmods/chemlib/ChemLib.java +++ b/src/main/java/com/smashingmods/chemlib/ChemLib.java @@ -3,13 +3,12 @@ import com.smashingmods.chemlib.registry.Registry; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Style; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.config.ModConfig; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.fml.loading.FMLPaths; +import net.minecraft.resources.ResourceLocation; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.ModContainer; +import net.neoforged.fml.common.Mod; +import net.neoforged.fml.config.ModConfig; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -19,11 +18,13 @@ public class ChemLib { public static final Logger LOGGER = LogManager.getLogger(); public static final Style MOD_ID_TEXT_STYLE = Style.EMPTY.withFont(Style.DEFAULT_FONT).withItalic(true).withColor(ChatFormatting.BLUE); - public ChemLib() { - MinecraftForge.EVENT_BUS.register(this); - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); + public ChemLib(IEventBus modEventBus, ModContainer container) { Registry.register(modEventBus); - ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.COMMON_SPEC); - Config.loadConfig(Config.COMMON_SPEC, FMLPaths.CONFIGDIR.get().resolve("chemlib-common.toml")); + container.registerConfig(ModConfig.Type.COMMON, Config.COMMON_SPEC); +// Config.loadConfig(Config.COMMON_SPEC, FMLPaths.CONFIGDIR.get().resolve("chemlib-common.toml")); + } + + public static ResourceLocation modLoc(String path) { + return ResourceLocation.fromNamespaceAndPath(MODID, path); } } \ No newline at end of file diff --git a/src/main/java/com/smashingmods/chemlib/Config.java b/src/main/java/com/smashingmods/chemlib/Config.java index 9fe93254..a6b9ac3a 100644 --- a/src/main/java/com/smashingmods/chemlib/Config.java +++ b/src/main/java/com/smashingmods/chemlib/Config.java @@ -2,8 +2,8 @@ import com.electronwill.nightconfig.core.file.CommentedFileConfig; import com.electronwill.nightconfig.core.io.WritingMode; -import net.minecraftforge.common.ForgeConfigSpec; -import net.minecraftforge.common.ForgeConfigSpec.BooleanValue; +import net.neoforged.neoforge.common.ModConfigSpec; +import net.neoforged.neoforge.common.ModConfigSpec.BooleanValue; import org.apache.commons.lang3.tuple.Pair; import java.nio.file.Path; @@ -11,10 +11,10 @@ public class Config { public static final Common COMMON; - public static final ForgeConfigSpec COMMON_SPEC; + public static final ModConfigSpec COMMON_SPEC; static { - final Pair specPair = new ForgeConfigSpec.Builder().configure(Common::new); + final Pair specPair = new ModConfigSpec.Builder().configure(Common::new); COMMON = specPair.getLeft(); COMMON_SPEC = specPair.getRight(); } @@ -29,7 +29,7 @@ public static class Common { public static BooleanValue renderIngotAbbreviations; public static BooleanValue renderPlateAbbreviations; - public Common(ForgeConfigSpec.Builder builder) { + public Common(ModConfigSpec.Builder builder) { builder.comment(""" @@ -48,13 +48,13 @@ public Common(ForgeConfigSpec.Builder builder) { } } - public static void loadConfig(ForgeConfigSpec spec, Path path) { - final CommentedFileConfig configData = CommentedFileConfig.builder(path) - .sync() - .autosave() - .writingMode(WritingMode.REPLACE) - .build(); - configData.load(); - spec.setConfig(configData); - } +// public static void loadConfig(ModConfigSpec spec, Path path) { +// final CommentedFileConfig configData = CommentedFileConfig.builder(path) +// .sync() +// .autosave() +// .writingMode(WritingMode.REPLACE) +// .build(); +// configData.load(); +// spec.setConfig(configData); +// } } diff --git a/src/main/java/com/smashingmods/chemlib/api/Chemical.java b/src/main/java/com/smashingmods/chemlib/api/Chemical.java index c60c8dd1..d719fd2c 100644 --- a/src/main/java/com/smashingmods/chemlib/api/Chemical.java +++ b/src/main/java/com/smashingmods/chemlib/api/Chemical.java @@ -1,11 +1,12 @@ package com.smashingmods.chemlib.api; import com.smashingmods.chemlib.registry.FluidRegistry; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.level.ItemLike; -import net.minecraftforge.fluids.FluidType; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.neoforge.fluids.FluidType; +import net.neoforged.neoforge.registries.NeoForgeRegistries; import java.util.List; import java.util.Objects; @@ -26,10 +27,10 @@ public interface Chemical extends ItemLike { default Optional getFluidTypeReference() { Optional toReturn = FluidRegistry.getFluidTypeByName(getChemicalName()); if (toReturn.isEmpty()) { - toReturn = Optional.ofNullable(ForgeRegistries.FLUID_TYPES.get().getValue(ResourceLocation.tryParse(getChemicalName()))); + toReturn = Optional.ofNullable(NeoForgeRegistries.FLUID_TYPES.get(ResourceLocation.tryParse(getChemicalName()))); } if (toReturn.isEmpty()) { - toReturn = Optional.of(Objects.requireNonNull(ForgeRegistries.FLUIDS.getValue(ResourceLocation.tryParse(getChemicalName()))).getFluidType()); + toReturn = Optional.of(Objects.requireNonNull(BuiltInRegistries.FLUID.get(ResourceLocation.tryParse(getChemicalName()))).getFluidType()); } return toReturn; } diff --git a/src/main/java/com/smashingmods/chemlib/api/utility/FluidEffectsTooltipUtility.java b/src/main/java/com/smashingmods/chemlib/api/utility/FluidEffectsTooltipUtility.java index f08a66e9..f1b0e39d 100644 --- a/src/main/java/com/smashingmods/chemlib/api/utility/FluidEffectsTooltipUtility.java +++ b/src/main/java/com/smashingmods/chemlib/api/utility/FluidEffectsTooltipUtility.java @@ -1,26 +1,15 @@ package com.smashingmods.chemlib.api.utility; -import com.google.common.collect.Lists; import com.smashingmods.chemlib.registry.ItemRegistry; -import net.minecraft.ChatFormatting; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.chat.contents.LiteralContents; -import net.minecraft.network.chat.contents.TranslatableContents; -import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffectUtil; -import net.minecraft.world.entity.ai.attributes.Attribute; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.item.BucketItem; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.registries.ForgeRegistries; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.concurrent.atomic.AtomicReference; public class FluidEffectsTooltipUtility { @@ -28,7 +17,7 @@ public class FluidEffectsTooltipUtility { public static List getBucketEffectTooltipComponents(ItemStack pStack) { List componentList = new ArrayList<>(); - ForgeRegistries.FLUIDS.getResourceKey(((BucketItem) pStack.getItem()).getFluid()).ifPresent(fluidResourceKey -> { + BuiltInRegistries.FLUID.getResourceKey(((BucketItem) pStack.getItem()).content).ifPresent(fluidResourceKey -> { String chemicalName = StringUtils.removeEnd(fluidResourceKey.location().getPath(), "_fluid"); AtomicReference> effectList = new AtomicReference<>(); ItemRegistry.getElementByName(chemicalName).ifPresent(element -> effectList.set(element.getEffects())); @@ -39,62 +28,62 @@ public static List getBucketEffectTooltipComponents(ItemStack pStack) } public static void addTooltipEffects(List pEffects, List pTooltips) { - List> attributeModifierPairList = Lists.newArrayList(); - if (pEffects.isEmpty()) { - pTooltips.add(MutableComponent.create(new LiteralContents(" "))); - pTooltips.add(MutableComponent.create(new TranslatableContents("chemlib.effect.on_hit", null, TranslatableContents.NO_ARGS)).withStyle(ChatFormatting.UNDERLINE).append(":")); - pTooltips.add(Component.translatable("effect.none").withStyle(ChatFormatting.GRAY)); - } else { - pTooltips.add(MutableComponent.create(new LiteralContents(" "))); - pTooltips.add(MutableComponent.create(new TranslatableContents("chemlib.effect.on_hit", null, TranslatableContents.NO_ARGS)).withStyle(ChatFormatting.UNDERLINE).append(":")); - for (MobEffectInstance effectInstance : pEffects) { - MutableComponent mutableComponent = Component.translatable(effectInstance.getDescriptionId()); - MobEffect effect = effectInstance.getEffect(); - Map attributeModifierMap = effect.getAttributeModifiers(); - - if (!attributeModifierMap.isEmpty()) { - for (Map.Entry attributeModifierEntry : attributeModifierMap.entrySet()) { - AttributeModifier entryValue = attributeModifierEntry.getValue(); - AttributeModifier attributeModifier = new AttributeModifier(entryValue.getName(), effect.getAttributeModifierValue(effectInstance.getAmplifier(), entryValue), entryValue.getOperation()); - attributeModifierPairList.add(Pair.of(attributeModifierEntry.getKey(), attributeModifier)); - } - } - - if (effectInstance.getAmplifier() > 0 && effectInstance.getAmplifier() <= 20) { - mutableComponent = Component.translatable("potion.withAmplifier", mutableComponent, Component.translatable("potion.potency." + effectInstance.getAmplifier())); - } else { - mutableComponent = Component.translatable("potion.withDuration", mutableComponent, MobEffectUtil.formatDuration(effectInstance, 1.0F)); - } - pTooltips.add(mutableComponent.withStyle(effect.getCategory().getTooltipFormatting())); - } - } - - if (!attributeModifierPairList.isEmpty()) { - for (Pair attributeModifierPair : attributeModifierPairList) { - AttributeModifier attributeModifier = attributeModifierPair.getValue(); - - double baseModifierAmount = attributeModifier.getAmount(); - double finalModiferAmount; - - if (attributeModifier.getOperation() != AttributeModifier.Operation.MULTIPLY_BASE && attributeModifier.getOperation() != AttributeModifier.Operation.MULTIPLY_TOTAL) { - finalModiferAmount = attributeModifier.getAmount(); - } else { - finalModiferAmount = attributeModifier.getAmount() * 100.0D; - } - if (baseModifierAmount > 0.0D) { - pTooltips.add(Component.translatable(String.format("attribute.modifier.plus.%s", attributeModifier.getOperation().toValue()), - ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(finalModiferAmount), - Component.translatable(attributeModifierPair.getKey().getDescriptionId())) - .withStyle(ChatFormatting.BLUE)); - - } else if (baseModifierAmount < 0.0D) { - finalModiferAmount *= -1.0D; - pTooltips.add(Component.translatable(String.format("attribute.modifier.take.%s", attributeModifier.getOperation().toValue()), - ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(finalModiferAmount), - Component.translatable(attributeModifierPair.getKey().getDescriptionId())) - .withStyle(ChatFormatting.RED)); - } - } - } +// List> attributeModifierPairList = Lists.newArrayList(); +// if (pEffects.isEmpty()) { +// pTooltips.add(MutableComponent.create(new PlainTextContents.LiteralContents(" "))); +// pTooltips.add(MutableComponent.create(new TranslatableContents("chemlib.effect.on_hit", null, TranslatableContents.NO_ARGS)).withStyle(ChatFormatting.UNDERLINE).append(":")); +// pTooltips.add(Component.translatable("effect.none").withStyle(ChatFormatting.GRAY)); +// } else { +// pTooltips.add(MutableComponent.create(new PlainTextContents.LiteralContents(" "))); +// pTooltips.add(MutableComponent.create(new TranslatableContents("chemlib.effect.on_hit", null, TranslatableContents.NO_ARGS)).withStyle(ChatFormatting.UNDERLINE).append(":")); +// for (MobEffectInstance effectInstance : pEffects) { +// MutableComponent mutableComponent = Component.translatable(effectInstance.getDescriptionId()); +// MobEffect effect = effectInstance.getEffect(); +// Map attributeModifierMap = effect.getAttributeModifiers(); +// +// if (!attributeModifierMap.isEmpty()) { +// for (Map.Entry attributeModifierEntry : attributeModifierMap.entrySet()) { +// AttributeModifier entryValue = attributeModifierEntry.getValue(); +// AttributeModifier attributeModifier = new AttributeModifier(entryValue.getName(), effect.getAttributeModifierValue(effectInstance.getAmplifier(), entryValue), entryValue.getOperation()); +// attributeModifierPairList.add(Pair.of(attributeModifierEntry.getKey(), attributeModifier)); +// } +// } +// +// if (effectInstance.getAmplifier() > 0 && effectInstance.getAmplifier() <= 20) { +// mutableComponent = Component.translatable("potion.withAmplifier", mutableComponent, Component.translatable("potion.potency." + effectInstance.getAmplifier())); +// } else { +// mutableComponent = Component.translatable("potion.withDuration", mutableComponent, MobEffectUtil.formatDuration(effectInstance, 1.0F)); +// } +// pTooltips.add(mutableComponent.withStyle(effect.getCategory().getTooltipFormatting())); +// } +// } +// +// if (!attributeModifierPairList.isEmpty()) { +// for (Pair attributeModifierPair : attributeModifierPairList) { +// AttributeModifier attributeModifier = attributeModifierPair.getValue(); +// +// double baseModifierAmount = attributeModifier.getAmount(); +// double finalModiferAmount; +// +// if (attributeModifier.getOperation() != AttributeModifier.Operation.MULTIPLY_BASE && attributeModifier.getOperation() != AttributeModifier.Operation.MULTIPLY_TOTAL) { +// finalModiferAmount = attributeModifier.getAmount(); +// } else { +// finalModiferAmount = attributeModifier.getAmount() * 100.0D; +// } +// if (baseModifierAmount > 0.0D) { +// pTooltips.add(Component.translatable(String.format("attribute.modifier.plus.%s", attributeModifier.getOperation().toValue()), +// ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(finalModiferAmount), +// Component.translatable(attributeModifierPair.getKey().getDescriptionId())) +// .withStyle(ChatFormatting.BLUE)); +// +// } else if (baseModifierAmount < 0.0D) { +// finalModiferAmount *= -1.0D; +// pTooltips.add(Component.translatable(String.format("attribute.modifier.take.%s", attributeModifier.getOperation().toValue()), +// ItemStack.ATTRIBUTE_MODIFIER_FORMAT.format(finalModiferAmount), +// Component.translatable(attributeModifierPair.getKey().getDescriptionId())) +// .withStyle(ChatFormatting.RED)); +// } +// } +// } } } diff --git a/src/main/java/com/smashingmods/chemlib/client/AbbreviationRenderer.java b/src/main/java/com/smashingmods/chemlib/client/AbbreviationRenderer.java index 64fed605..8c87e795 100644 --- a/src/main/java/com/smashingmods/chemlib/client/AbbreviationRenderer.java +++ b/src/main/java/com/smashingmods/chemlib/client/AbbreviationRenderer.java @@ -18,11 +18,10 @@ import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.client.extensions.common.IClientItemExtensions; +import net.neoforged.neoforge.client.ClientHooks; +import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; import java.util.function.Consumer; import java.util.function.Supplier; @@ -55,23 +54,22 @@ public void renderByItem(ItemStack pStack, ItemDisplayContext pItemDisplayContex if (pStack.getItem() instanceof ElementItem elementItem) { switch (elementItem.getMatterState()) { case LIQUID -> - modelResourceLocation = new ModelResourceLocation(new ResourceLocation(ChemLib.MODID, "element_liquid_model"), "inventory"); + modelResourceLocation = ModelResourceLocation.standalone(ChemLib.modLoc("item/element_liquid_model")); case GAS -> - modelResourceLocation = new ModelResourceLocation(new ResourceLocation(ChemLib.MODID, "element_gas_model"), "inventory"); + modelResourceLocation = ModelResourceLocation.standalone(ChemLib.modLoc("item/element_gas_model")); default -> - modelResourceLocation = new ModelResourceLocation(new ResourceLocation(ChemLib.MODID, "element_solid_model"), "inventory"); + modelResourceLocation = ModelResourceLocation.standalone(ChemLib.modLoc("item/element_solid_model")); } } else if (pStack.getItem() instanceof ChemicalItem chemicalItem) { switch (chemicalItem.getItemType()) { - case DUST -> modelResourceLocation = new ModelResourceLocation(new ResourceLocation(ChemLib.MODID, "chemical_dust_model"), "inventory"); - case NUGGET -> modelResourceLocation = new ModelResourceLocation(new ResourceLocation(ChemLib.MODID, "chemical_nugget_model"), "inventory"); - case INGOT -> modelResourceLocation = new ModelResourceLocation(new ResourceLocation(ChemLib.MODID, "chemical_ingot_model"), "inventory"); - case PLATE -> modelResourceLocation = new ModelResourceLocation(new ResourceLocation(ChemLib.MODID, "chemical_plate_model"), "inventory"); + case DUST -> modelResourceLocation = ModelResourceLocation.standalone(ChemLib.modLoc("item/chemical_dust_model")); + case NUGGET -> modelResourceLocation = ModelResourceLocation.standalone(ChemLib.modLoc("item/chemical_nugget_model")); + case INGOT -> modelResourceLocation = ModelResourceLocation.standalone(ChemLib.modLoc("item/chemical_ingot_model")); + case PLATE -> modelResourceLocation = ModelResourceLocation.standalone(ChemLib.modLoc("item/chemical_plate_model")); } } if (modelResourceLocation != null) { - BakedModel bakedModel = Minecraft.getInstance().getItemRenderer().getItemModelShaper().getModelManager().getModel(modelResourceLocation); pPoseStack.pushPose(); @@ -122,7 +120,7 @@ public void renderByItem(ItemStack pStack, ItemDisplayContext pItemDisplayContex buffer, isGui ? 0xF000F0 : pPackedLight, isGui ? OverlayTexture.NO_OVERLAY : pPackedOverlay, - ForgeHooksClient.handleCameraTransforms(pPoseStack, bakedModel, pItemDisplayContext, false)); + ClientHooks.handleCameraTransforms(pPoseStack, bakedModel, pItemDisplayContext, false)); if (isGui) { ((MultiBufferSource.BufferSource) buffer).endBatch(); } diff --git a/src/main/java/com/smashingmods/chemlib/client/PeriodicTableScreen.java b/src/main/java/com/smashingmods/chemlib/client/PeriodicTableScreen.java index e8bb8382..10ba44e2 100644 --- a/src/main/java/com/smashingmods/chemlib/client/PeriodicTableScreen.java +++ b/src/main/java/com/smashingmods/chemlib/client/PeriodicTableScreen.java @@ -11,8 +11,8 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.contents.TranslatableContents; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.api.distmarker.OnlyIn; import javax.annotation.ParametersAreNonnullByDefault; @@ -21,7 +21,7 @@ @OnlyIn(Dist.CLIENT) public class PeriodicTableScreen extends Screen { - private static final ResourceLocation PERIODIC_TABLE = new ResourceLocation(ChemLib.MODID, "textures/gui/periodic_table.png"); + private static final ResourceLocation PERIODIC_TABLE = ChemLib.modLoc("textures/gui/periodic_table.png"); public PeriodicTableScreen() { super(MutableComponent.create(new TranslatableContents("item.chemlib.periodic_table", null, TranslatableContents.NO_ARGS))); @@ -29,6 +29,7 @@ public PeriodicTableScreen() { @Override public void render(GuiGraphics pGuiGraphics, int pMouseX, int pMouseY, float pPartialTick) { + super.render(pGuiGraphics, pMouseX, pMouseY, pPartialTick); int imageWidth = 2000; int imageHeight = 1016; @@ -90,11 +91,10 @@ public void render(GuiGraphics pGuiGraphics, int pMouseX, int pMouseY, float pPa y += boxHeight; } } - super.render(pGuiGraphics, pMouseX, pMouseY, pPartialTick); } private void drawElementTip(GuiGraphics pGuiGraphics, Element pElement) { - pGuiGraphics.blit(new ResourceLocation(ChemLib.MODID, String.format("textures/gui/elements/%s_tooltip.png", pElement.getChemicalName())), ((this.width - 276) / 2) - 55, ((this.height - (7 * 28)) / 2) - 30, 274, 80, 0, 0, 40, 40, 40, 40); + pGuiGraphics.blit(ChemLib.modLoc(String.format("textures/gui/elements/%s_tooltip.png", pElement.getChemicalName())), ((this.width - 276) / 2) - 55, ((this.height - (7 * 28)) / 2) - 30, 274, 80, 0, 0, 40, 40, 40, 40); } @Override diff --git a/src/main/java/com/smashingmods/chemlib/client/events/ClientEventHandler.java b/src/main/java/com/smashingmods/chemlib/client/events/ClientEventHandler.java index a9afce1f..2bdad43b 100644 --- a/src/main/java/com/smashingmods/chemlib/client/events/ClientEventHandler.java +++ b/src/main/java/com/smashingmods/chemlib/client/events/ClientEventHandler.java @@ -7,17 +7,16 @@ import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.ModelEvent; -import net.minecraftforge.client.event.RegisterColorHandlersEvent; -import net.minecraftforge.client.model.DynamicFluidContainerModel; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; +import net.neoforged.neoforge.client.event.ModelEvent; +import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent; +import net.neoforged.neoforge.client.model.DynamicFluidContainerModel; -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT, modid = ChemLib.MODID) +@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT, modid = ChemLib.MODID) public class ClientEventHandler { @SubscribeEvent @@ -44,12 +43,12 @@ public static void onBlockColorHandlerEvent(final RegisterColorHandlersEvent.Blo @SubscribeEvent public static void onModelRegister(ModelEvent.RegisterAdditional event) { - event.register(new ModelResourceLocation(new ResourceLocation(ChemLib.MODID, "element_solid_model"), "inventory")); - event.register(new ModelResourceLocation(new ResourceLocation(ChemLib.MODID, "element_liquid_model"), "inventory")); - event.register(new ModelResourceLocation(new ResourceLocation(ChemLib.MODID, "element_gas_model"), "inventory")); - event.register(new ModelResourceLocation(new ResourceLocation(ChemLib.MODID, "chemical_dust_model"), "inventory")); - event.register(new ModelResourceLocation(new ResourceLocation(ChemLib.MODID, "chemical_nugget_model"), "inventory")); - event.register(new ModelResourceLocation(new ResourceLocation(ChemLib.MODID, "chemical_ingot_model"), "inventory")); - event.register(new ModelResourceLocation(new ResourceLocation(ChemLib.MODID, "chemical_plate_model"), "inventory")); + event.register(ModelResourceLocation.standalone(ChemLib.modLoc("item/element_solid_model"))); + event.register(ModelResourceLocation.standalone(ChemLib.modLoc("item/element_liquid_model"))); + event.register(ModelResourceLocation.standalone(ChemLib.modLoc("item/element_gas_model"))); + event.register(ModelResourceLocation.standalone(ChemLib.modLoc("item/chemical_dust_model"))); + event.register(ModelResourceLocation.standalone(ChemLib.modLoc("item/chemical_nugget_model"))); + event.register(ModelResourceLocation.standalone(ChemLib.modLoc("item/chemical_ingot_model"))); + event.register(ModelResourceLocation.standalone(ChemLib.modLoc("item/chemical_plate_model"))); } } \ No newline at end of file diff --git a/src/main/java/com/smashingmods/chemlib/client/events/ForgeEventHandler.java b/src/main/java/com/smashingmods/chemlib/client/events/NeoForgeEventHandler.java similarity index 57% rename from src/main/java/com/smashingmods/chemlib/client/events/ForgeEventHandler.java rename to src/main/java/com/smashingmods/chemlib/client/events/NeoForgeEventHandler.java index 1a283e41..35cd6e88 100644 --- a/src/main/java/com/smashingmods/chemlib/client/events/ForgeEventHandler.java +++ b/src/main/java/com/smashingmods/chemlib/client/events/NeoForgeEventHandler.java @@ -3,28 +3,28 @@ import com.mojang.datafixers.util.Either; import com.smashingmods.chemlib.ChemLib; import com.smashingmods.chemlib.api.utility.FluidEffectsTooltipUtility; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.FormattedText; import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.chat.contents.LiteralContents; +import net.minecraft.network.chat.contents.PlainTextContents; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.BucketItem; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.RenderTooltipEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.client.event.RenderTooltipEvent; import org.apache.commons.lang3.StringUtils; import java.util.function.Function; -@Mod.EventBusSubscriber(modid = ChemLib.MODID, bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT) -public class ForgeEventHandler { +@EventBusSubscriber(modid = ChemLib.MODID, bus = EventBusSubscriber.Bus.GAME, value = Dist.CLIENT) +public class NeoForgeEventHandler { @SubscribeEvent public static void onRenderTooltip(RenderTooltipEvent.GatherComponents event) { if (event.getItemStack().getItem() instanceof BucketItem bucket - && ForgeRegistries.FLUIDS.getResourceKey(bucket.getFluid()).isPresent() - && ForgeRegistries.FLUIDS.getResourceKey(bucket.getFluid()).get().location().getNamespace().equals(ChemLib.MODID)) { + && BuiltInRegistries.FLUID.getResourceKey(bucket.content).isPresent() + && BuiltInRegistries.FLUID.getResourceKey(bucket.content).get().location().getNamespace().equals(ChemLib.MODID)) { gatherTooltipComponents(event, bucket); } @@ -36,7 +36,7 @@ public static void gatherTooltipComponents(RenderTooltipEvent.GatherComponents e for (FormattedText textElement : FluidEffectsTooltipUtility.getBucketEffectTooltipComponents(event.getItemStack())) { event.getTooltipElements().add(formattedTextFunction.apply(textElement)); } - String namespace = ForgeRegistries.FLUIDS.getResourceKey(bucket.getFluid()).get().location().getNamespace(); - event.getTooltipElements().add(formattedTextFunction.apply(MutableComponent.create(new LiteralContents(StringUtils.capitalize(namespace))).withStyle(ChemLib.MOD_ID_TEXT_STYLE))); + String namespace = BuiltInRegistries.FLUID.getResourceKey(bucket.content).get().location().getNamespace(); + event.getTooltipElements().add(formattedTextFunction.apply(MutableComponent.create(new PlainTextContents.LiteralContents(StringUtils.capitalize(namespace))).withStyle(ChemLib.MOD_ID_TEXT_STYLE))); } } \ No newline at end of file diff --git a/src/main/java/com/smashingmods/chemlib/client/jei/JEIPlugin.java b/src/main/java/com/smashingmods/chemlib/client/jei/JEIPlugin.java index ccf79d69..32c97eba 100644 --- a/src/main/java/com/smashingmods/chemlib/client/jei/JEIPlugin.java +++ b/src/main/java/com/smashingmods/chemlib/client/jei/JEIPlugin.java @@ -16,7 +16,7 @@ public class JEIPlugin implements IModPlugin { @Override public ResourceLocation getPluginUid() { - return new ResourceLocation(ChemLib.MODID, "jei_plugin"); + return ChemLib.modLoc("jei_plugin"); } @Override diff --git a/src/main/java/com/smashingmods/chemlib/common/blocks/ChemicalBlock.java b/src/main/java/com/smashingmods/chemlib/common/blocks/ChemicalBlock.java index 47c02f45..995503eb 100644 --- a/src/main/java/com/smashingmods/chemlib/common/blocks/ChemicalBlock.java +++ b/src/main/java/com/smashingmods/chemlib/common/blocks/ChemicalBlock.java @@ -4,12 +4,12 @@ import com.smashingmods.chemlib.api.ChemicalBlockType; import com.smashingmods.chemlib.api.MatterState; import net.minecraft.client.color.block.BlockColor; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraftforge.registries.ForgeRegistries; import java.util.List; import java.util.Objects; @@ -27,7 +27,7 @@ public ChemicalBlock(ResourceLocation pChemical, ChemicalBlockType pBlockType, L } public Chemical getChemical() { - return (Chemical) Objects.requireNonNull(ForgeRegistries.ITEMS.getValue(chemical)); + return (Chemical) Objects.requireNonNull(BuiltInRegistries.ITEM.get(chemical)); } public ChemicalBlockType getBlockType() { diff --git a/src/main/java/com/smashingmods/chemlib/common/blocks/ChemicalLiquidBlock.java b/src/main/java/com/smashingmods/chemlib/common/blocks/ChemicalLiquidBlock.java index af0f3560..384d299f 100644 --- a/src/main/java/com/smashingmods/chemlib/common/blocks/ChemicalLiquidBlock.java +++ b/src/main/java/com/smashingmods/chemlib/common/blocks/ChemicalLiquidBlock.java @@ -16,13 +16,12 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Supplier; public class ChemicalLiquidBlock extends LiquidBlock { private final String chemicalName; - public ChemicalLiquidBlock(Supplier pFluid, String pChemicalName) { + public ChemicalLiquidBlock(FlowingFluid pFluid, String pChemicalName) { super(pFluid, BlockBehaviour.Properties.of().mapColor(MapColor.WATER).replaceable().pushReaction(PushReaction.DESTROY).liquid()); this.chemicalName = pChemicalName; } diff --git a/src/main/java/com/smashingmods/chemlib/common/items/ChemicalBlockItem.java b/src/main/java/com/smashingmods/chemlib/common/items/ChemicalBlockItem.java index eda2a7e7..68a3b9ee 100644 --- a/src/main/java/com/smashingmods/chemlib/common/items/ChemicalBlockItem.java +++ b/src/main/java/com/smashingmods/chemlib/common/items/ChemicalBlockItem.java @@ -7,16 +7,14 @@ import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.chat.contents.LiteralContents; +import net.minecraft.network.chat.contents.PlainTextContents; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.api.distmarker.OnlyIn; -import javax.annotation.Nullable; import java.util.List; public class ChemicalBlockItem extends BlockItem implements Chemical { @@ -29,10 +27,10 @@ public ChemicalBlockItem(ChemicalBlock pBlock, Properties pProperties) { } @OnlyIn(Dist.CLIENT) - public void appendHoverText(ItemStack pStack, @Nullable Level pLevel, List pTooltipComponents, TooltipFlag pIsAdvanced) { + public void appendHoverText(ItemStack stack, TooltipContext context, List pTooltipComponents, TooltipFlag tooltipFlag) { if (getChemical() instanceof Element element) { - pTooltipComponents.add(MutableComponent.create(new LiteralContents(String.format("%s (%d)", getAbbreviation(), element.getAtomicNumber()))).withStyle(ChatFormatting.DARK_AQUA)); - pTooltipComponents.add(MutableComponent.create(new LiteralContents(element.getGroupName())).withStyle(ChatFormatting.GRAY)); + pTooltipComponents.add(MutableComponent.create(new PlainTextContents.LiteralContents(String.format("%s (%d)", getAbbreviation(), element.getAtomicNumber()))).withStyle(ChatFormatting.DARK_AQUA)); + pTooltipComponents.add(MutableComponent.create(new PlainTextContents.LiteralContents(element.getGroupName())).withStyle(ChatFormatting.GRAY)); } } diff --git a/src/main/java/com/smashingmods/chemlib/common/items/ChemicalItem.java b/src/main/java/com/smashingmods/chemlib/common/items/ChemicalItem.java index aa7f621b..72722c9d 100644 --- a/src/main/java/com/smashingmods/chemlib/common/items/ChemicalItem.java +++ b/src/main/java/com/smashingmods/chemlib/common/items/ChemicalItem.java @@ -7,23 +7,21 @@ import com.smashingmods.chemlib.api.MatterState; import com.smashingmods.chemlib.client.AbbreviationRenderer; import net.minecraft.ChatFormatting; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.chat.contents.LiteralContents; +import net.minecraft.network.chat.contents.PlainTextContents; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.extensions.common.IClientItemExtensions; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.api.distmarker.OnlyIn; +import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; import org.apache.commons.lang3.StringUtils; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.List; import java.util.Objects; import java.util.function.Consumer; @@ -40,24 +38,24 @@ public ChemicalItem(Chemical pChemical, ChemicalItemType pChemicalItemType, Item } public ChemicalItem(ResourceLocation pResourceLocation, ChemicalItemType pChemicalItemType, Item.Properties pProperties) { - this((Chemical) Objects.requireNonNull(ForgeRegistries.ITEMS.getValue(pResourceLocation)), pChemicalItemType, pProperties); + this((Chemical) Objects.requireNonNull(BuiltInRegistries.ITEM.get(pResourceLocation)), pChemicalItemType, pProperties); } @OnlyIn(Dist.CLIENT) - public void appendHoverText(ItemStack pStack, @Nullable Level pLevel, List pTooltipComponents, TooltipFlag pIsAdvanced) { + public void appendHoverText(ItemStack stack, TooltipContext context, List pTooltipComponents, TooltipFlag tooltipFlag) { if (getChemical() instanceof Element element) { - pTooltipComponents.add(MutableComponent.create(new LiteralContents(String.format("%s (%d)", getAbbreviation(), element.getAtomicNumber()))).withStyle(ChatFormatting.DARK_AQUA)); - pTooltipComponents.add(MutableComponent.create(new LiteralContents(element.getGroupName())).withStyle(ChatFormatting.GRAY)); + pTooltipComponents.add(MutableComponent.create(new PlainTextContents.LiteralContents(String.format("%s (%d)", getAbbreviation(), element.getAtomicNumber()))).withStyle(ChatFormatting.DARK_AQUA)); + pTooltipComponents.add(MutableComponent.create(new PlainTextContents.LiteralContents(element.getGroupName())).withStyle(ChatFormatting.GRAY)); } else { - pTooltipComponents.add(MutableComponent.create(new LiteralContents(getAbbreviation())).withStyle(ChatFormatting.DARK_AQUA)); + pTooltipComponents.add(MutableComponent.create(new PlainTextContents.LiteralContents(getAbbreviation())).withStyle(ChatFormatting.DARK_AQUA)); pTooltipComponents.add(MutableComponent.create( - new LiteralContents(StringUtils.capitalize(getNamespace()))).withStyle(ChemLib.MOD_ID_TEXT_STYLE)); + new PlainTextContents.LiteralContents(StringUtils.capitalize(getNamespace()))).withStyle(ChemLib.MOD_ID_TEXT_STYLE)); } } public String getNamespace() { - return ForgeRegistries.ITEMS.getResourceKey(this).get().location().getNamespace(); + return BuiltInRegistries.ITEM.getResourceKey(this).get().location().getNamespace(); } public Chemical getChemical() { diff --git a/src/main/java/com/smashingmods/chemlib/common/items/CompoundItem.java b/src/main/java/com/smashingmods/chemlib/common/items/CompoundItem.java index cf56e2e3..f142c36a 100644 --- a/src/main/java/com/smashingmods/chemlib/common/items/CompoundItem.java +++ b/src/main/java/com/smashingmods/chemlib/common/items/CompoundItem.java @@ -5,21 +5,19 @@ import com.smashingmods.chemlib.api.MatterState; import com.smashingmods.chemlib.registry.ItemRegistry; import net.minecraft.ChatFormatting; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.chat.contents.LiteralContents; +import net.minecraft.network.chat.contents.PlainTextContents; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.api.distmarker.OnlyIn; import org.apache.commons.lang3.StringUtils; -import javax.annotation.Nullable; import java.util.List; import java.util.Map; @@ -73,14 +71,14 @@ public CompoundItem(String pCompoundName, MatterState pMatterState, Map pTooltipComponents, TooltipFlag pIsAdvanced) { - pTooltipComponents.add(MutableComponent.create(new LiteralContents(getAbbreviation())).withStyle(ChatFormatting.DARK_AQUA)); + public void appendHoverText(ItemStack stack, TooltipContext context, List pTooltipComponents, TooltipFlag tooltipFlag) { + pTooltipComponents.add(MutableComponent.create(new PlainTextContents.LiteralContents(getAbbreviation())).withStyle(ChatFormatting.DARK_AQUA)); pTooltipComponents.add(MutableComponent.create( - new LiteralContents(StringUtils.capitalize(getNamespace()))).withStyle(ChemLib.MOD_ID_TEXT_STYLE)); + new PlainTextContents.LiteralContents(StringUtils.capitalize(getNamespace()))).withStyle(ChemLib.MOD_ID_TEXT_STYLE)); } public String getNamespace() { - return ForgeRegistries.ITEMS.getResourceKey(this).get().location().getNamespace(); + return BuiltInRegistries.ITEM.getResourceKey(this).get().location().getNamespace(); } @Override diff --git a/src/main/java/com/smashingmods/chemlib/common/items/ElementItem.java b/src/main/java/com/smashingmods/chemlib/common/items/ElementItem.java index aa4c7c3b..f353e87b 100644 --- a/src/main/java/com/smashingmods/chemlib/common/items/ElementItem.java +++ b/src/main/java/com/smashingmods/chemlib/common/items/ElementItem.java @@ -6,22 +6,20 @@ import com.smashingmods.chemlib.api.MetalType; import com.smashingmods.chemlib.client.AbbreviationRenderer; import net.minecraft.ChatFormatting; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.chat.contents.LiteralContents; +import net.minecraft.network.chat.contents.PlainTextContents; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.extensions.common.IClientItemExtensions; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.api.distmarker.OnlyIn; +import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; import org.apache.commons.lang3.StringUtils; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.List; import java.util.function.Consumer; @@ -53,17 +51,17 @@ public ElementItem(String pChemicalName, int pAtomicNumber, String pAbbreviation } @OnlyIn(Dist.CLIENT) - public void appendHoverText(ItemStack pStack, @Nullable Level pLevel, List pTooltipComponents, TooltipFlag pIsAdvanced) { - pTooltipComponents.add(MutableComponent.create(new LiteralContents(String.format("%s (%d)", getAbbreviation(), atomicNumber))).withStyle(ChatFormatting.DARK_AQUA)); + public void appendHoverText(ItemStack stack, TooltipContext context, List pTooltipComponents, TooltipFlag tooltipFlag) { + pTooltipComponents.add(MutableComponent.create(new PlainTextContents.LiteralContents(String.format("%s (%d)", getAbbreviation(), atomicNumber))).withStyle(ChatFormatting.DARK_AQUA)); if (!getGroupName().isEmpty()) { - pTooltipComponents.add(MutableComponent.create(new LiteralContents(getGroupName())).withStyle(ChatFormatting.GRAY)); + pTooltipComponents.add(MutableComponent.create(new PlainTextContents.LiteralContents(getGroupName())).withStyle(ChatFormatting.GRAY)); } pTooltipComponents.add(MutableComponent.create( - new LiteralContents(StringUtils.capitalize(getNamespace()))).withStyle(ChemLib.MOD_ID_TEXT_STYLE)); + new PlainTextContents.LiteralContents(StringUtils.capitalize(getNamespace()))).withStyle(ChemLib.MOD_ID_TEXT_STYLE)); } public String getNamespace() { - return ForgeRegistries.ITEMS.getResourceKey(this).get().location().getNamespace(); + return BuiltInRegistries.ITEM.getResourceKey(this).get().location().getNamespace(); } @Override diff --git a/src/main/java/com/smashingmods/chemlib/common/items/PeriodicTableItem.java b/src/main/java/com/smashingmods/chemlib/common/items/PeriodicTableItem.java index 43f0917a..ce8964ff 100644 --- a/src/main/java/com/smashingmods/chemlib/common/items/PeriodicTableItem.java +++ b/src/main/java/com/smashingmods/chemlib/common/items/PeriodicTableItem.java @@ -15,8 +15,8 @@ import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.api.distmarker.OnlyIn; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/com/smashingmods/chemlib/datagen/BlockLootTables.java b/src/main/java/com/smashingmods/chemlib/datagen/BlockLootTables.java index 2676bd06..06f423bb 100644 --- a/src/main/java/com/smashingmods/chemlib/datagen/BlockLootTables.java +++ b/src/main/java/com/smashingmods/chemlib/datagen/BlockLootTables.java @@ -1,28 +1,28 @@ package com.smashingmods.chemlib.datagen; import com.smashingmods.chemlib.registry.BlockRegistry; +import net.minecraft.core.HolderLookup; import net.minecraft.data.loot.BlockLootSubProvider; import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.level.block.Block; -import net.minecraftforge.registries.RegistryObject; import javax.annotation.Nonnull; import java.util.Set; public class BlockLootTables extends BlockLootSubProvider { - public BlockLootTables() { - super(Set.of(), FeatureFlags.REGISTRY.allFlags()); - } + public BlockLootTables(HolderLookup.Provider registries) { + super(Set.of(), FeatureFlags.REGISTRY.allFlags(), registries); + } - @Override - protected void generate() { - BlockRegistry.BLOCKS.getEntries().stream().forEach(block -> dropSelf(block.get())); - } + @Override + protected void generate() { + BlockRegistry.BLOCKS.getEntries().stream().forEach(block -> dropSelf(block.get())); + } - @Override - @Nonnull - protected Iterable getKnownBlocks() { - return BlockRegistry.BLOCKS.getEntries().stream().map(RegistryObject::get)::iterator; - } + @Override + @Nonnull + protected Iterable getKnownBlocks() { + return BlockRegistry.BLOCKS.getEntries().stream().map((holder)->(Block) holder.value())::iterator; + } } diff --git a/src/main/java/com/smashingmods/chemlib/datagen/BlockStateGenerator.java b/src/main/java/com/smashingmods/chemlib/datagen/BlockStateGenerator.java index ebde03c4..34c25cf9 100644 --- a/src/main/java/com/smashingmods/chemlib/datagen/BlockStateGenerator.java +++ b/src/main/java/com/smashingmods/chemlib/datagen/BlockStateGenerator.java @@ -8,10 +8,10 @@ import net.minecraft.data.PackOutput; import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraftforge.client.model.generators.BlockStateProvider; -import net.minecraftforge.client.model.generators.ConfiguredModel; -import net.minecraftforge.client.model.generators.ModelFile; -import net.minecraftforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.client.model.generators.BlockStateProvider; +import net.neoforged.neoforge.client.model.generators.ConfiguredModel; +import net.neoforged.neoforge.client.model.generators.ModelFile; +import net.neoforged.neoforge.common.data.ExistingFileHelper; public class BlockStateGenerator extends BlockStateProvider { diff --git a/src/main/java/com/smashingmods/chemlib/datagen/BlockTagGenerator.java b/src/main/java/com/smashingmods/chemlib/datagen/BlockTagGenerator.java index 11e8e909..45151255 100644 --- a/src/main/java/com/smashingmods/chemlib/datagen/BlockTagGenerator.java +++ b/src/main/java/com/smashingmods/chemlib/datagen/BlockTagGenerator.java @@ -5,16 +5,15 @@ import com.smashingmods.chemlib.registry.BlockRegistry; import com.smashingmods.chemlib.registry.ItemRegistry; import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.world.level.block.Block; -import net.minecraftforge.common.data.BlockTagsProvider; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.neoforge.common.data.BlockTagsProvider; +import net.neoforged.neoforge.common.data.ExistingFileHelper; -import java.util.Objects; import java.util.concurrent.CompletableFuture; public class BlockTagGenerator extends BlockTagsProvider { @@ -33,9 +32,13 @@ public void addTags(HolderLookup.Provider pProvider) { ItemRegistry.getChemicalBlockItems().forEach(item -> { if (item.getMatterState().equals(MatterState.SOLID)) { String name = item.getChemicalName(); - TagKey key = Objects.requireNonNull(ForgeRegistries.BLOCKS.tags()).createTagKey(new ResourceLocation("forge", String.format("storage_blocks/%s", name))); + TagKey key = commonTag(String.format("storage_blocks/%s", name)); tag(key).add(item.getBlock()); } }); } + + private static TagKey commonTag(String name) { + return TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath("c", name)); + } } diff --git a/src/main/java/com/smashingmods/chemlib/datagen/DataGenerators.java b/src/main/java/com/smashingmods/chemlib/datagen/DataGenerators.java index fbc21367..404b47eb 100644 --- a/src/main/java/com/smashingmods/chemlib/datagen/DataGenerators.java +++ b/src/main/java/com/smashingmods/chemlib/datagen/DataGenerators.java @@ -3,14 +3,14 @@ import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.data.event.GatherDataEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.data.event.GatherDataEvent; import java.util.concurrent.CompletableFuture; -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) +@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD) public class DataGenerators { @SubscribeEvent @@ -25,8 +25,8 @@ public static void gatherData(GatherDataEvent event) { generator.addProvider(event.includeClient(), new BlockStateGenerator(packOutput, fileHelper)); generator.addProvider(event.includeClient(), new ItemModelGenerator(packOutput, fileHelper)); generator.addProvider(event.includeServer(), new ItemTagGenerator(packOutput, lookupProvider, blockTags, fileHelper)); - generator.addProvider(event.includeServer(), new RecipeGenerator(packOutput)); - generator.addProvider(event.includeServer(), LootTableGenerator.create(packOutput)); + generator.addProvider(event.includeServer(), new RecipeGenerator(packOutput, lookupProvider)); + generator.addProvider(event.includeServer(), LootTableGenerator.create(packOutput, lookupProvider)); generator.addProvider(event.includeClient(), new LocalizationGenerator(packOutput, "en_us")); } } diff --git a/src/main/java/com/smashingmods/chemlib/datagen/FluidTagGenerator.java b/src/main/java/com/smashingmods/chemlib/datagen/FluidTagGenerator.java index 852d6b38..740c515a 100644 --- a/src/main/java/com/smashingmods/chemlib/datagen/FluidTagGenerator.java +++ b/src/main/java/com/smashingmods/chemlib/datagen/FluidTagGenerator.java @@ -6,7 +6,7 @@ import net.minecraft.data.PackOutput; import net.minecraft.data.tags.FluidTagsProvider; import net.minecraft.tags.FluidTags; -import net.minecraftforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.common.data.ExistingFileHelper; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/com/smashingmods/chemlib/datagen/ItemModelGenerator.java b/src/main/java/com/smashingmods/chemlib/datagen/ItemModelGenerator.java index 436774ec..ee434dee 100644 --- a/src/main/java/com/smashingmods/chemlib/datagen/ItemModelGenerator.java +++ b/src/main/java/com/smashingmods/chemlib/datagen/ItemModelGenerator.java @@ -12,12 +12,12 @@ import com.smashingmods.chemlib.common.items.ElementItem; import com.smashingmods.chemlib.registry.FluidRegistry; import com.smashingmods.chemlib.registry.ItemRegistry; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.BucketItem; -import net.minecraftforge.client.model.generators.ItemModelProvider; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.neoforge.client.model.generators.ItemModelProvider; +import net.neoforged.neoforge.common.data.ExistingFileHelper; import java.util.Arrays; import java.util.Objects; @@ -106,7 +106,7 @@ private void registerChemicalBlockItems(ChemicalBlockItem pBlockItem) { } private void registerBucket(BucketItem pBucket) { - String path = Objects.requireNonNull(ForgeRegistries.ITEMS.getKey(pBucket)).getPath(); + String path = Objects.requireNonNull(BuiltInRegistries.ITEM.getKey(pBucket)).getPath(); int pieces = path.split("_").length; String chemicalName = ""; diff --git a/src/main/java/com/smashingmods/chemlib/datagen/ItemTagGenerator.java b/src/main/java/com/smashingmods/chemlib/datagen/ItemTagGenerator.java index 073bcfc4..f2060add 100644 --- a/src/main/java/com/smashingmods/chemlib/datagen/ItemTagGenerator.java +++ b/src/main/java/com/smashingmods/chemlib/datagen/ItemTagGenerator.java @@ -5,6 +5,7 @@ import com.smashingmods.chemlib.api.MatterState; import com.smashingmods.chemlib.registry.ItemRegistry; import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.ItemTagsProvider; import net.minecraft.data.tags.TagsProvider; @@ -12,11 +13,9 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.neoforge.common.data.ExistingFileHelper; import javax.annotation.Nonnull; -import java.util.Objects; import java.util.concurrent.CompletableFuture; public class ItemTagGenerator extends ItemTagsProvider { @@ -30,43 +29,43 @@ public void addTags(HolderLookup.Provider lookupProvider) { ItemRegistry.getChemicalItems().forEach(item -> { String type = item.getItemType().getSerializedName(); String name = item.getChemicalName(); - TagKey key = Objects.requireNonNull(ForgeRegistries.ITEMS.tags()).createTagKey(new ResourceLocation("forge", String.format("%ss/%s", type, name))); + TagKey key = commonTag(String.format("%ss/%s", type, name)); tag(key).add(item); }); ItemRegistry.getChemicalBlockItems().forEach(item -> { if (item.getMatterState().equals(MatterState.SOLID)) { String name = item.getChemicalName(); - TagKey key = Objects.requireNonNull(ForgeRegistries.ITEMS.tags()).createTagKey(new ResourceLocation("forge", String.format("storage_blocks/%s", name))); + TagKey key = commonTag(String.format("storage_blocks/%s", name)); tag(key).add(item); } }); ItemRegistry.getChemicalItemByNameAndType("potassium_nitrate", ChemicalItemType.COMPOUND).ifPresent(compound -> { - ResourceLocation niter = new ResourceLocation("forge", "dusts/niter"); - TagKey key = Objects.requireNonNull(ForgeRegistries.ITEMS.tags()).createTagKey(niter); + TagKey key = commonTag("dusts/niter"); tag(key).add(compound); }); ItemRegistry.getChemicalItemByNameAndType("hydroxylapatite", ChemicalItemType.COMPOUND).ifPresent(compound -> { - ResourceLocation niter = new ResourceLocation("forge", "dusts/apatite"); - TagKey key = Objects.requireNonNull(ForgeRegistries.ITEMS.tags()).createTagKey(niter); + TagKey key = commonTag("dusts/apatite"); tag(key).add(compound); }); ItemRegistry.getChemicalItemByNameAndType("cellulose", ChemicalItemType.COMPOUND).ifPresent(compound -> { - ResourceLocation sawdust = new ResourceLocation("forge", "sawdust"); - TagKey key = Objects.requireNonNull(ForgeRegistries.ITEMS.tags()).createTagKey(sawdust); + TagKey key = commonTag("sawdust"); tag(key).add(compound); }); ItemRegistry.getChemicalItemByNameAndType("mercury_sulfide", ChemicalItemType.COMPOUND).ifPresent(compound -> { - ResourceLocation sawdust = new ResourceLocation("forge", "dusts/cinnabar"); - TagKey key = Objects.requireNonNull(ForgeRegistries.ITEMS.tags()).createTagKey(sawdust); + TagKey key = commonTag("dusts/cinnabar"); tag(key).add(compound); }); } + private static TagKey commonTag(String name) { + return TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath("c", name)); + } + @Override @Nonnull public String getName() { diff --git a/src/main/java/com/smashingmods/chemlib/datagen/LocalizationGenerator.java b/src/main/java/com/smashingmods/chemlib/datagen/LocalizationGenerator.java index 93b344a7..5bc9957b 100644 --- a/src/main/java/com/smashingmods/chemlib/datagen/LocalizationGenerator.java +++ b/src/main/java/com/smashingmods/chemlib/datagen/LocalizationGenerator.java @@ -6,8 +6,8 @@ import com.smashingmods.chemlib.registry.FluidRegistry; import com.smashingmods.chemlib.registry.ItemRegistry; import net.minecraft.data.PackOutput; -import net.minecraftforge.common.data.LanguageProvider; -import net.minecraftforge.registries.RegistryObject; +import net.neoforged.neoforge.common.data.LanguageProvider; +import net.neoforged.neoforge.registries.DeferredHolder; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.text.WordUtils; @@ -44,7 +44,7 @@ protected void addTranslations() { }); } - FluidRegistry.FLUID_TYPES.getEntries().stream().map(RegistryObject::get).forEach(fluidType -> { + FluidRegistry.FLUID_TYPES.getEntries().stream().map(DeferredHolder::get).forEach(fluidType -> { int density = fluidType.getDensity(); String key = fluidType.getDescriptionId(); String value = key.split("\\.")[key.split("\\.").length - 1]; diff --git a/src/main/java/com/smashingmods/chemlib/datagen/LootTableGenerator.java b/src/main/java/com/smashingmods/chemlib/datagen/LootTableGenerator.java index 29718341..592a677d 100644 --- a/src/main/java/com/smashingmods/chemlib/datagen/LootTableGenerator.java +++ b/src/main/java/com/smashingmods/chemlib/datagen/LootTableGenerator.java @@ -1,14 +1,16 @@ package com.smashingmods.chemlib.datagen; +import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.loot.LootTableProvider; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import java.util.List; import java.util.Set; +import java.util.concurrent.CompletableFuture; public class LootTableGenerator { - public static LootTableProvider create(PackOutput pOutput) { - return new LootTableProvider(pOutput, Set.of(), List.of(new LootTableProvider.SubProviderEntry(BlockLootTables::new, LootContextParamSets.BLOCK))); + public static LootTableProvider create(PackOutput output, CompletableFuture lookupProvider) { + return new LootTableProvider(output, Set.of(), List.of(new LootTableProvider.SubProviderEntry(BlockLootTables::new, LootContextParamSets.BLOCK)), lookupProvider); } } diff --git a/src/main/java/com/smashingmods/chemlib/datagen/RecipeGenerator.java b/src/main/java/com/smashingmods/chemlib/datagen/RecipeGenerator.java index f1f187aa..ff244a77 100644 --- a/src/main/java/com/smashingmods/chemlib/datagen/RecipeGenerator.java +++ b/src/main/java/com/smashingmods/chemlib/datagen/RecipeGenerator.java @@ -7,35 +7,37 @@ import com.smashingmods.chemlib.registry.BlockRegistry; import com.smashingmods.chemlib.registry.ItemRegistry; import net.minecraft.advancements.critereon.ItemPredicate; +import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.*; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; -import net.minecraftforge.common.Tags; +import net.neoforged.neoforge.common.Tags; import javax.annotation.Nonnull; +import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; public class RecipeGenerator extends RecipeProvider { - public RecipeGenerator(PackOutput pOutput) { - super(pOutput); + public RecipeGenerator(PackOutput packOutput, CompletableFuture lookupProvider) { + super(packOutput, lookupProvider); } @Override @SuppressWarnings("OptionalGetWithoutIsPresent") - protected void buildRecipes(@Nonnull Consumer pConsumer) { + protected void buildRecipes(RecipeOutput output, HolderLookup.Provider holderLookup) { // Register lamp recipes BlockRegistry.getChemicalBlocksByType(ChemicalBlockType.LAMP).forEach(block -> { Chemical chemical = block.getChemical(); ShapedRecipeBuilder.shaped(RecipeCategory.MISC, block) - .define('G', Tags.Items.GLASS) + .define('G', Tags.Items.GLASS_BLOCKS_CHEAP) .define('E', chemical) .pattern("GEG") .pattern("EEE") .pattern("GEG") .unlockedBy(String.format("has_%s", chemical), inventoryTrigger(ItemPredicate.Builder.item().of(chemical).build())) - .save(pConsumer); + .save(output); }); // register ingot -> block recipes @@ -47,7 +49,7 @@ protected void buildRecipes(@Nonnull Consumer pConsumer) { .pattern("III") .pattern("III") .unlockedBy(String.format("has_%s", chemical), inventoryTrigger(ItemPredicate.Builder.item().of(chemical).build())) - .save(pConsumer, String.format("%s:%s_ingot_to_block", ChemLib.MODID, chemical.getChemicalName()))); + .save(output, String.format("%s:%s_ingot_to_block", ChemLib.MODID, chemical.getChemicalName()))); }); // register nugget -> ingot @@ -59,7 +61,7 @@ protected void buildRecipes(@Nonnull Consumer pConsumer) { .pattern("NNN") .pattern("NNN") .unlockedBy(String.format("has_%s", chemical), inventoryTrigger(ItemPredicate.Builder.item().of(chemical).build())) - .save(pConsumer, String.format("%s:%s_nugget_to_ingot", ChemLib.MODID, chemical.getChemicalName()))); + .save(output, String.format("%s:%s_nugget_to_ingot", ChemLib.MODID, chemical.getChemicalName()))); }); // register block -> ingot recipes @@ -68,7 +70,7 @@ protected void buildRecipes(@Nonnull Consumer pConsumer) { BlockRegistry.getChemicalBlockByNameAndType(chemical.getChemicalName(), ChemicalBlockType.METAL).ifPresent(block -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ingot, 9) .requires(block) .unlockedBy(String.format("has_%s", chemical), inventoryTrigger(ItemPredicate.Builder.item().of(chemical).build())) - .save(pConsumer, String.format("%s:%s_block_to_ingot", ChemLib.MODID, chemical.getChemicalName()))); + .save(output, String.format("%s:%s_block_to_ingot", ChemLib.MODID, chemical.getChemicalName()))); }); // register ingot -> nugget @@ -77,7 +79,7 @@ protected void buildRecipes(@Nonnull Consumer pConsumer) { ItemRegistry.getChemicalItemByNameAndType(chemical.getChemicalName(), ChemicalItemType.NUGGET).ifPresent(nugget -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, nugget, 9) .requires(ingot) .unlockedBy(String.format("has_%s", chemical), inventoryTrigger(ItemPredicate.Builder.item().of(chemical).build())) - .save(pConsumer, String.format("%s:%s_ingot_to_nugget", ChemLib.MODID, chemical.getChemicalName()))); + .save(output, String.format("%s:%s_ingot_to_nugget", ChemLib.MODID, chemical.getChemicalName()))); }); // register dust -> ingot @@ -88,36 +90,36 @@ protected void buildRecipes(@Nonnull Consumer pConsumer) { String chemicalName = chemicalItem.getChemicalName(); SimpleCookingRecipeBuilder.smelting(Ingredient.of(dust), RecipeCategory.MISC, chemicalItem, 0.7f, 200) .unlockedBy(String.format("has_%s", chemicalItem.getChemical()), inventoryTrigger(ItemPredicate.Builder.item().of(chemicalItem.getChemical()).build())) - .save(pConsumer, String.format("%s:%s_ingot_from_smelting_%s_dust", ChemLib.MODID, chemicalName, chemicalName)); + .save(output, String.format("%s:%s_ingot_from_smelting_%s_dust", ChemLib.MODID, chemicalName, chemicalName)); SimpleCookingRecipeBuilder.blasting(Ingredient.of(dust), RecipeCategory.MISC, chemicalItem, 0.7f, 100) .unlockedBy(String.format("has_%s", chemicalItem.getChemical()), inventoryTrigger(ItemPredicate.Builder.item().of(chemicalItem.getChemical()).build())) - .save(pConsumer, String.format("%s:%s_ingot_from_blasting_%s_dust", ChemLib.MODID, chemicalName, chemicalName)); + .save(output, String.format("%s:%s_ingot_from_blasting_%s_dust", ChemLib.MODID, chemicalName, chemicalName)); })); // hard-code vanilla dust to ingot smelting/blasting recipes ItemRegistry.getChemicalItemByNameAndType("copper", ChemicalItemType.DUST).ifPresent(dust -> { SimpleCookingRecipeBuilder.smelting(Ingredient.of(dust), RecipeCategory.MISC, Items.COPPER_INGOT, 0.7f, 200) .unlockedBy("has_copper", inventoryTrigger(ItemPredicate.Builder.item().of(dust).build())) - .save(pConsumer, String.format("%s:copper_ingot_from_smelting_copper_dust", ChemLib.MODID)); + .save(output, String.format("%s:copper_ingot_from_smelting_copper_dust", ChemLib.MODID)); SimpleCookingRecipeBuilder.blasting(Ingredient.of(dust), RecipeCategory.MISC, Items.COPPER_INGOT, 0.7f, 100) .unlockedBy("has_copper", inventoryTrigger(ItemPredicate.Builder.item().of(dust).build())) - .save(pConsumer, String.format("%s:copper_ingot_from_blasting_copper_dust", ChemLib.MODID)); + .save(output, String.format("%s:copper_ingot_from_blasting_copper_dust", ChemLib.MODID)); }); ItemRegistry.getChemicalItemByNameAndType("iron", ChemicalItemType.DUST).ifPresent(dust -> { SimpleCookingRecipeBuilder.smelting(Ingredient.of(dust), RecipeCategory.MISC, Items.IRON_INGOT, 0.7f, 200) .unlockedBy("has_iron", inventoryTrigger(ItemPredicate.Builder.item().of(dust).build())) - .save(pConsumer, String.format("%s:iron_ingot_from_smelting_iron_dust", ChemLib.MODID)); + .save(output, String.format("%s:iron_ingot_from_smelting_iron_dust", ChemLib.MODID)); SimpleCookingRecipeBuilder.blasting(Ingredient.of(dust), RecipeCategory.MISC, Items.IRON_INGOT, 0.7f, 100) .unlockedBy("has_iron", inventoryTrigger(ItemPredicate.Builder.item().of(dust).build())) - .save(pConsumer, String.format("%s:iron_ingot_from_blasting_iron_dust", ChemLib.MODID)); + .save(output, String.format("%s:iron_ingot_from_blasting_iron_dust", ChemLib.MODID)); }); ItemRegistry.getChemicalItemByNameAndType("gold", ChemicalItemType.DUST).ifPresent(dust -> { SimpleCookingRecipeBuilder.smelting(Ingredient.of(dust), RecipeCategory.MISC, Items.GOLD_INGOT, 0.7f, 200) .unlockedBy("has_gold", inventoryTrigger(ItemPredicate.Builder.item().of(dust).build())) - .save(pConsumer, String.format("%s:gold_ingot_from_smelting_gold_dust", ChemLib.MODID)); + .save(output, String.format("%s:gold_ingot_from_smelting_gold_dust", ChemLib.MODID)); SimpleCookingRecipeBuilder.blasting(Ingredient.of(dust), RecipeCategory.MISC, Items.GOLD_INGOT, 0.7f, 100) .unlockedBy("has_gold", inventoryTrigger(ItemPredicate.Builder.item().of(dust).build())) - .save(pConsumer, String.format("%s:gold_ingot_from_blasting_gold_dust", ChemLib.MODID)); + .save(output, String.format("%s:gold_ingot_from_blasting_gold_dust", ChemLib.MODID)); }); // periodic table @@ -131,6 +133,6 @@ protected void buildRecipes(@Nonnull Consumer pConsumer) { .pattern("HPH") .pattern("HHH") .unlockedBy("has_hydrogen", inventoryTrigger(ItemPredicate.Builder.item().of(hydrogen).build())) - .save(pConsumer); + .save(output); } } diff --git a/src/main/java/com/smashingmods/chemlib/registry/BlockRegistry.java b/src/main/java/com/smashingmods/chemlib/registry/BlockRegistry.java index a2a5e90f..e4422159 100644 --- a/src/main/java/com/smashingmods/chemlib/registry/BlockRegistry.java +++ b/src/main/java/com/smashingmods/chemlib/registry/BlockRegistry.java @@ -8,10 +8,9 @@ import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.material.MapColor; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; import java.util.ArrayList; import java.util.List; @@ -19,7 +18,7 @@ import java.util.stream.Stream; public class BlockRegistry { - public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, ChemLib.MODID); + public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(ChemLib.MODID); public static final List METAL_BLOCKS = new ArrayList<>(); public static final List LAMP_BLOCKS = new ArrayList<>(); @@ -32,7 +31,7 @@ public class BlockRegistry { .sound(SoundType.GLASS) .lightLevel(state -> state.getValue(BlockStateProperties.LIT) ? 15 : 0); - public static Optional> getRegistryObjectByName(String pName) { + public static Optional> getRegistryObjectByName(String pName) { return BLOCKS.getEntries().stream().filter(blockRegistryObject -> blockRegistryObject.getId().getPath().equals(pName)).findFirst(); } diff --git a/src/main/java/com/smashingmods/chemlib/registry/ChemicalRegistry.java b/src/main/java/com/smashingmods/chemlib/registry/ChemicalRegistry.java index f3f8408e..54b9e8f9 100644 --- a/src/main/java/com/smashingmods/chemlib/registry/ChemicalRegistry.java +++ b/src/main/java/com/smashingmods/chemlib/registry/ChemicalRegistry.java @@ -12,20 +12,24 @@ import com.smashingmods.chemlib.common.blocks.LampBlock; import com.smashingmods.chemlib.common.items.CompoundItem; import com.smashingmods.chemlib.common.items.ElementItem; +import net.minecraft.core.Holder; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.item.Item; import net.minecraft.world.item.Rarity; -import net.minecraft.world.level.pathfinder.BlockPathTypes; -import net.minecraftforge.common.SoundActions; -import net.minecraftforge.fluids.FluidType; -import net.minecraftforge.registries.RegistryObject; +import net.minecraft.world.level.pathfinder.PathType; +import net.neoforged.neoforge.common.SoundActions; +import net.neoforged.neoforge.fluids.FluidType; +import net.neoforged.neoforge.registries.DeferredHolder; -import java.util.*; - -import static net.minecraftforge.registries.ForgeRegistries.MOB_EFFECTS; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; public class ChemicalRegistry { public static final JsonObject ELEMENTS_JSON = Registry.getStreamAsJsonObject("/data/chemlib/elements.json"); @@ -49,7 +53,7 @@ private static void registerElements() { String color = object.get("color").getAsString(); ItemRegistry.REGISTRY_ELEMENTS.register(elementName, () -> new ElementItem(elementName, atomicNumber, abbreviation, group, period, matterState, metalType, artificial, color, mobEffectsFactory(object))); - RegistryObject registryObject = ItemRegistry.getRegistryObject(ItemRegistry.REGISTRY_ELEMENTS, elementName); + DeferredHolder registryObject = ItemRegistry.getRegistryObject(ItemRegistry.REGISTRY_ELEMENTS, elementName); if (!artificial) { switch (matterState) { @@ -61,7 +65,7 @@ private static void registerElements() { if (!hasItem) { ItemRegistry.registerItemByType(registryObject, ChemicalItemType.NUGGET); ItemRegistry.registerItemByType(registryObject, ChemicalItemType.INGOT); - BlockRegistry.BLOCKS.register(String.format("%s_metal_block", elementName), () -> new ChemicalBlock(new ResourceLocation(ChemLib.MODID, elementName), ChemicalBlockType.METAL, BlockRegistry.METAL_BLOCKS, BlockRegistry.METAL_PROPERTIES)); + BlockRegistry.BLOCKS.register(String.format("%s_metal_block", elementName), () -> new ChemicalBlock(ChemLib.modLoc(elementName), ChemicalBlockType.METAL, BlockRegistry.METAL_BLOCKS, BlockRegistry.METAL_PROPERTIES)); BlockRegistry.getRegistryObjectByName(String.format("%s_metal_block", elementName)).ifPresent(block -> ItemRegistry.fromChemicalBlock(block, new Item.Properties())); } } @@ -75,7 +79,7 @@ private static void registerElements() { int decreasePerBlock = properties.has("decrease_per_block") ? properties.get("decrease_per_block").getAsInt() : 1; if (group == 18) { - BlockRegistry.BLOCKS.register(String.format("%s_lamp_block", elementName), () -> new LampBlock(new ResourceLocation(ChemLib.MODID, elementName), ChemicalBlockType.LAMP, BlockRegistry.LAMP_BLOCKS, BlockRegistry.LAMP_PROPERTIES)); + BlockRegistry.BLOCKS.register(String.format("%s_lamp_block", elementName), () -> new LampBlock(ChemLib.modLoc(elementName), ChemicalBlockType.LAMP, BlockRegistry.LAMP_BLOCKS, BlockRegistry.LAMP_PROPERTIES)); BlockRegistry.getRegistryObjectByName(String.format("%s_lamp_block", elementName)).ifPresent(block -> ItemRegistry.fromChemicalBlock(block, new Item.Properties())); } FluidRegistry.registerFluid(elementName, fluidTypePropertiesFactory(properties, ChemLib.MODID, elementName), Integer.parseInt(color, 16) | 0xFF000000, slopeFindDistance, decreasePerBlock); @@ -145,7 +149,7 @@ public static List mobEffectsFactory(JsonObject object) { String effectLocation = effectObject.get("location").getAsString(); int effectDuration = effectObject.get("duration").getAsInt(); int effectAmplifier = effectObject.get("amplifier").getAsInt(); - MobEffect mobEffect = MOB_EFFECTS.getValue(new ResourceLocation(effectLocation)); + Holder mobEffect = BuiltInRegistries.MOB_EFFECT.getHolder(ResourceLocation.tryParse(effectLocation)).orElse(null); if (mobEffect != null) { effectsList.add(new MobEffectInstance(mobEffect, effectDuration, effectAmplifier)); } @@ -161,7 +165,7 @@ public static FluidType.Properties fluidTypePropertiesFactory(JsonObject pObject int temperature = pObject.has("temperature") ? pObject.get("temperature").getAsInt() : 300; float motionScale = pObject.has("motion_scale") ? pObject.get("motion_scale").getAsFloat() : 0.014f; int fallDistanceModifier = pObject.has("fall_distance_modifier") ? pObject.get("fall_distance_modifier").getAsInt() : 0; - BlockPathTypes pathType = pObject.has("path_type") ? BlockPathTypes.valueOf(pObject.get("path_type").getAsString().toUpperCase(Locale.ROOT)) : BlockPathTypes.WATER; + PathType pathType = pObject.has("path_type") ? PathType.valueOf(pObject.get("path_type").getAsString().toUpperCase(Locale.ROOT)) : PathType.WATER; boolean pushEntity = !pObject.has("push_entity") || pObject.get("push_entity").getAsBoolean(); boolean canSwim = !pObject.has("can_swim") || pObject.get("can_swim").getAsBoolean(); boolean canDrown = pObject.has("can_drown") && pObject.get("can_drown").getAsBoolean(); diff --git a/src/main/java/com/smashingmods/chemlib/registry/FluidRegistry.java b/src/main/java/com/smashingmods/chemlib/registry/FluidRegistry.java index 4480ba2f..597d12cb 100644 --- a/src/main/java/com/smashingmods/chemlib/registry/FluidRegistry.java +++ b/src/main/java/com/smashingmods/chemlib/registry/FluidRegistry.java @@ -4,64 +4,73 @@ import com.smashingmods.chemlib.common.blocks.ChemicalLiquidBlock; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.BucketItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.BlockAndTintGetter; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.material.FlowingFluid; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.FluidState; -import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fluids.FluidType; -import net.minecraftforge.fluids.ForgeFlowingFluid; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions; +import net.neoforged.neoforge.fluids.BaseFlowingFluid; +import net.neoforged.neoforge.fluids.FluidType; +import net.neoforged.neoforge.registries.DeferredBlock; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredItem; +import net.neoforged.neoforge.registries.DeferredRegister; +import net.neoforged.neoforge.registries.NeoForgeRegistries; import org.apache.commons.lang3.StringUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.TreeMap; import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.Stream; public class FluidRegistry { - public static final DeferredRegister FLUIDS = DeferredRegister.create(ForgeRegistries.FLUIDS, ChemLib.MODID); - public static final DeferredRegister FLUID_TYPES = DeferredRegister.create(ForgeRegistries.Keys.FLUID_TYPES, ChemLib.MODID); - public static final DeferredRegister LIQUID_BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, ChemLib.MODID); - public static final DeferredRegister BUCKETS = DeferredRegister.create(ForgeRegistries.ITEMS, ChemLib.MODID); + public static final DeferredRegister FLUIDS = DeferredRegister.create(BuiltInRegistries.FLUID, ChemLib.MODID); + public static final DeferredRegister FLUID_TYPES = DeferredRegister.create(NeoForgeRegistries.Keys.FLUID_TYPES, ChemLib.MODID); + public static final DeferredRegister.Blocks LIQUID_BLOCKS = DeferredRegister.createBlocks(ChemLib.MODID); + public static final DeferredRegister.Items BUCKETS = DeferredRegister.createItems(ChemLib.MODID); protected static void registerFluid(String pName, FluidType.Properties pFluidProperties, int pColor, int pSlopeFindDistance, int pDecreasePerBlock) { var ref = new Object() { - ForgeFlowingFluid.Properties properties = null; + BaseFlowingFluid.Properties properties = null; }; - RegistryObject fluidType = FLUID_TYPES.register(pName, () -> new FluidType(pFluidProperties) { + DeferredHolder fluidType = FLUID_TYPES.register(pName, () -> new FluidType(pFluidProperties) { + @SuppressWarnings("removal") @Override public void initializeClient(Consumer consumer) { consumer.accept(new IClientFluidTypeExtensions() { @Override public ResourceLocation getStillTexture() { - return new ResourceLocation("block/water_still"); + return ResourceLocation.withDefaultNamespace("block/water_still"); } @Override public ResourceLocation getFlowingTexture() { - return new ResourceLocation("block/water_flow"); + return ResourceLocation.withDefaultNamespace("block/water_flow"); } @Override public ResourceLocation getOverlayTexture() { - return new ResourceLocation("block/water_overlay"); + return ResourceLocation.withDefaultNamespace("block/water_overlay"); } @Override public ResourceLocation getRenderOverlayTexture(Minecraft mc) { - return new ResourceLocation("minecraft", "textures/misc/underwater.png"); + return ResourceLocation.withDefaultNamespace("textures/misc/underwater.png"); } @Override public int getTintColor() { @@ -76,12 +85,12 @@ public int getTintColor(FluidState state, BlockAndTintGetter getter, BlockPos po } }); - RegistryObject fluidSource = FLUIDS.register(String.format("%s_fluid", pName), () -> new ForgeFlowingFluid.Source(ref.properties)); - RegistryObject fluidFlowing = FLUIDS.register(String.format("%s_flowing", pName), () -> new ForgeFlowingFluid.Flowing(ref.properties)); - RegistryObject liquidBlock = LIQUID_BLOCKS.register(pName, () -> new ChemicalLiquidBlock(fluidSource, pName)); - RegistryObject bucket = BUCKETS.register(String.format("%s_bucket", pName), () -> new BucketItem(fluidSource, new Item.Properties().stacksTo(1))); + DeferredHolder fluidSource = FLUIDS.register(String.format("%s_fluid", pName), () -> new BaseFlowingFluid.Source(ref.properties)); + DeferredHolder fluidFlowing = FLUIDS.register(String.format("%s_flowing", pName), () -> new BaseFlowingFluid.Flowing(ref.properties)); + DeferredBlock liquidBlock = LIQUID_BLOCKS.register(pName, () -> new ChemicalLiquidBlock(fluidSource.get(), pName)); + DeferredItem bucket = BUCKETS.register(String.format("%s_bucket", pName), () -> new BucketItem(fluidSource.get(), new Item.Properties().stacksTo(1))); - ref.properties = new ForgeFlowingFluid.Properties(fluidType, fluidSource, fluidFlowing) + ref.properties = new BaseFlowingFluid.Properties(fluidType, fluidSource, fluidFlowing) .slopeFindDistance(pSlopeFindDistance) .levelDecreasePerBlock(pDecreasePerBlock) .block(liquidBlock) @@ -95,22 +104,22 @@ public int getTintColor(FluidState state, BlockAndTintGetter getter, BlockPos po */ public static Stream getFluidsAsStream() { - return FLUIDS.getEntries().stream().map(RegistryObject::get); + return FLUIDS.getEntries().stream().map(DeferredHolder::get); } public static Stream getFluidTypesAsStream() { return getFluidsAsStream().map(Fluid::getFluidType); } - public static Stream getSourceFluidsAsStream() { - return getFluidsAsStream().filter(fluid -> fluid instanceof ForgeFlowingFluid.Source).map(fluid -> (ForgeFlowingFluid.Source) fluid); + public static Stream getSourceFluidsAsStream() { + return getFluidsAsStream().filter(fluid -> fluid instanceof BaseFlowingFluid.Source).map(fluid -> (BaseFlowingFluid.Source) fluid); } - public static Stream getLiquidSourceFluidsAsStream() { + public static Stream getLiquidSourceFluidsAsStream() { return getSourceFluidsAsStream().filter(source -> !source.getFluidType().isLighterThanAir()); } - public static Stream getGasSourceFluidsAsStream() { + public static Stream getGasSourceFluidsAsStream() { return getSourceFluidsAsStream().filter(source -> source.getFluidType().isLighterThanAir()); } @@ -139,19 +148,19 @@ public static List getGasSourceFluids() { */ public static Optional getFluidTypeByName(String pName) { - return getFluidTypesAsStream().filter(fluidType -> Objects.requireNonNull(ForgeRegistries.FLUID_TYPES.get().getKey(fluidType)).getPath().equals(pName)).findFirst(); + return getFluidTypesAsStream().filter(fluidType -> Objects.requireNonNull(NeoForgeRegistries.FLUID_TYPES.getKey(fluidType)).getPath().equals(pName)).findFirst(); } - public static Optional getSourceFluidByName(String pName) { - return getSourceFluidsAsStream().filter(source -> Objects.requireNonNull(ForgeRegistries.FLUID_TYPES.get().getKey(source.getFluidType())).getPath().equals(pName)).findFirst(); + public static Optional getSourceFluidByName(String pName) { + return getSourceFluidsAsStream().filter(source -> Objects.requireNonNull(NeoForgeRegistries.FLUID_TYPES.getKey(source.getFluidType())).getPath().equals(pName)).findFirst(); } - public static Optional getLiquidSourceFluidByName(String pName) { - return getLiquidSourceFluidsAsStream().filter(source -> Objects.requireNonNull(ForgeRegistries.FLUID_TYPES.get().getKey(source.getFluidType())).getPath().equals(pName)).findFirst(); + public static Optional getLiquidSourceFluidByName(String pName) { + return getLiquidSourceFluidsAsStream().filter(source -> Objects.requireNonNull(NeoForgeRegistries.FLUID_TYPES.getKey(source.getFluidType())).getPath().equals(pName)).findFirst(); } - public static Optional getGasSourceFluidByName(String pName) { - return getGasSourceFluidsAsStream().filter(source -> Objects.requireNonNull(ForgeRegistries.FLUID_TYPES.get().getKey(source.getFluidType())).getPath().equals(pName)).findFirst(); + public static Optional getGasSourceFluidByName(String pName) { + return getGasSourceFluidsAsStream().filter(source -> Objects.requireNonNull(NeoForgeRegistries.FLUID_TYPES.getKey(source.getFluidType())).getPath().equals(pName)).findFirst(); } /* @@ -159,11 +168,11 @@ public static Optional getGasSourceFluidByName(String */ public static Stream getLiquidBlocks() { - return LIQUID_BLOCKS.getEntries().stream().map(RegistryObject::get).map(block -> (LiquidBlock) block); + return LIQUID_BLOCKS.getEntries().stream().map(DeferredHolder::get).map(block -> (LiquidBlock) block); } public static Stream getBuckets() { - return BUCKETS.getEntries().stream().map(RegistryObject::get).map(item -> (BucketItem) item); + return BUCKETS.getEntries().stream().map(DeferredHolder::get).map(item -> (BucketItem) item); } public static List getAllSortedBuckets() { @@ -174,8 +183,8 @@ public static List getAllSortedBuckets() { public static List getElementBuckets() { Map bucketMap = new TreeMap<>(); - for(BucketItem bucket : BUCKETS.getEntries().stream().map(RegistryObject::get).map(item -> (BucketItem) item).toList()) { - String path = StringUtils.removeEnd(ForgeRegistries.FLUIDS.getResourceKey(bucket.getFluid()).get().location().getPath(), "_fluid"); + for(BucketItem bucket : BUCKETS.getEntries().stream().map(DeferredHolder::get).map(item -> (BucketItem) item).toList()) { + String path = StringUtils.removeEnd(BuiltInRegistries.FLUID.getResourceKey(bucket.content).get().location().getPath(), "_fluid"); ItemRegistry.getElementByName(path).ifPresent(elementItem -> bucketMap.put(elementItem.getAtomicNumber(), bucket)); } return bucketMap.values().stream().toList(); @@ -183,8 +192,8 @@ public static List getElementBuckets() { public static List getCompoundBuckets() { ArrayList buckets = new ArrayList<>(); - for(BucketItem bucket : BUCKETS.getEntries().stream().map(RegistryObject::get).map(item -> (BucketItem) item).toList()) { - String path = StringUtils.removeEnd(ForgeRegistries.FLUIDS.getResourceKey(bucket.getFluid()).get().location().getPath(), "_fluid"); + for(BucketItem bucket : BUCKETS.getEntries().stream().map(DeferredHolder::get).map(item -> (BucketItem) item).toList()) { + String path = StringUtils.removeEnd(BuiltInRegistries.FLUID.getResourceKey(bucket.content).get().location().getPath(), "_fluid"); ItemRegistry.getCompoundByName(path).ifPresent(compoundItem -> buckets.add(bucket)); } return buckets; @@ -192,7 +201,7 @@ public static List getCompoundBuckets() { public static List getSortedCompoundBuckets() { List buckets = getCompoundBuckets(); - buckets.sort((BucketItem b1, BucketItem b2) -> b1.getFluid().getFluidType().toString().compareToIgnoreCase(b2.getFluid().getFluidType().toString())); + buckets.sort((BucketItem b1, BucketItem b2) -> b1.content.getFluidType().toString().compareToIgnoreCase(b2.content.getFluidType().toString())); return buckets; } diff --git a/src/main/java/com/smashingmods/chemlib/registry/ItemRegistry.java b/src/main/java/com/smashingmods/chemlib/registry/ItemRegistry.java index af96a66f..8a978a23 100644 --- a/src/main/java/com/smashingmods/chemlib/registry/ItemRegistry.java +++ b/src/main/java/com/smashingmods/chemlib/registry/ItemRegistry.java @@ -5,17 +5,25 @@ import com.smashingmods.chemlib.api.MatterState; import com.smashingmods.chemlib.api.MetalType; import com.smashingmods.chemlib.common.blocks.ChemicalBlock; -import com.smashingmods.chemlib.common.items.*; +import com.smashingmods.chemlib.common.items.ChemicalBlockItem; +import com.smashingmods.chemlib.common.items.ChemicalItem; +import com.smashingmods.chemlib.common.items.CompoundItem; +import com.smashingmods.chemlib.common.items.ElementItem; +import com.smashingmods.chemlib.common.items.PeriodicTableItem; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.LiquidBlock; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; - -import java.util.*; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; +import java.util.Optional; import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -27,34 +35,34 @@ public class ItemRegistry { Each item type has a separate registry to make understanding and organizing them simpler. */ - public static final DeferredRegister REGISTRY_ELEMENTS = DeferredRegister.create(ForgeRegistries.ITEMS, ChemLib.MODID); - public static final DeferredRegister REGISTRY_COMPOUNDS = DeferredRegister.create(ForgeRegistries.ITEMS, ChemLib.MODID); - public static final DeferredRegister REGISTRY_COMPOUND_DUSTS = DeferredRegister.create(ForgeRegistries.ITEMS, ChemLib.MODID); - public static final DeferredRegister REGISTRY_METAL_DUSTS = DeferredRegister.create(ForgeRegistries.ITEMS, ChemLib.MODID); - public static final DeferredRegister REGISTRY_NUGGETS = DeferredRegister.create(ForgeRegistries.ITEMS, ChemLib.MODID); - public static final DeferredRegister REGISTRY_INGOTS = DeferredRegister.create(ForgeRegistries.ITEMS, ChemLib.MODID); - public static final DeferredRegister REGISTRY_PLATES = DeferredRegister.create(ForgeRegistries.ITEMS, ChemLib.MODID); - public static final DeferredRegister REGISTRY_BLOCK_ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, ChemLib.MODID); - public static final DeferredRegister REGISTRY_MISC_ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, ChemLib.MODID); + public static final DeferredRegister REGISTRY_ELEMENTS = DeferredRegister.createItems(ChemLib.MODID); + public static final DeferredRegister REGISTRY_COMPOUNDS = DeferredRegister.createItems(ChemLib.MODID); + public static final DeferredRegister REGISTRY_COMPOUND_DUSTS = DeferredRegister.createItems(ChemLib.MODID); + public static final DeferredRegister REGISTRY_METAL_DUSTS = DeferredRegister.createItems(ChemLib.MODID); + public static final DeferredRegister REGISTRY_NUGGETS = DeferredRegister.createItems(ChemLib.MODID); + public static final DeferredRegister REGISTRY_INGOTS = DeferredRegister.createItems(ChemLib.MODID); + public static final DeferredRegister REGISTRY_PLATES = DeferredRegister.createItems(ChemLib.MODID); + public static final DeferredRegister REGISTRY_BLOCK_ITEMS = DeferredRegister.createItems(ChemLib.MODID); + public static final DeferredRegister REGISTRY_MISC_ITEMS = DeferredRegister.createItems(ChemLib.MODID); /* This section defines helper methods for getting specific objects out of the registry. */ - public static Stream> getRegistryItems() { + public static Stream> getRegistryItems() { return ItemRegistry.REGISTRY_ELEMENTS.getEntries().stream(); } public static List getElements() { - return REGISTRY_ELEMENTS.getEntries().stream().map(RegistryObject::get).map(item -> (ElementItem) item).collect(Collectors.toList()); + return REGISTRY_ELEMENTS.getEntries().stream().map(DeferredHolder::get).map(item -> (ElementItem) item).collect(Collectors.toList()); } public static List getCompounds() { - return REGISTRY_COMPOUNDS.getEntries().stream().map(RegistryObject::get).map(item -> (CompoundItem) item).collect(Collectors.toList()); + return REGISTRY_COMPOUNDS.getEntries().stream().map(DeferredHolder::get).map(item -> (CompoundItem) item).collect(Collectors.toList()); } public static List getAllCompounds() { - return new LinkedList<>(REGISTRY_COMPOUNDS.getEntries().stream().map(RegistryObject::get).map(item -> (CompoundItem) item).toList()); + return new LinkedList<>(REGISTRY_COMPOUNDS.getEntries().stream().map(DeferredHolder::get).map(item -> (CompoundItem) item).toList()); } public static Stream getChemicalItems() { @@ -66,11 +74,11 @@ public static Stream getChemicalItems() { } public static List getChemicalBlockItems() { - return REGISTRY_BLOCK_ITEMS.getEntries().stream().map(RegistryObject::get).filter(item -> item instanceof ChemicalBlockItem).map(item -> (ChemicalBlockItem) item).collect(Collectors.toList()); + return REGISTRY_BLOCK_ITEMS.getEntries().stream().map(DeferredHolder::get).filter(item -> item instanceof ChemicalBlockItem).map(item -> (ChemicalBlockItem) item).collect(Collectors.toList()); } public static List getLiquidBlockItems() { - return REGISTRY_BLOCK_ITEMS.getEntries().stream().map(RegistryObject::get).filter(item -> item instanceof BlockItem).map(item -> (BlockItem) item).filter(blockItem -> blockItem.getBlock() instanceof LiquidBlock).collect(Collectors.toList()); + return REGISTRY_BLOCK_ITEMS.getEntries().stream().map(DeferredHolder::get).filter(item -> item instanceof BlockItem).map(item -> (BlockItem) item).filter(blockItem -> blockItem.getBlock() instanceof LiquidBlock).collect(Collectors.toList()); } public static DeferredRegister getChemicalItemRegistryByType(ChemicalItemType pChemicalItemType) { @@ -108,7 +116,7 @@ public static List getChemicalItemsByType(ChemicalItemType pChemic } public static Stream getChemicalItemsByTypeAsStream(ChemicalItemType pChemicalItemType) { - return getChemicalItemRegistryByType(pChemicalItemType).getEntries().stream().map(RegistryObject::get).map(item -> (ChemicalItem) item); + return getChemicalItemRegistryByType(pChemicalItemType).getEntries().stream().map(DeferredHolder::get).map(item -> (ChemicalItem) item); } public static Optional getChemicalItemByNameAndType(String pName, ChemicalItemType pChemicalItemType) { @@ -118,15 +126,15 @@ public static Optional getChemicalItemByNameAndType(String pName, .findFirst(); } - public static Optional getChemicalBlockItemByName(String pName) { - return REGISTRY_BLOCK_ITEMS.getEntries().stream().map(RegistryObject::get).filter(item -> Objects.requireNonNull(ForgeRegistries.ITEMS.getKey(item)).getPath().equals(pName)).findFirst(); + public static Optional getChemicalBlockItemByName(String pName) { + return REGISTRY_BLOCK_ITEMS.getEntries().stream().map(DeferredHolder::get).filter(item -> Objects.requireNonNull(BuiltInRegistries.ITEM.getKey(item)).getPath().equals(pName)).findFirst(); } /* Helper methods for registering items. */ - public static void registerItemByType(RegistryObject pRegistryObject, ChemicalItemType pChemicalItemType) { + public static void registerItemByType(DeferredHolder pRegistryObject, ChemicalItemType pChemicalItemType) { String registryName = String.format("%s_%s", pRegistryObject.getId().getPath(), pChemicalItemType.getSerializedName()); Supplier supplier = () -> new ChemicalItem(pRegistryObject.getId(), pChemicalItemType, new Item.Properties()); @@ -141,15 +149,15 @@ public static void registerItemByType(RegistryObject pRegistryObject, Chem } @SuppressWarnings("OptionalGetWithoutIsPresent") - public static RegistryObject getRegistryObject(DeferredRegister pRegister, String pName) { + public static DeferredHolder getRegistryObject(DeferredRegister pRegister, String pName) { return pRegister.getEntries().stream().filter(item -> item.getId().getPath().equals(pName)).findFirst().get(); } - public static void fromChemicalBlock(RegistryObject pBlock, Item.Properties pProperties) { + public static void fromChemicalBlock(DeferredHolder pBlock, Item.Properties pProperties) { REGISTRY_BLOCK_ITEMS.register(pBlock.getId().getPath(), () -> new ChemicalBlockItem((ChemicalBlock) pBlock.get(), pProperties)); } - public static void fromBlock(RegistryObject pBlock, Item.Properties pProperties) { + public static void fromBlock(DeferredHolder pBlock, Item.Properties pProperties) { REGISTRY_BLOCK_ITEMS.register(pBlock.getId().getPath(), () -> new BlockItem(pBlock.get(), pProperties)); } diff --git a/src/main/java/com/smashingmods/chemlib/registry/PaintingsRegistry.java b/src/main/java/com/smashingmods/chemlib/registry/PaintingsRegistry.java index afbbd946..8edb4673 100644 --- a/src/main/java/com/smashingmods/chemlib/registry/PaintingsRegistry.java +++ b/src/main/java/com/smashingmods/chemlib/registry/PaintingsRegistry.java @@ -1,16 +1,16 @@ package com.smashingmods.chemlib.registry; import com.smashingmods.chemlib.ChemLib; +import net.minecraft.core.registries.Registries; import net.minecraft.world.entity.decoration.PaintingVariant; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredRegister; public class PaintingsRegistry { - private static final DeferredRegister PAINTINGS = DeferredRegister.create(ForgeRegistries.PAINTING_VARIANTS, ChemLib.MODID); + private static final DeferredRegister PAINTINGS = DeferredRegister.create(Registries.PAINTING_VARIANT, ChemLib.MODID); public static void register(IEventBus eventBus) { - PAINTINGS.register("periodic_table", () -> new PaintingVariant(80, 48)); + PAINTINGS.register("periodic_table", () -> new PaintingVariant(80, 48, ChemLib.modLoc("periodic_table"))); PAINTINGS.register(eventBus); } } diff --git a/src/main/java/com/smashingmods/chemlib/registry/Registry.java b/src/main/java/com/smashingmods/chemlib/registry/Registry.java index 954ec1d7..e49d9d6f 100644 --- a/src/main/java/com/smashingmods/chemlib/registry/Registry.java +++ b/src/main/java/com/smashingmods/chemlib/registry/Registry.java @@ -3,7 +3,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.smashingmods.chemlib.ChemLib; -import net.minecraftforge.eventbus.api.IEventBus; +import net.neoforged.bus.api.IEventBus; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/main/java/com/smashingmods/chemlib/registry/TabsRegistry.java b/src/main/java/com/smashingmods/chemlib/registry/TabsRegistry.java index ee97dc0b..f21b9e72 100644 --- a/src/main/java/com/smashingmods/chemlib/registry/TabsRegistry.java +++ b/src/main/java/com/smashingmods/chemlib/registry/TabsRegistry.java @@ -11,22 +11,20 @@ import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.RegistryObject; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; import java.util.Comparator; -@Mod.EventBusSubscriber(modid = ChemLib.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) public class TabsRegistry { public static final DeferredRegister REGISTRY_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, ChemLib.MODID); - public static RegistryObject ELEMENT_TAB; - public static RegistryObject COMPOUND_TAB; - public static RegistryObject METALS_TAB; - public static RegistryObject MISC_TAB; + public static DeferredHolder ELEMENT_TAB; + public static DeferredHolder COMPOUND_TAB; + public static DeferredHolder METALS_TAB; + public static DeferredHolder MISC_TAB; public static void register(IEventBus pEventBus) { @@ -45,7 +43,7 @@ public static void register(IEventBus pEventBus) { .title(Component.translatable("itemGroup.chemlib.compounds")) .displayItems((pParameters, pOutput) -> { ItemRegistry.REGISTRY_COMPOUNDS.getEntries().stream() - .map(RegistryObject::get) + .map(DeferredHolder::get) .map(item -> (CompoundItem) item) .sorted(Comparator.comparing(CompoundItem::getChemicalName)) .toList() @@ -78,8 +76,8 @@ public static void register(IEventBus pEventBus) { .icon(() -> ItemRegistry.getChemicalBlockItemByName("radon_lamp_block").map(ItemStack::new).orElseGet(() -> new ItemStack(Items.AIR))) .title(Component.translatable("itemGroup.chemlib.misc")) .displayItems((pParameters, pOutput) -> { - ItemRegistry.REGISTRY_BLOCK_ITEMS.getEntries().stream().map(RegistryObject::get).filter(item -> item.getDescriptionId().contains("lamp_block")).forEach(pOutput::accept); - ItemRegistry.REGISTRY_MISC_ITEMS.getEntries().stream().map(RegistryObject::get).forEach(pOutput::accept); + ItemRegistry.REGISTRY_BLOCK_ITEMS.getEntries().stream().map(DeferredHolder::get).filter(item -> item.getDescriptionId().contains("lamp_block")).forEach(pOutput::accept); + ItemRegistry.REGISTRY_MISC_ITEMS.getEntries().stream().map(DeferredHolder::get).forEach(pOutput::accept); ItemRegistry.getChemicalItemByNameAndType("polyvinyl_chloride", ChemicalItemType.PLATE).ifPresent(pOutput::accept); FluidRegistry.getAllSortedBuckets().stream().map(ItemStack::new).forEach(pOutput::accept); }) diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/neoforge.mods.toml similarity index 88% rename from src/main/resources/META-INF/mods.toml rename to src/main/resources/META-INF/neoforge.mods.toml index 3b4f344e..3a53822e 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -10,9 +10,9 @@ authors="${mod_authors}" description='''${mod_description}''' [[dependencies.${mod_id}]] - modId="forge" + modId="neoforge" mandatory=true - versionRange="${forge_version_range}" + versionRange="${neo_version_range}" ordering="NONE" side="BOTH" [[dependencies.${mod_id}]] diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 47dd2395..342f85c1 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "ChemLib resources", - "pack_format": 9 + "pack_format": 34 } }