diff --git a/groovy/postInit/biology/GreenhouseChain.groovy b/groovy/postInit/biology/GreenhouseChain.groovy index fd96ae6f4..e91cfa707 100755 --- a/groovy/postInit/biology/GreenhouseChain.groovy +++ b/groovy/postInit/biology/GreenhouseChain.groovy @@ -19,8 +19,10 @@ MACERATOR = recipemap('macerator') // Fertilizer * 4 mods.gregtech.mixer.removeByInput(30, [item('minecraft:dirt'), metaitem('dustWood') * 2, item('minecraft:sand') * 4], [fluid('water') * 1000]) +mods.gregtech.blender.removeByInput(30, [item('minecraft:dirt'), metaitem('dustWood') * 2, item('minecraft:sand') * 4], [fluid('water') * 1000]) // Fertilizer Solution * 5000 mods.gregtech.mixer.removeByInput(16, [item('minecraft:dye', 15)], [fluid('water') * 5000]) +mods.gregtech.blender.removeByInput(16, [item('minecraft:dye', 15)], [fluid('water') * 5000]) // Greenhouse Glass * 1 mods.gregtech.assembler.removeByInput(24, [metaitem('gregtechfoodoption:cupric_hydrogen_arsenite_dust'), item('gregtech:transparent_casing')], null) diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy index 949f0dc39..5f1097186 100644 --- a/groovy/postInit/chemistry/ChemistryOverhaul.groovy +++ b/groovy/postInit/chemistry/ChemistryOverhaul.groovy @@ -739,6 +739,7 @@ DISTILLERY.recipeBuilder() mods.gregtech.centrifuge.removeByInput(30, null, [fluid('gtfo_sodium_carbonate_solution') * 1000]) // Sodium Carbonate Solution * 1000 mods.gregtech.mixer.removeByInput(30, [metaitem('dustSodaAsh')], [fluid('water') * 1000]) +mods.gregtech.blender.removeByInput(30, [metaitem('dustSodaAsh')], [fluid('water') * 1000]) // Dutched Chocolate Liquor * 1 mods.gregtech.chemical_bath.removeByInput(540, [metaitem('gregtechfoodoption:chocolate_liquor_refined_crushed')], [fluid('gtfo_sodium_carbonate_solution') * 1000]) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/AluminiumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/AluminiumChain.groovy index aeb8caeca..8b00ae913 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/AluminiumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/AluminiumChain.groovy @@ -31,10 +31,13 @@ EBF.recipeBuilder() // Ruby Slurry * 3000 mods.gregtech.mixer.removeByInput(1920, [metaitem('crushedRuby') * 2], [fluid('aqua_regia') * 3000]) +mods.gregtech.blender.removeByInput(1920, [metaitem('crushedRuby') * 2], [fluid('aqua_regia') * 3000]) // Sapphire Slurry * 3000 mods.gregtech.mixer.removeByInput(1920, [metaitem('crushedSapphire') * 2], [fluid('aqua_regia') * 3000]) +mods.gregtech.blender.removeByInput(1920, [metaitem('crushedSapphire') * 2], [fluid('aqua_regia') * 3000]) // Green Sapphire Slurry * 3000 mods.gregtech.mixer.removeByInput(1920, [metaitem('crushedGreenSapphire') * 2], [fluid('aqua_regia') * 3000]) +mods.gregtech.blender.removeByInput(1920, [metaitem('crushedGreenSapphire') * 2], [fluid('aqua_regia') * 3000]) // Bauxite -> Red Mud diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/GalliumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/GalliumChain.groovy index 301b1ce0f..5f640fe27 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/GalliumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group13/GalliumChain.groovy @@ -94,6 +94,7 @@ VACUUM_DT.recipeBuilder() //GALLIUM ARSENIDE PRODUCTION (LIQUID ENCAPSULATED CZOCHIRALSKI PROCESS) mods.gregtech.mixer.removeByInput(7, [metaitem('dustGallium'), metaitem('dustArsenic'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) +mods.gregtech.blender.removeByInput(7, [metaitem('dustGallium'), metaitem('dustArsenic'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) //SEED CRYSTAL CRYSTALLIZER.recipeBuilder() .inputs(ore('dustSmallHighPurityArsenic')) diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy index 71f99f732..1f23f2354 100755 --- a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy +++ b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy @@ -460,8 +460,10 @@ def getUniquePairs(Map materialsMap) { // Cetane-Boosted Diesel * 750 mods.gregtech.mixer.removeByInput(480, null, [fluid('bio_diesel') * 1000, fluid('tetranitromethane') * 40]) +mods.gregtech.blender.removeByInput(480, null, [fluid('bio_diesel') * 1000, fluid('tetranitromethane') * 40]) // Cetane-Boosted Diesel * 1000 mods.gregtech.mixer.removeByInput(480, null, [fluid('diesel') * 1000, fluid('tetranitromethane') * 20]) +mods.gregtech.blender.removeByInput(480, null, [fluid('diesel') * 1000, fluid('tetranitromethane') * 20]) for (major_solvent in major_solvents) { for (minor_solvent in minor_solvents) { BLENDER.recipeBuilder() diff --git a/groovy/postInit/components/SMDComponents.groovy b/groovy/postInit/components/SMDComponents.groovy index 3b28c7fd9..eebb845e4 100644 --- a/groovy/postInit/components/SMDComponents.groovy +++ b/groovy/postInit/components/SMDComponents.groovy @@ -73,6 +73,7 @@ mods.gregtech.assembler.removeByInput(480, [metaitem('dustGalliumArsenide'), met // Ferrite Mixture Dust * 6 mods.gregtech.mixer.removeByInput(120, [metaitem('dustNickel'), metaitem('dustZinc'), metaitem('dustIron') * 4, metaitem('circuit.integrated').withNbt(["Configuration": 2])], null) +mods.gregtech.blender.removeByInput(120, [metaitem('dustNickel'), metaitem('dustZinc'), metaitem('dustIron') * 4, metaitem('circuit.integrated').withNbt(["Configuration": 2])], null) // Nickel Zinc Ferrite Ingot * 1 mods.gregtech.electric_blast_furnace.removeByInput(120, [metaitem('dustFerriteMixture')], [fluid('oxygen') * 2000]) diff --git a/groovy/postInit/components/Superconductors.groovy b/groovy/postInit/components/Superconductors.groovy index d19236eb2..fdb2058f8 100644 --- a/groovy/postInit/components/Superconductors.groovy +++ b/groovy/postInit/components/Superconductors.groovy @@ -16,12 +16,16 @@ for(name in recipesToRemove) { // Mercury Barium Calcium Cuprate Dust * 16 mods.gregtech.mixer.removeByInput(120, [metaitem('dustBarium') * 2, metaitem('dustCalcium') * 2, metaitem('dustCopper') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('mercury') * 1000, fluid('oxygen') * 8000]) +mods.gregtech.blender.removeByInput(120, [metaitem('dustBarium') * 2, metaitem('dustCalcium') * 2, metaitem('dustCopper') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('mercury') * 1000, fluid('oxygen') * 8000]) // Samarium Iron Arsenic Oxide Dust * 4 mods.gregtech.mixer.removeByInput(7680, [metaitem('dustSamarium'), metaitem('dustIron'), metaitem('dustArsenic'), metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('oxygen') * 1000]) +mods.gregtech.blender.removeByInput(7680, [metaitem('dustSamarium'), metaitem('dustIron'), metaitem('dustArsenic'), metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('oxygen') * 1000]) // Yttrium Barium Cuprate Dust * 13 mods.gregtech.mixer.removeByInput(1920, [metaitem('dustYttrium'), metaitem('dustBarium') * 2, metaitem('dustCopper') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('oxygen') * 7000]) +mods.gregtech.blender.removeByInput(1920, [metaitem('dustYttrium'), metaitem('dustBarium') * 2, metaitem('dustCopper') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('oxygen') * 7000]) // Indium Tin Barium Titanium Cuprate Dust * 16 mods.gregtech.mixer.removeByInput(30720, [metaitem('dustIndium') * 4, metaitem('dustTin') * 2, metaitem('dustBarium') * 2, metaitem('dustTitanium'), metaitem('dustCopper') * 7, metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('oxygen') * 14000]) +mods.gregtech.blender.removeByInput(30720, [metaitem('dustIndium') * 4, metaitem('dustTin') * 2, metaitem('dustBarium') * 2, metaitem('dustTitanium'), metaitem('dustCopper') * 7, metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('oxygen') * 14000]) // Hot Mercury Barium Calcium Cuprate Ingot * 1 mods.gregtech.electric_blast_furnace.removeByInput(480, [metaitem('dustMercuryBariumCalciumCuprate'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('nitrogen') * 1000]) diff --git a/groovy/postInit/metallurgy/StainlessSteelChain.groovy b/groovy/postInit/metallurgy/StainlessSteelChain.groovy index 509166a79..b417ca4c4 100644 --- a/groovy/postInit/metallurgy/StainlessSteelChain.groovy +++ b/groovy/postInit/metallurgy/StainlessSteelChain.groovy @@ -8,8 +8,10 @@ import static gregtech.api.unification.ore.OrePrefix.dye; //REMOVE OLD RECIPES // Stainless Steel Dust * 9 mods.gregtech.mixer.removeByInput(120, [metaitem('dustIron') * 6, metaitem('dustNickel'), metaitem('dustManganese'), metaitem('dustChrome'), metaitem('circuit.integrated').withNbt(["Configuration": 3])], null) +mods.gregtech.blender.removeByInput(120, [metaitem('dustIron') * 6, metaitem('dustNickel'), metaitem('dustManganese'), metaitem('dustChrome'), metaitem('circuit.integrated').withNbt(["Configuration": 3])], null) // Stainless Steel Dust * 9 mods.gregtech.mixer.removeByInput(120, [metaitem('dustIron') * 4, metaitem('dustInvar') * 3, metaitem('dustManganese'), metaitem('dustChrome'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) +mods.gregtech.blender.removeByInput(120, [metaitem('dustIron') * 4, metaitem('dustInvar') * 3, metaitem('dustManganese'), metaitem('dustChrome'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) EBF = recipemap('electric_blast_furnace') MIXER = recipemap('mixer') diff --git a/groovy/postInit/misc/CementChain.groovy b/groovy/postInit/misc/CementChain.groovy index 5a826c419..19a17af2b 100755 --- a/groovy/postInit/misc/CementChain.groovy +++ b/groovy/postInit/misc/CementChain.groovy @@ -156,10 +156,13 @@ for (int i = 0; i < 16; i++) { //REMOVALS OF DEFAULT RECIPES // Concrete * 576 mods.gregtech.mixer.removeByInput(16, [metaitem('dustClay'), metaitem('dustStone') * 3], [fluid('water') * 500]) +mods.gregtech.blender.removeByInput(16, [metaitem('dustClay'), metaitem('dustStone') * 3], [fluid('water') * 500]) // Concrete * 1152 mods.gregtech.mixer.removeByInput(16, [metaitem('dustStone') * 2, metaitem('dustCalcite'), metaitem('dustGypsum')], [fluid('water') * 1000]) +mods.gregtech.blender.removeByInput(16, [metaitem('dustStone') * 2, metaitem('dustCalcite'), metaitem('dustGypsum')], [fluid('water') * 1000]) // Concrete * 1152 mods.gregtech.mixer.removeByInput(16, [metaitem('dustStone') * 2, metaitem('dustMarble'), metaitem('dustGypsum')], [fluid('water') * 1000]) +mods.gregtech.blender.removeByInput(16, [metaitem('dustStone') * 2, metaitem('dustMarble'), metaitem('dustGypsum')], [fluid('water') * 1000]) def name_removals = [ 'minecraft:white_concrete_powder', @@ -188,6 +191,7 @@ for (name in name_removals) { for (dye in dyes) { // Concrete Powder * 8 mods.gregtech.mixer.removeByInput(7, [item('minecraft:sand') * 4, item('minecraft:gravel') * 4], [fluid(dye) * 144]) + mods.gregtech.blender.removeByInput(7, [item('minecraft:sand') * 4, item('minecraft:gravel') * 4], [fluid(dye) * 144]) } for (int i = 0; i < 16; i++) { diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy index ca27c6194..c88146c45 100644 --- a/groovy/postInit/mod/GregTech.groovy +++ b/groovy/postInit/mod/GregTech.groovy @@ -26,6 +26,7 @@ mods.gregtech.centrifuge.removeByInput(30, [metaitem('dustCoal')], null) mods.gregtech.extractor.removeByInput(64, [metaitem('dustMonazite')], null) // Graphene Dust * 1 mods.gregtech.mixer.removeByInput(480, [metaitem('dustGraphite'), metaitem('dustSilicon'), metaitem('dustCarbon') * 4, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) +mods.gregtech.blender.removeByInput(480, [metaitem('dustGraphite'), metaitem('dustSilicon'), metaitem('dustCarbon') * 4, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) // Wrought Iron Ingot * 2 mods.gregtech.electric_blast_furnace.removeByInput(480, [metaitem('dustIlmenite') * 10, metaitem('dustCarbon') * 4], null) // Stone Slab * 2 @@ -52,6 +53,7 @@ mods.gregtech.arc_furnace.removeByInput(30, [item('gregtech:turbine_casing', 5)] mods.gregtech.macerator.removeByInput(8, [item('gregtech:turbine_casing', 5)], null) // Gelatin Mixture * 4000 mods.gregtech.mixer.removeByInput(480, [metaitem('dustCollagen') * 4], [fluid('phosphoric_acid') * 1000, fluid('water') * 3000]) +mods.gregtech.blender.removeByInput(480, [metaitem('dustCollagen') * 4], [fluid('phosphoric_acid') * 1000, fluid('water') * 3000]) // Phosphorus Dust * 1 mods.gregtech.centrifuge.removeByInput(480, null, [fluid('gelatin_mixture') * 6000]) // Reservoir Hatch * 1 @@ -881,6 +883,7 @@ LATEX_COLLECTOR.recipeBuilder() //TODO: ADD GRAVITY SEPARATOR STUFF // Construction Foam * 8000 mods.gregtech.mixer.removeByInput(16, [metaitem('dustRawRubber')], [fluid('concrete') * 576]) +mods.gregtech.blender.removeByInput(16, [metaitem('dustRawRubber')], [fluid('concrete') * 576]) MIXER.recipeBuilder() .inputs(ore('dustRubber')) diff --git a/groovy/postInit/mod/GregTechFoodOption.groovy b/groovy/postInit/mod/GregTechFoodOption.groovy index d79888c76..c0b11d291 100755 --- a/groovy/postInit/mod/GregTechFoodOption.groovy +++ b/groovy/postInit/mod/GregTechFoodOption.groovy @@ -550,3 +550,5 @@ mods.gregtech.lathe.removeByInput(30, [metaitem('stickSteel')], null) // Skewer * 8 mods.gregtech.lathe.removeByInput(40, [metaitem('stickStainlessSteel')], null) +// Baking Soda Solution * 1000 +mods.gregtech.blender.removeByInput(8, [metaitem('dustSodiumBicarbonate')], [fluid('water') * 1000]) diff --git a/groovy/postInit/mod/VanillaRecipes.groovy b/groovy/postInit/mod/VanillaRecipes.groovy index 9c0690152..9f1e1db05 100755 --- a/groovy/postInit/mod/VanillaRecipes.groovy +++ b/groovy/postInit/mod/VanillaRecipes.groovy @@ -584,10 +584,13 @@ mods.gregtech.macerator.recipeBuilder() //Mixer // Fermented Spider Eye * 1 mods.gregtech.mixer.removeByInput(7, [item('minecraft:sugar'), item('minecraft:red_mushroom'), item('minecraft:spider_eye')], null) +mods.gregtech.blender.removeByInput(7, [item('minecraft:sugar'), item('minecraft:red_mushroom'), item('minecraft:spider_eye')], null) // Fermented Spider Eye * 1 mods.gregtech.mixer.removeByInput(7, [item('minecraft:sugar'), item('minecraft:brown_mushroom'), item('minecraft:spider_eye')], null) +mods.gregtech.blender.removeByInput(7, [item('minecraft:sugar'), item('minecraft:brown_mushroom'), item('minecraft:spider_eye')], null) // Fire Charge * 3 mods.gregtech.mixer.removeByInput(30, [metaitem('dustCoal'), item('minecraft:gunpowder'), item('minecraft:blaze_powder')], null) +mods.gregtech.blender.removeByInput(30, [metaitem('dustCoal'), item('minecraft:gunpowder'), item('minecraft:blaze_powder')], null) mods.gregtech.mixer.recipeBuilder() .inputs(ore('dustCoal')) .inputs(ore('dustGunpowder')) @@ -742,6 +745,9 @@ crafting.addShaped('minecraft:arrow_from_paper', item('minecraft:arrow') * 8, [ mods.gregtech.mixer.removeByInput(7, [metaitem('dustSaltpeter') * 2, metaitem('dustSulfur'), metaitem('dustCarbon') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) mods.gregtech.mixer.removeByInput(7, [metaitem('dustSaltpeter') * 2, metaitem('dustSulfur'), metaitem('dustCoal') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) mods.gregtech.mixer.removeByInput(7, [metaitem('dustSaltpeter') * 2, metaitem('dustSulfur'), metaitem('dustCharcoal') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) +mods.gregtech.blender.removeByInput(7, [metaitem('dustSaltpeter') * 2, metaitem('dustSulfur'), metaitem('dustCarbon') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) +mods.gregtech.blender.removeByInput(7, [metaitem('dustSaltpeter') * 2, metaitem('dustSulfur'), metaitem('dustCoal') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) +mods.gregtech.blender.removeByInput(7, [metaitem('dustSaltpeter') * 2, metaitem('dustSulfur'), metaitem('dustCharcoal') * 3, metaitem('circuit.integrated').withNbt(["Configuration": 1])], null) recipemap('mixer').recipeBuilder() .inputs(ore('dustSaltpeter') * 2)