Merge pull request #1236 from Crindigo/stoic-fixes

Various fixes to stoic, 144L vs 1000L, carburized steel inputs, and liquid ice
SymmetricDevs · Jan 24, 2025 · e3bd97f · e3bd97f
2 parents 040adae + 6fb358a
commit e3bd97f
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 17 deletions.
diff --git a/groovy/postInit/biology/GreenhouseChain.groovy b/groovy/postInit/biology/GreenhouseChain.groovy
@@ -122,7 +122,7 @@ COMPRESSOR.recipeBuilder()
 PYROLYSE_OVEN.recipeBuilder()
         .inputs(item('minecraft:sugar') * 24)
         .outputs(metaitem('dustCarbon') * 6)
-        .fluidOutputs(fluid('steam') * 6000)
+        .fluidOutputs(fluid('dense_steam') * 6000)
         .duration(320)
         .EUt(64)
         .buildAndRegister()

diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy
@@ -3882,3 +3882,42 @@ MIXER.recipeBuilder()
         .EUt(30)
         .duration(160)
         .buildAndRegister()
+
+// Liquid Ice * 144
+mods.gregtech.extractor.removeByInput(30, [item('minecraft:ice')], null)
+mods.gregtech.extractor.removeByInput(30, [metaitem('dustIce')], null)
+
+FLUID_EXTRACTOR.recipeBuilder()
+        .inputs(item('minecraft:ice'))
+        .fluidOutputs(fluid('ice') * 1000)
+        .duration(6)
+        .EUt(30)
+        .buildAndRegister()
+
+FLUID_EXTRACTOR.recipeBuilder()
+        .inputs(metaitem('dustIce'))
+        .fluidOutputs(fluid('ice') * 1000)
+        .duration(6)
+        .EUt(30)
+        .buildAndRegister()
+
+// Water * 144
+mods.gregtech.fluid_heater.removeByInput(4, [metaitem('circuit.integrated').withNbt(['Configuration': 1])], [fluid('ice') * 144])
+
+FLUID_HEATER.recipeBuilder()
+        .fluidInputs(fluid('ice') * 1000)
+        .fluidOutputs(fluid('water') * 1000)
+        .duration(220)
+        .EUt(4)
+        .buildAndRegister()
+
+// Ice * 1
+mods.gregtech.fluid_solidifier.removeByInput(7, [metaitem('shape.mold.block')], [fluid('ice') * 144])
+
+mods.gregtech.fluid_solidifier.recipeBuilder()
+        .fluidInputs(fluid('ice') * 1000)
+        .notConsumable(metaitem('shape.mold.block'))
+        .outputs(item('minecraft:ice'))
+        .duration(6)
+        .EUt(7)
+        .buildAndRegister()
diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/ManganeseChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/ManganeseChain.groovy
@@ -312,7 +312,7 @@ ROASTER.recipeBuilder()
     .fluidInputs(fluid('potassium_hydroxide') * 864)
     .fluidInputs(fluid('oxygen') * 1000)
     .outputs(metaitem('dustPotassiumManganate') * 7)
-    .fluidOutputs(fluid('steam') * 2000)
+    .fluidOutputs(fluid('dense_steam') * 1000)
     .duration(200)
     .EUt(30)
     .buildAndRegister()

diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/AntimonyChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/AntimonyChain.groovy
@@ -135,25 +135,25 @@ ROASTER.recipeBuilder()
     .inputs(ore('dustSodiumHydroxide') * 54)
     .outputs(metaitem('dustAntimony') * 4)
     .outputs(metaitem('dustSodiumArsenate') * 48)
-    .fluidOutputs(fluid('steam') * 9000)
+    .fluidOutputs(fluid('dense_steam') * 9000)
     .EUt(Globals.voltAmps[2])
     .duration(200)
     .buildAndRegister()
 
 // REFINING
 
 VACUUM_DT.recipeBuilder()
-    .fluidInputs(fluid('antimony_trichloride') * 1000)
-    .fluidOutputs(fluid('purified_antimony_trichloride') * 1000)
+    .fluidInputs(fluid('antimony_trichloride') * 144)
+    .fluidOutputs(fluid('purified_antimony_trichloride') * 144)
     .EUt(Globals.voltAmps[2])
-    .duration(200)
+    .duration(50)
     .buildAndRegister()
 
 BR.recipeBuilder()
-    .fluidInputs(fluid('purified_antimony_trichloride') * 2000)
-    .fluidInputs(fluid('ultrapure_water') * 6000)
+    .fluidInputs(fluid('purified_antimony_trichloride') * 1152)
+    .fluidInputs(fluid('ultrapure_water') * 9000)
     .outputs(metaitem('dustPurifiedAntimonyTrioxide') * 5)
-    .fluidOutputs(fluid('hydrochloric_acid') * 3000)
+    .fluidOutputs(fluid('hydrochloric_acid') * 6000)
     .EUt(Globals.voltAmps[2])
     .duration(400)
     .buildAndRegister()
