From 5143bd5425b9d73a581a5adadf22337b076801e5 Mon Sep 17 00:00:00 2001 From: planetme <87911459+planetme@users.noreply.github.com> Date: Sat, 28 Oct 2023 20:06:36 -0500 Subject: [PATCH 1/3] add all HP mat dusts to regular dust oredict --- .../chemistry/ChemistryOverhaul.groovy | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy index 63b24a157..0bf63bcf8 100755 --- a/groovy/postInit/chemistry/ChemistryOverhaul.groovy +++ b/groovy/postInit/chemistry/ChemistryOverhaul.groovy @@ -62,6 +62,78 @@ def CARBON_DUSTS = [ "dustAnthracite" ] +oreDict.add('dustLithium', metaitem('dustHighPurityLithium')) +oreDict.add('dustBeryllium', metaitem('dustHighPurityBeryllium')) +oreDict.add('dustBoron', metaitem('dustHighPurityBoron')) +oreDict.add('dustCarbon', metaitem('dustHighPurityCarbon')) +oreDict.add('dustSodium', metaitem('dustHighPuritySodium')) +oreDict.add('dustMagnesium', metaitem('dustHighPurityMagnesium')) +oreDict.add('dustAluminium', metaitem('dustHighPurityAluminium')) +oreDict.add('dustSilicon', metaitem('dustHighPuritySilicon')) +oreDict.add('dustPhosphorus', metaitem('dustHighPurityPhosphorus')) +oreDict.add('dustSulfur', metaitem('dustHighPuritySulfur')) +oreDict.add('dustPotassium', metaitem('dustHighPurityPotassium')) +oreDict.add('dustCalcium', metaitem('dustHighPurityCalcium')) +oreDict.add('dustScandium', metaitem('dustHighPurityScandium')) +oreDict.add('dustTitanium', metaitem('dustHighPurityTitanium')) +oreDict.add('dustVanadium', metaitem('dustHighPurityVanadium')) +oreDict.add('dustChrome', metaitem('dustHighPurityChrome')) +oreDict.add('dustManganese', metaitem('dustHighPurityManganese')) +oreDict.add('dustIron', metaitem('dustHighPurityIron')) +oreDict.add('dustCobalt', metaitem('dustHighPurityCobalt')) +oreDict.add('dustNickel', metaitem('dustHighPurityNickel')) +oreDict.add('dustCopper', metaitem('dustHighPurityCopper')) +oreDict.add('dustZinc', metaitem('dustHighPurityZinc')) +oreDict.add('dustGallium', metaitem('dustHighPurityGallium')) +oreDict.add('dustGermanium', metaitem('dustHighPurityGermanium')) +oreDict.add('dustArsenic', metaitem('dustHighPurityArsenic')) +oreDict.add('dustSelenium', metaitem('dustHighPuritySelenium')) +oreDict.add('dustRubidium', metaitem('dustHighPurityRubidium')) +oreDict.add('dustStrontium', metaitem('dustHighPurityStrontium')) +oreDict.add('dustYttrium', metaitem('dustHighPurityYttrium')) +oreDict.add('dustZirconium', metaitem('dustHighPurityZirconium')) +oreDict.add('dustNiobium', metaitem('dustHighPurityNiobium')) +oreDict.add('dustMolybdenum', metaitem('dustHighPurityMolybdenum')) +oreDict.add('dustTechnetium', metaitem('dustHighPurityTechnetium')) +oreDict.add('dustRhenium', metaitem('dustHighPurityRhenium')) +oreDict.add('dustRhodium', metaitem('dustHighPurityRhodium')) +oreDict.add('dustPalladium', metaitem('dustHighPurityPalladium')) +oreDict.add('dustSilver', metaitem('dustHighPuritySilver')) +oreDict.add('dustCadmium', metaitem('dustHighPurityCadmium')) +oreDict.add('dustIndium', metaitem('dustHighPurityIndium')) +oreDict.add('dustTin', metaitem('dustHighPurityTin')) +oreDict.add('dustAntimony', metaitem('dustHighPurityAntimony')) +oreDict.add('dustTellurium', metaitem('dustHighPurityTellurium')) +oreDict.add('dustIodine', metaitem('dustHighPurityIodine')) +oreDict.add('dustCaesium', metaitem('dustHighPurityCaesium')) +oreDict.add('dustBarium', metaitem('dustHighPurityBarium')) +oreDict.add('dustLanthanum', metaitem('dustHighPurityLanthanum')) +oreDict.add('dustHafnium', metaitem('dustHighPurityHafnium')) +oreDict.add('dustTantalum', metaitem('dustHighPurityTantalum')) +oreDict.add('dustTungsten', metaitem('dustHighPurityTungsten')) +oreDict.add('dustRhenium', metaitem('dustHighPurityRhenium')) +oreDict.add('dustOsmium', metaitem('dustHighPurityOsmium')) +oreDict.add('dustIridium', metaitem('dustHighPurityIridium')) +oreDict.add('dustPlatinum', metaitem('dustHighPurityPlatinum')) +oreDict.add('dustGold', metaitem('dustHighPurityGold')) +oreDict.add('dustThallium', metaitem('dustHighPurityThallium')) +oreDict.add('dustLead', metaitem('dustHighPurityLead')) +oreDict.add('dustBismuth', metaitem('dustHighPurityBismuth')) +oreDict.add('dustCerium', metaitem('dustHighPurityCerium')) +oreDict.add('dustPraseodymium', metaitem('dustHighPurityPraseodymium')) +oreDict.add('dustNeodymium', metaitem('dustHighPurityNeodymium')) +oreDict.add('dustSamarium', metaitem('dustHighPuritySamarium')) +oreDict.add('dustEuropium', metaitem('dustHighPurityEuropium')) +oreDict.add('dustGadolinium', metaitem('dustHighPurityGadolinium')) +oreDict.add('dustTerbium', metaitem('dustHighPurityTerbium')) +oreDict.add('dustDysprosium', metaitem('dustHighPurityDysprosium')) +oreDict.add('dustHolmium', metaitem('dustHighPurityHolmium')) +oreDict.add('dustErbium', metaitem('dustHighPurityErbium')) +oreDict.add('dustThulium', metaitem('dustHighPurityThulium')) +oreDict.add('dustYtterbium', metaitem('dustHighPurityYtterbium')) +oreDict.add('dustLutetium', metaitem('dustHighPurityLutetium')) +oreDict.add('dustThorium', metaitem('dustHighPurityThorium')) + ASSEMBLER.recipeBuilder() .inputs(ore('stickIron') * 4) .inputs(ore('pipeTinyFluidSteel') * 4) From d16ec14a6cceb3b291617be8dfe00611aed22f8f Mon Sep 17 00:00:00 2001 From: planetme <87911459+planetme@users.noreply.github.com> Date: Sat, 28 Oct 2023 23:19:57 -0500 Subject: [PATCH 2/3] use metaitem for iron dust smelting removal (there is no HP smelting recipe) --- groovy/postInit/gameplay/Smelting.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/groovy/postInit/gameplay/Smelting.groovy b/groovy/postInit/gameplay/Smelting.groovy index 6616cd9d6..07f6d86c6 100644 --- a/groovy/postInit/gameplay/Smelting.groovy +++ b/groovy/postInit/gameplay/Smelting.groovy @@ -8,7 +8,7 @@ def oreDictSmeltingRemovals = [ ore('crushedCentrifugedIron'), ore('dustImpureIron'), ore('dustPureIron'), - ore('dustIron'), + metaitem('dustIron'), ore('oreBandedIron'), ore('oreNetherrackBandedIron'), From c44439d41917816cd5efdfd72f8bd6eb69c79673 Mon Sep 17 00:00:00 2001 From: planetme <87911459+planetme@users.noreply.github.com> Date: Mon, 1 Jan 2024 20:49:49 -0600 Subject: [PATCH 3/3] move oredict additions to prepostinit --- .../chemistry/ChemistryOverhaul.groovy | 72 ------------------ groovy/prePostInit/oreDict.groovy | 73 +++++++++++++++++++ 2 files changed, 73 insertions(+), 72 deletions(-) diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy index 73626a51d..fa767ddbd 100644 --- a/groovy/postInit/chemistry/ChemistryOverhaul.groovy +++ b/groovy/postInit/chemistry/ChemistryOverhaul.groovy @@ -43,78 +43,6 @@ VACUUM_DT = recipemap('vacuum_distillation') CRACKER = recipemap('cracker') FLUID_HEATER = recipemap('fluid_heater') -oreDict.add('dustLithium', metaitem('dustHighPurityLithium')) -oreDict.add('dustBeryllium', metaitem('dustHighPurityBeryllium')) -oreDict.add('dustBoron', metaitem('dustHighPurityBoron')) -oreDict.add('dustCarbon', metaitem('dustHighPurityCarbon')) -oreDict.add('dustSodium', metaitem('dustHighPuritySodium')) -oreDict.add('dustMagnesium', metaitem('dustHighPurityMagnesium')) -oreDict.add('dustAluminium', metaitem('dustHighPurityAluminium')) -oreDict.add('dustSilicon', metaitem('dustHighPuritySilicon')) -oreDict.add('dustPhosphorus', metaitem('dustHighPurityPhosphorus')) -oreDict.add('dustSulfur', metaitem('dustHighPuritySulfur')) -oreDict.add('dustPotassium', metaitem('dustHighPurityPotassium')) -oreDict.add('dustCalcium', metaitem('dustHighPurityCalcium')) -oreDict.add('dustScandium', metaitem('dustHighPurityScandium')) -oreDict.add('dustTitanium', metaitem('dustHighPurityTitanium')) -oreDict.add('dustVanadium', metaitem('dustHighPurityVanadium')) -oreDict.add('dustChrome', metaitem('dustHighPurityChrome')) -oreDict.add('dustManganese', metaitem('dustHighPurityManganese')) -oreDict.add('dustIron', metaitem('dustHighPurityIron')) -oreDict.add('dustCobalt', metaitem('dustHighPurityCobalt')) -oreDict.add('dustNickel', metaitem('dustHighPurityNickel')) -oreDict.add('dustCopper', metaitem('dustHighPurityCopper')) -oreDict.add('dustZinc', metaitem('dustHighPurityZinc')) -oreDict.add('dustGallium', metaitem('dustHighPurityGallium')) -oreDict.add('dustGermanium', metaitem('dustHighPurityGermanium')) -oreDict.add('dustArsenic', metaitem('dustHighPurityArsenic')) -oreDict.add('dustSelenium', metaitem('dustHighPuritySelenium')) -oreDict.add('dustRubidium', metaitem('dustHighPurityRubidium')) -oreDict.add('dustStrontium', metaitem('dustHighPurityStrontium')) -oreDict.add('dustYttrium', metaitem('dustHighPurityYttrium')) -oreDict.add('dustZirconium', metaitem('dustHighPurityZirconium')) -oreDict.add('dustNiobium', metaitem('dustHighPurityNiobium')) -oreDict.add('dustMolybdenum', metaitem('dustHighPurityMolybdenum')) -oreDict.add('dustTechnetium', metaitem('dustHighPurityTechnetium')) -oreDict.add('dustRhenium', metaitem('dustHighPurityRhenium')) -oreDict.add('dustRhodium', metaitem('dustHighPurityRhodium')) -oreDict.add('dustPalladium', metaitem('dustHighPurityPalladium')) -oreDict.add('dustSilver', metaitem('dustHighPuritySilver')) -oreDict.add('dustCadmium', metaitem('dustHighPurityCadmium')) -oreDict.add('dustIndium', metaitem('dustHighPurityIndium')) -oreDict.add('dustTin', metaitem('dustHighPurityTin')) -oreDict.add('dustAntimony', metaitem('dustHighPurityAntimony')) -oreDict.add('dustTellurium', metaitem('dustHighPurityTellurium')) -oreDict.add('dustIodine', metaitem('dustHighPurityIodine')) -oreDict.add('dustCaesium', metaitem('dustHighPurityCaesium')) -oreDict.add('dustBarium', metaitem('dustHighPurityBarium')) -oreDict.add('dustLanthanum', metaitem('dustHighPurityLanthanum')) -oreDict.add('dustHafnium', metaitem('dustHighPurityHafnium')) -oreDict.add('dustTantalum', metaitem('dustHighPurityTantalum')) -oreDict.add('dustTungsten', metaitem('dustHighPurityTungsten')) -oreDict.add('dustRhenium', metaitem('dustHighPurityRhenium')) -oreDict.add('dustOsmium', metaitem('dustHighPurityOsmium')) -oreDict.add('dustIridium', metaitem('dustHighPurityIridium')) -oreDict.add('dustPlatinum', metaitem('dustHighPurityPlatinum')) -oreDict.add('dustGold', metaitem('dustHighPurityGold')) -oreDict.add('dustThallium', metaitem('dustHighPurityThallium')) -oreDict.add('dustLead', metaitem('dustHighPurityLead')) -oreDict.add('dustBismuth', metaitem('dustHighPurityBismuth')) -oreDict.add('dustCerium', metaitem('dustHighPurityCerium')) -oreDict.add('dustPraseodymium', metaitem('dustHighPurityPraseodymium')) -oreDict.add('dustNeodymium', metaitem('dustHighPurityNeodymium')) -oreDict.add('dustSamarium', metaitem('dustHighPuritySamarium')) -oreDict.add('dustEuropium', metaitem('dustHighPurityEuropium')) -oreDict.add('dustGadolinium', metaitem('dustHighPurityGadolinium')) -oreDict.add('dustTerbium', metaitem('dustHighPurityTerbium')) -oreDict.add('dustDysprosium', metaitem('dustHighPurityDysprosium')) -oreDict.add('dustHolmium', metaitem('dustHighPurityHolmium')) -oreDict.add('dustErbium', metaitem('dustHighPurityErbium')) -oreDict.add('dustThulium', metaitem('dustHighPurityThulium')) -oreDict.add('dustYtterbium', metaitem('dustHighPurityYtterbium')) -oreDict.add('dustLutetium', metaitem('dustHighPurityLutetium')) -oreDict.add('dustThorium', metaitem('dustHighPurityThorium')) - ASSEMBLER.recipeBuilder() .inputs(ore('stickIron') * 4) .inputs(ore('pipeTinyFluidSteel') * 4) diff --git a/groovy/prePostInit/oreDict.groovy b/groovy/prePostInit/oreDict.groovy index ec82b95cc..6d957a967 100644 --- a/groovy/prePostInit/oreDict.groovy +++ b/groovy/prePostInit/oreDict.groovy @@ -241,6 +241,79 @@ mods.jei.hideCategory('gregtech:combustion_generator') mods.jei.hideCategory('minecraft.anvil') +//High purity oredicting +oreDict.add('dustLithium', metaitem('dustHighPurityLithium')) +oreDict.add('dustBeryllium', metaitem('dustHighPurityBeryllium')) +oreDict.add('dustBoron', metaitem('dustHighPurityBoron')) +oreDict.add('dustCarbon', metaitem('dustHighPurityCarbon')) +oreDict.add('dustSodium', metaitem('dustHighPuritySodium')) +oreDict.add('dustMagnesium', metaitem('dustHighPurityMagnesium')) +oreDict.add('dustAluminium', metaitem('dustHighPurityAluminium')) +oreDict.add('dustSilicon', metaitem('dustHighPuritySilicon')) +oreDict.add('dustPhosphorus', metaitem('dustHighPurityPhosphorus')) +oreDict.add('dustSulfur', metaitem('dustHighPuritySulfur')) +oreDict.add('dustPotassium', metaitem('dustHighPurityPotassium')) +oreDict.add('dustCalcium', metaitem('dustHighPurityCalcium')) +oreDict.add('dustScandium', metaitem('dustHighPurityScandium')) +oreDict.add('dustTitanium', metaitem('dustHighPurityTitanium')) +oreDict.add('dustVanadium', metaitem('dustHighPurityVanadium')) +oreDict.add('dustChrome', metaitem('dustHighPurityChrome')) +oreDict.add('dustManganese', metaitem('dustHighPurityManganese')) +oreDict.add('dustIron', metaitem('dustHighPurityIron')) +oreDict.add('dustCobalt', metaitem('dustHighPurityCobalt')) +oreDict.add('dustNickel', metaitem('dustHighPurityNickel')) +oreDict.add('dustCopper', metaitem('dustHighPurityCopper')) +oreDict.add('dustZinc', metaitem('dustHighPurityZinc')) +oreDict.add('dustGallium', metaitem('dustHighPurityGallium')) +oreDict.add('dustGermanium', metaitem('dustHighPurityGermanium')) +oreDict.add('dustArsenic', metaitem('dustHighPurityArsenic')) +oreDict.add('dustSelenium', metaitem('dustHighPuritySelenium')) +oreDict.add('dustRubidium', metaitem('dustHighPurityRubidium')) +oreDict.add('dustStrontium', metaitem('dustHighPurityStrontium')) +oreDict.add('dustYttrium', metaitem('dustHighPurityYttrium')) +oreDict.add('dustZirconium', metaitem('dustHighPurityZirconium')) +oreDict.add('dustNiobium', metaitem('dustHighPurityNiobium')) +oreDict.add('dustMolybdenum', metaitem('dustHighPurityMolybdenum')) +oreDict.add('dustTechnetium', metaitem('dustHighPurityTechnetium')) +oreDict.add('dustRhenium', metaitem('dustHighPurityRhenium')) +oreDict.add('dustRhodium', metaitem('dustHighPurityRhodium')) +oreDict.add('dustPalladium', metaitem('dustHighPurityPalladium')) +oreDict.add('dustSilver', metaitem('dustHighPuritySilver')) +oreDict.add('dustCadmium', metaitem('dustHighPurityCadmium')) +oreDict.add('dustIndium', metaitem('dustHighPurityIndium')) +oreDict.add('dustTin', metaitem('dustHighPurityTin')) +oreDict.add('dustAntimony', metaitem('dustHighPurityAntimony')) +oreDict.add('dustTellurium', metaitem('dustHighPurityTellurium')) +oreDict.add('dustIodine', metaitem('dustHighPurityIodine')) +oreDict.add('dustCaesium', metaitem('dustHighPurityCaesium')) +oreDict.add('dustBarium', metaitem('dustHighPurityBarium')) +oreDict.add('dustLanthanum', metaitem('dustHighPurityLanthanum')) +oreDict.add('dustHafnium', metaitem('dustHighPurityHafnium')) +oreDict.add('dustTantalum', metaitem('dustHighPurityTantalum')) +oreDict.add('dustTungsten', metaitem('dustHighPurityTungsten')) +oreDict.add('dustRhenium', metaitem('dustHighPurityRhenium')) +oreDict.add('dustOsmium', metaitem('dustHighPurityOsmium')) +oreDict.add('dustIridium', metaitem('dustHighPurityIridium')) +oreDict.add('dustPlatinum', metaitem('dustHighPurityPlatinum')) +oreDict.add('dustGold', metaitem('dustHighPurityGold')) +oreDict.add('dustThallium', metaitem('dustHighPurityThallium')) +oreDict.add('dustLead', metaitem('dustHighPurityLead')) +oreDict.add('dustBismuth', metaitem('dustHighPurityBismuth')) +oreDict.add('dustCerium', metaitem('dustHighPurityCerium')) +oreDict.add('dustPraseodymium', metaitem('dustHighPurityPraseodymium')) +oreDict.add('dustNeodymium', metaitem('dustHighPurityNeodymium')) +oreDict.add('dustSamarium', metaitem('dustHighPuritySamarium')) +oreDict.add('dustEuropium', metaitem('dustHighPurityEuropium')) +oreDict.add('dustGadolinium', metaitem('dustHighPurityGadolinium')) +oreDict.add('dustTerbium', metaitem('dustHighPurityTerbium')) +oreDict.add('dustDysprosium', metaitem('dustHighPurityDysprosium')) +oreDict.add('dustHolmium', metaitem('dustHighPurityHolmium')) +oreDict.add('dustErbium', metaitem('dustHighPurityErbium')) +oreDict.add('dustThulium', metaitem('dustHighPurityThulium')) +oreDict.add('dustYtterbium', metaitem('dustHighPurityYtterbium')) +oreDict.add('dustLutetium', metaitem('dustHighPurityLutetium')) +oreDict.add('dustThorium', metaitem('dustHighPurityThorium')) + //NTP knives /* //custom oredicts break with custom transforms, will report this bug today def name_knifeNTP = [