Merge pull request #726 from trainvoi/even-more-0.1.12-fixes

Even more 0.1.12 fixes
SymmetricDevs · Feb 5, 2024 · 0983dbf · 0983dbf
2 parents 2985a80 + 707efb5
commit 0983dbf
Show file tree

Hide file tree

Showing 13 changed files with 72 additions and 34 deletions.
diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy
@@ -3387,7 +3387,24 @@ BCR.recipeBuilder()
         .fluidInputs(fluid('water') * 100)
         .fluidInputs(fluid('ammonia') * 50)
         .fluidOutputs(fluid('diluted_ammonia_solution') * 100)
-        .duration(5)
+        .duration(1)
+        .EUt(30)
+        .buildAndRegister()
+
+MIXER.recipeBuilder()
+        .fluidInputs(fluid('ammonia_solution') * 1000)
+        .fluidInputs(fluid('water') * 1000)
+        .fluidOutputs(fluid('diluted_ammonia_solution') * 1000)
+        .duration(20)
+        .EUt(Globals.voltAmps[1])
+        .buildAndRegister()
+
+
+DISTILLATION_TOWER.recipeBuilder()
+        .fluidInputs(fluid('diluted_ammonia_solution') * 1000)
+        .fluidOutputs(fluid('water') * 1000)
+        .fluidOutputs(fluid('ammonia_solution') * 1000)
+        .duration(150)
         .EUt(30)
         .buildAndRegister()
 
@@ -3431,7 +3448,7 @@ DISTILLATION_TOWER.recipeBuilder()
         .fluidOutputs(fluid('diethylene_glycol') * 100)
         .fluidOutputs(fluid('ethylene_glycol') * 500)
         .fluidOutputs(fluid('water') * 400)
-        .duration(300)
+        .duration(200)
         .EUt(30)
         .buildAndRegister()
 
@@ -4369,3 +4386,12 @@ DISTILLERY.recipeBuilder()
         .duration(20)
         .EUt(30)
         .buildAndRegister()
+
+//Ca(OH)2.H2O
+MIXER.recipeBuilder()
+        .inputs(ore('dustCalciumHydroxide') * 5)
+        .fluidInputs(fluid('water') * 1000)
+        .fluidOutputs(fluid('calcium_hydroxide_solution') * 1000)
+        .EUt(16)
+        .duration(100)
+        .buildAndRegister()
diff --git a/groovy/postInit/chemistry/elements/GoldChain.groovy b/groovy/postInit/chemistry/elements/GoldChain.groovy
@@ -11,6 +11,7 @@ DISTILLATION_TOWER = recipemap('distillation_tower')
 
 // Silver Dust * 1
 mods.gregtech.centrifuge.removeByInput(30, [metaitem('dustRawElectrum') * 2], null)
+mods.gregtech.mixer.removeByInput(30, [fluid('hydrochloric_acid') * 2000], [fluid('nitric_acid') * 1000])
 
 //GOLD AMALGAMATION (50% EFFICIENCY)
 MIXER.recipeBuilder()

diff --git a/groovy/postInit/chemistry/elements/TantalumChain.groovy b/groovy/postInit/chemistry/elements/TantalumChain.groovy
@@ -100,14 +100,6 @@ CENTRIFUGE.recipeBuilder() // Tantalum Extract
     .EUt(Globals.voltAmps[3])
     .buildAndRegister()
 
-MIXER.recipeBuilder()
-    .fluidInputs(fluid('ammonia_solution') * 1000)
-    .fluidInputs(fluid('water') * 1000)
-    .fluidOutputs(fluid('diluted_ammonia_solution') * 1000)
-    .duration(20)
-    .EUt(Globals.voltAmps[1])
-    .buildAndRegister()
-
 CENTRIFUGE.recipeBuilder() // Fluorotantalic Acid Solution
     .fluidInputs(fluid('tantalum_extract') * 8000)
     .fluidInputs(fluid('diluted_ammonia_solution') * 2000)

diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy
@@ -393,25 +393,25 @@ BR.recipeBuilder()
         .buildAndRegister()
 
 // Corrosion inhibitors
-
+for (inertGas in Globals.inertGases) {
     REACTION_FURNACE.recipeBuilder()
         .notConsumable(ore('dustAluminiumSilicate'))
-        .notConsumable(fluid('argon') * 2000)
+        .notConsumable(fluid(inertGas.name) * inertGas.amount_required)
         .fluidInputs(fluid('linoleic_acid') * 2000)
         .fluidOutputs(fluid('corrosion_inhibitor') * 2000)
-        .duration(200)
+        .duration(200 * inertGas.duration)
         .EUt(120)
         .buildAndRegister()
 
     REACTION_FURNACE.recipeBuilder()
         .notConsumable(ore('dustAluminiumSilicate'))
-        .notConsumable(fluid('argon') * 2000)
+        .notConsumable(fluid(inertGas.name) * inertGas.amount_required)
         .fluidInputs(fluid('oleic_acid') * 2000)
         .fluidOutputs(fluid('corrosion_inhibitor') * 2000)
-        .duration(200)
+        .duration(200 * inertGas.duration)
         .EUt(120)
         .buildAndRegister()
-
+}
 def OxygenateMap = [
     'methanol': 1000,
     'ethanol': 1000,

diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Lubricants.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Lubricants.groovy
@@ -676,7 +676,7 @@ DUMPER = recipemap('dumping')
 
     POLYMERIZATION.recipeBuilder()
         .fluidInputs(fluid('ethylene_oxide') * 1000)
-        .fluidInputs(fluid('boron_trifluoride') * 50)
+        .notConsumable(fluid('boron_trifluoride') * 50)
         .fluidOutputs(fluid('polyethylene_glycol') * 1000)
         .duration(200)
         .EUt(240)
@@ -859,7 +859,7 @@ DUMPER = recipemap('dumping')
         .fluidInputs(fluid('phenol') * 1000)
         .fluidInputs(fluid('tripropylene') * 1000)
         .notConsumable(fluid('hydrofluoric_acid') * 100)
-        .fluidOutputs(fluid('nonylphenol'))
+        .fluidOutputs(fluid('nonylphenol') * 1000)
         .duration(200)
         .EUt(Globals.voltAmps[2])
         .buildAndRegister()

diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/OilOverhaul.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/OilOverhaul.groovy
@@ -523,7 +523,7 @@ DT.recipeBuilder()
 .fluidOutputs(fluid('ethylene') * 800)
 .fluidOutputs(fluid('methane') * 50)
 .fluidOutputs(fluid('hydrogen') * 50)
-.duration(600)
+.duration(150)
 .EUt(Globals.voltAmps[1] * 2)
 .buildAndRegister()
 
@@ -534,7 +534,7 @@ DT.recipeBuilder()
 .fluidOutputs(fluid('ethylene') * 500)
 .fluidOutputs(fluid('methane') * 150)
 .fluidOutputs(fluid('hydrogen') * 150)
-.duration(600)
+.duration(150)
 .EUt(Globals.voltAmps[1] * 2)
 .buildAndRegister()
 
@@ -545,7 +545,7 @@ DT.recipeBuilder()
 .fluidOutputs(fluid('ethylene') * 350)
 .fluidOutputs(fluid('methane') * 150)
 .fluidOutputs(fluid('hydrogen') * 100)
-.duration(600)
+.duration(150)
 .EUt(Globals.voltAmps[1] * 2)
 .buildAndRegister()
 
@@ -1004,6 +1004,14 @@ CRYSTALLIZER.recipeBuilder()
 .EUt(Globals.voltAmps[1])
 .buildAndRegister()
 
+mods.gregtech.extractor.removeByInput(30, [metaitem('dustParaXylene')])
+EXTRACTOR.recipeBuilder()
+.inputs(ore('dustParaXylene'))
+.fluidOutputs(fluid('para_xylene') * 1000)
+.duration(5)
+.EUt(30)
+.buildAndRegister()
+
 BR.recipeBuilder()
 .inputs(ore('dustDicobaltOctacarbonyl') * 18)
 .fluidInputs(fluid('hydrogen') * 2000)

diff --git a/groovy/postInit/chemistry/organic_chemistry/polymers/EpoxyChain.groovy b/groovy/postInit/chemistry/organic_chemistry/polymers/EpoxyChain.groovy
diff --git a/groovy/postInit/chemistry/organic_chemistry/polymers/RubberChain.groovy b/groovy/postInit/chemistry/organic_chemistry/polymers/RubberChain.groovy
@@ -9,6 +9,7 @@ POLYMERIZATION_TANK = recipemap('polymerization_tank')
 MIXER = recipemap('mixer')
 SIFTER = recipemap('sifter')
 DRYER = recipemap('dryer')
+EXTRACTOR = recipemap('extractor')
 
 //REMOVALS
 // Raw Rubber Pulp * 2
@@ -218,6 +219,14 @@ for (coagulant in coagulants) {
     CoagulationRecipe(coagulant, 16, 2500, 5)
 }
 
+mods.gregtech.extractor.removeByInput(30, [metaitem('dustLatex')])
+EXTRACTOR.recipeBuilder()
+.inputs(ore('dustLatex'))
+.fluidOutputs(fluid('latex') * 1000)
+.duration(98)
+.EUt(30)
+.buildAndRegister()
+
 // Polyisoprene
 POLYMERIZATION_TANK.recipeBuilder()
     .fluidInputs(fluid('isoprene') * 1000)

diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy
@@ -448,9 +448,9 @@ mods.gregtech.assembler.removeByInput(480, [metaitem('plateEnderPearl') * 9, met
 crafting.addShapeless('convert_old_slaked_lime', metaitem('dustCalciumHydroxide'), [metaitem('slaked_lime')])
 
 mods.gregtech.chemical_bath.recipeBuilder()
-        .inputs(ore('dustQuicklime'))
-        .fluidInputs(fluid('water') * 500)
-        .outputs(metaitem('dustCalciumHydroxide'))
+        .inputs(ore('dustQuicklime') * 2)
+        .fluidInputs(fluid('water') * 1000)
+        .outputs(metaitem('dustCalciumHydroxide') * 5)
         .duration(20)
         .EUt(30)
         .buildAndRegister();

diff --git a/groovy/postInit/mod/MachineRecipes.groovy b/groovy/postInit/mod/MachineRecipes.groovy
@@ -536,7 +536,7 @@ crafting.addShaped("steel_turbine_rotor", item('susy:turbine_rotor'), [
 
 crafting.addShaped("steel_turbine_controller", metaitem('basic_steam_turbine'), [
 		[ore('plateSteel'),            metaitem('cableGtSingleTin'),       ore('plateSteel')],
-		[ore('circuitLv'),             item('gregtech:machine_casing', 1), ore('circuitLv')],
+		[ore('circuitLv'),             metaitem('hull.lv'), ore('circuitLv')],
 		[metaitem('cableGtSingleTin'), ore('circuitLv'),                   metaitem('cableGtSingleTin')]
 ])
 

diff --git a/groovy/postInit/mod/NoTreePunching.groovy b/groovy/postInit/mod/NoTreePunching.groovy
@@ -2,4 +2,6 @@ for(int i = 1; i < 35; i++){
     crafting.remove("notreepunching:saw_planks_" + i.toString());
 }
 
+    crafting.remove("notreepunching:saw_log_sticks");
+
 furnace.removeByInput(item('notreepunching:pottery/small_vessel'))
diff --git a/groovy/postInit/mod/XNet.groovy b/groovy/postInit/mod/XNet.groovy
@@ -77,7 +77,7 @@ crafting.addShaped("xnet_routing_connector", item('xnet:connector:4'), [
 
 crafting.addShaped("xnet_connector_upgrade", item('xnet:connector_upgrade'), [
         [ore('plateAluminium'), ore('plateAluminium'), ore('plateAluminium')],
-        [metaitem('robot.arm.mv'), ore('circuitMv'), metaitem('pump.mv')],
+        [metaitem('robot.arm.mv'), ore('circuitMv'), metaitem('electric.pump.mv')],
         [ore('plateAluminium'), ore('plateAluminium'), ore('plateAluminium')]
 ]);
 

diff --git a/groovy/prePostInit/Thermodynamics.groovy b/groovy/prePostInit/Thermodynamics.groovy
@@ -1,5 +1,5 @@
 import classes.*;
-import globals.Globals;
+import globals.Globals.*;
 
 import java.lang.Math;
 
@@ -674,7 +674,7 @@ for (FluidFuel in FluidFuels) {
                 .fluidInputs(liquid('air') * 100)
                 .fluidOutputs(liquid(FluidFuel.byproduct) * FluidFuel.byproduct_amount)
                 .duration(FluidFuel.duration)
-                .EUt(-128)
+                .EUt(128)
                 .buildAndRegister();
 
             recipemap('gas_turbine').recipeBuilder()
@@ -683,7 +683,7 @@ for (FluidFuel in FluidFuels) {
                 .fluidInputs(liquid('oxygen') * 20)
                 .fluidOutputs(liquid(FluidFuel.byproduct) * ((int) (FluidFuel.byproduct_amount * 1.5)))
                 .duration((int) (FluidFuel.duration * 1.5))
-                .EUt(-128)
+                .EUt(128)
                 .buildAndRegister();
         } else {
             recipemap('gas_turbine').recipeBuilder()
@@ -692,7 +692,7 @@ for (FluidFuel in FluidFuels) {
                 .fluidInputs(liquid('air') * 100)
                 .fluidOutputs(liquid(FluidFuel.byproduct) * FluidFuel.byproduct_amount)
                 .duration(FluidFuel.duration)
-                .EUt(-32)
+                .EUt(32)
                 .buildAndRegister();
 
             recipemap('gas_turbine').recipeBuilder()
@@ -701,7 +701,7 @@ for (FluidFuel in FluidFuels) {
                 .fluidInputs(liquid('oxygen') * 20)
                 .fluidOutputs(liquid(FluidFuel.byproduct) * ((int) (FluidFuel.byproduct_amount * 1.5)))
                 .duration((int) (FluidFuel.duration * 1.5))
-                .EUt(-32)
+                .EUt(32)
                 .buildAndRegister();
         }
 
@@ -713,7 +713,7 @@ for (FluidFuel in FluidFuels) {
                     .fluidInputs(liquid('oxygen') * 20)
                     .fluidOutputs(liquid(FluidFuel.byproduct) * ((int) (FluidFuel.byproduct_amount * 1.5)))
                     .duration((int) (FluidFuel.duration * lubricant.boost * 1.5))
-                    .EUt(-128)
+                    .EUt(128)
                     .buildAndRegister();
             } else {
                 recipemap('gas_turbine').recipeBuilder()
@@ -722,7 +722,7 @@ for (FluidFuel in FluidFuels) {
                     .fluidInputs(liquid('oxygen') * 20)
                     .fluidOutputs(liquid(FluidFuel.byproduct) * ((int) (FluidFuel.byproduct_amount * 1.5)))
                     .duration((int) (FluidFuel.duration * lubricant.boost * 1.5))
-                    .EUt(-32)
+                    .EUt(32)
                     .buildAndRegister();
             }
         }
@@ -738,7 +738,7 @@ for (FluidFuel in FluidFuels) {
     recipemap('combustion_generator').recipeBuilder()
             .fluidInputs(liquid(FluidFuel.liquid_fuel) * 25)
             .duration(100)
-            .EUt(-1)
+            .EUt(1)
             .buildAndRegister();
 
     recipemap('canner').recipeBuilder()