@@ -162,7 +162,7 @@ REACTION_FURNACE.recipeBuilder()
     .inputs(ore('dustPurifiedAntimonyTrioxide') * 5)
     .fluidInputs(fluid('hydrogen') * 6000)
     .outputs(metaitem('dustHighPurityAntimony') * 2)
-    .fluidOutputs(fluid('steam') * 3000)
+    .fluidOutputs(fluid('dense_steam') * 3000)
     .EUt(Globals.voltAmps[2])
     .duration(400)
     .buildAndRegister()
diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/ArsenicChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/ArsenicChain.groovy
@@ -358,7 +358,7 @@ ROASTER.recipeBuilder()
         .fluidInputs(fluid('acidic_copper_solution') * 2000)
         .outputs(metaitem('dustCopperSulfate') * 24)
         .fluidOutputs(fluid('dense_steam') * (8000 + 2000))
-        .fluidOutputs(fluid('oxygen') * 1000)
+        .fluidOutputs(fluid('oxygen') * 2000)
         .fluidOutputs(fluid('nitrogen_dioxide') * 4000)
         .duration(120)
         .EUt(Globals.voltAmps[1])

diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy
@@ -41,7 +41,7 @@ REACTION_FURNACE.recipeBuilder()
 REACTION_FURNACE.recipeBuilder()
     .notConsumable(metaitem('catalystBedAlumina'))
     .fluidInputs(fluid('uncatalyzed_sulfurous_gases') * 3000)
-    .fluidOutputs(fluid('steam') * 2000)
+    .fluidOutputs(fluid('dense_steam') * 3000)
     .outputs(metaitem('dustSulfur') * 2)
     .duration(150)
     .EUt(30)

diff --git a/groovy/postInit/chemistry/organic_chemistry/polymers/PolydimethylsiloxaneChain.groovy b/groovy/postInit/chemistry/organic_chemistry/polymers/PolydimethylsiloxaneChain.groovy
@@ -77,3 +77,6 @@ POLYMERIZATION.recipeBuilder()
     .duration(100)
     .EUt(Globals.voltAmps[3])
     .buildAndRegister()
+
+// Liquid Polydimethylsiloxane * 144
+mods.gregtech.extractor.removeByInput(30, [metaitem('dustPolydimethylsiloxane')], null)
diff --git a/groovy/postInit/chemistry/organic_chemistry/polymers/PolyurethaneChain.groovy b/groovy/postInit/chemistry/organic_chemistry/polymers/PolyurethaneChain.groovy
@@ -73,7 +73,7 @@ POLYMERIZATION.recipeBuilder()
         .inputs(ore('dustTinyTriethylenediamine'))
         .fluidInputs(fluid('ethylene_oxide') * 750)
         .fluidInputs(fluid('ethylene_glycol') * 250)
-        .fluidInputs(fluid('polydimethylsiloxane') * 18)
+        .fluidInputs(fluid('polydimethylsiloxane') * 125)
         .fluidOutputs(fluid('polyurethane_polymerization_mix') * 1000)
         .duration(200)
         .EUt(240)

diff --git a/groovy/postInit/components/SMDComponents.groovy b/groovy/postInit/components/SMDComponents.groovy
@@ -407,7 +407,7 @@ CHEMICAL_BATH.recipeBuilder()
 
 BR.recipeBuilder()
         .inputs(metaitem('raw_smd_capacitor') * 16)
-        .fluidInputs(fluid('polydimethylsiloxane') * 72)
+        .fluidInputs(fluid('polydimethylsiloxane') * 500)
         .outputs(metaitem('component.smd.capacitor') * 16)
         .duration(40)
         .EUt(240)

diff --git a/groovy/postInit/metallurgy/StainlessSteelChain.groovy b/groovy/postInit/metallurgy/StainlessSteelChain.groovy
@@ -28,7 +28,7 @@ EBF.recipeBuilder()
     .buildAndRegister()
 
 EBF.recipeBuilder()
-    .inputs(ore('dustMagnetite') * 14)
+    .inputs(ore('dustMagnetite') * 2)
     .inputs(ore('dustNickel'))
     .inputs(ore('dustTinyManganese') * 2)
     .fluidOutputs(fluid('carburized_stainless_steel') * 1440)
@@ -38,7 +38,7 @@ EBF.recipeBuilder()
     .buildAndRegister()
 
 EBF.recipeBuilder()
-    .inputs(ore('dustBandedIron') * 15)
+    .inputs(ore('dustBandedIron') * 3)
     .inputs(ore('dustNickel'))
     .inputs(ore('dustTinyManganese') * 2)
     .fluidOutputs(fluid('carburized_stainless_steel') * 1440)
@@ -58,7 +58,7 @@ EBF.recipeBuilder()
     .buildAndRegister()
 
 EBF.recipeBuilder()
-    .inputs(ore('dustGraniticMineralSand') * 30)
+    .inputs(ore('dustGraniticMineralSand') * 2)
     .inputs(ore('dustNickel'))
     .inputs(ore('dustTinyManganese') * 2)
     .fluidOutputs(fluid('carburized_stainless_steel') * 1440)