Merge remote-tracking branch 'origin/master-ceu' into master-ceu

SymmetricDevs · Nov 21, 2024 · 4a68fd9 · 4a68fd9
2 parents dd7c964 + 391732b
commit 4a68fd9
Showing 1 changed file with 45 additions and 28 deletions.
diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy
@@ -336,13 +336,13 @@ DISTILLATION_TOWER.recipeBuilder()
         .buildAndRegister()
 
 ROASTER.recipeBuilder()
-.inputs(ore('dustCalciumSulfate') * 6)
-.inputs(ore('dustAnyPurityCarbon') * 2)
-.outputs(metaitem('dustCalciumSulfide') * 2)
-.fluidOutputs(fluid('carbon_dioxide') * 2000)
-.duration(30)
-.EUt(7)
-.buildAndRegister()
+        .inputs(ore('dustCalciumSulfate') * 6)
+        .inputs(ore('dustAnyPurityCarbon') * 2)
+        .outputs(metaitem('dustCalciumSulfide') * 2)
+        .fluidOutputs(fluid('carbon_dioxide') * 2000)
+        .duration(30)
+        .EUt(7)
+        .buildAndRegister()
 
 // Fe2O3
 
@@ -716,22 +716,47 @@ DISTILLATION_TOWER.recipeBuilder()
 // Calcium Chloride
 mods.gregtech.electric_blast_furnace.removeByInput(120, [metaitem('dustCalcite') * 5, metaitem('dustSalt') * 4], null)
 
+MIXER.recipeBuilder()
+    .fluidInputs(fluid('water') * 1000)
+    .inputs(ore('dustCalciumChloride') * 3)
+    .fluidOutputs(fluid('calcium_chloride_solution') * 1000)
+    .duration(80)
+    .EUt(16)
+    .buildAndRegister()
+
 BR.recipeBuilder()
-.fluidInputs(fluid('hydrochloric_acid') * 2000)
-.inputs(ore('dustCalciumSulfide') * 2)
-.fluidOutputs(fluid('calcium_chloride_solution') * 1000)
-.fluidOutputs(fluid('hydrogen_sulfide') * 1000)
-.duration(80)
-.EUt(30)
-.buildAndRegister()
+    .fluidInputs(fluid('hydrochloric_acid') * 2000)
+    .inputs(ore('dustCalciumSulfide') * 2)
+    .fluidOutputs(fluid('calcium_chloride_solution') * 1000)
+    .fluidOutputs(fluid('hydrogen_sulfide') * 1000)
+    .duration(80)
+    .EUt(30)
+    .buildAndRegister()
+
+BR.recipeBuilder()
+    .fluidInputs(fluid('calcium_chloride_solution') * 1000)
+    .fluidInputs(fluid('diluted_sulfuric_acid') * 2000)
+    .fluidOutputs(fluid('hydrochloric_acid') * 2000)
+    .outputs(metaitem('dustCalciumSulfate') * 6)
+    .duration(60)
+    .EUt(30)
+    .buildAndRegister()
 
 DISTILLERY.recipeBuilder()
-.fluidInputs(fluid('calcium_chloride_solution') * 1000)
-.fluidOutputs(fluid('water') * 1000)
-.outputs(metaitem('dustCalciumChloride') * 3)
-.duration(160)
-.EUt(30)
-.buildAndRegister()
+    .fluidInputs(fluid('calcium_chloride_solution') * 1000)
+    .fluidOutputs(fluid('water') * 1000)
+    .outputs(metaitem('dustCalciumChloride') * 3)
+    .duration(160)
+    .EUt(30)
+    .buildAndRegister()
+
+DISTILLERY.recipeBuilder()
+    .fluidInputs(fluid('diluted_calcium_chloride_solution') * 2000)
+    .fluidOutputs(fluid('water') * 2000)
+    .outputs(metaitem('dustCalciumChloride') * 3)
+    .EUt(30)
+    .duration(100)
+    .buildAndRegister()
 
 // Soda Ash
 
@@ -1955,14 +1980,6 @@ BR.recipeBuilder()
 .duration(360)
 .buildAndRegister()
 
-DISTILLERY.recipeBuilder()
-.fluidInputs(fluid('diluted_calcium_chloride_solution') * 2000)
-.fluidOutputs(fluid('water') * 2000)
-.outputs(metaitem('dustCalciumChloride') * 3)
-.EUt(30)
-.duration(100)
-.buildAndRegister()
-
 MIXER.recipeBuilder()
 .inputs(ore('dustPotassiumCarbonate') * 6)
 .fluidInputs(fluid('water') * 1000)