Merge pull request #1001 from trainvoi/recipe-conflict-bugfix

bug fixes
SymmetricDevs · Sep 21, 2024 · cc14cd5 · cc14cd5
2 parents f42cea0 + e84f8ef
commit cc14cd5
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 23 deletions.
diff --git a/groovy/postInit/biology/ResinChain.groovy b/groovy/postInit/biology/ResinChain.groovy
@@ -31,9 +31,11 @@ FLUID_SOLIDIFIER.recipeBuilder()
         .EUt(2)
         .buildAndRegister()
 
+// Raw Rubber Pulp * 3
+mods.gregtech.centrifuge.removeByInput(5, [metaitem('rubber_drop')], null)
 CENTRIFUGE.recipeBuilder()
         .inputs(metaitem('rubber_drop'))
         .fluidOutputs(fluid('resin') * 250)
         .duration(40)
         .EUt(7)
-        .buildAndRegister()
+        .buildAndRegister()
diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy
@@ -886,6 +886,17 @@ BR.recipeBuilder()
         .EUt(30)
         .buildAndRegister()
 
+// Ethanol
+
+FBR.recipeBuilder()
+.fluidInputs(fluid('gtfo_acetaldehyde') * 100)
+.fluidInputs(fluid('hydrogen') * 100)
+.notConsumable(ore('catalystBedPlatinum'))
+.fluidOutputs(fluid('ethanol') * 100)
+.duration(5)
+.EUt(30)
+.buildAndRegister()
+
 // Nitrous Oxide
 
 ROASTER.recipeBuilder()
@@ -1334,7 +1345,7 @@ BR.recipeBuilder()
 BR.recipeBuilder()
 .fluidInputs(fluid('isobutyraldehyde') * 1000)
 .fluidInputs(fluid('hydrogen') * 2000)
-.notConsumable(metaitem('catalystBedPlatinum'))
+.notConsumable(ore('catalystBedPlatinum'))
 .fluidOutputs(fluid('isobutyl_alcohol') * 1000)
 .EUt(Globals.voltAmps[3])
 .duration(80)
@@ -2136,7 +2147,7 @@ BR.recipeBuilder()
 REACTION_FURNACE.recipeBuilder()
         .fluidInputs(fluid('syngas') * 7000)
         .fluidInputs(fluid('dense_steam') * 1000)
-        .notConsumable(metaitem('catalystBedLtsCatalyst'))
+        .notConsumable(ore('catalystBedLtsCatalyst'))
         .fluidOutputs(fluid('reformed_syngas') * 9000)
         .duration(320)
         .EUt(30)
@@ -3185,7 +3196,7 @@ FBR.recipeBuilder()
         .fluidInputs(fluid('diiodobenzene_solution') * 50)
         .fluidInputs(fluid('ammonia_solution') * 150)
         .fluidOutputs(fluid('impure_four_four_oxydianiline') * 200)
-        .notConsumable(metaitem('catalystBedCopper'))
+        .notConsumable(ore('catalystBedCopper'))
         .duration(300)
         .EUt(30)
         .buildAndRegister()
@@ -3319,7 +3330,7 @@ REACTION_FURNACE.recipeBuilder()
         .fluidInputs(fluid('methane') * 50)
         .fluidInputs(fluid('ammonia') * 50)
         .fluidInputs(fluid('oxygen') * 150)
-        .notConsumable(metaitem('catalystBedPlatinum'))
+        .notConsumable(ore('catalystBedPlatinum'))
         .fluidOutputs(fluid('gtfo_hydrogen_cyanide') * 50)
         .fluidOutputs(fluid('water') * 150)
         .EUt(120)
@@ -3357,7 +3368,7 @@ BR.recipeBuilder()
 FBR.recipeBuilder()
         .fluidInputs(fluid('ethylene') * 50)
         .fluidInputs(fluid('oxygen') * 50)
-        .notConsumable(metaitem('catalystBedSilver'))
+        .notConsumable(ore('catalystBedSilver'))
         .fluidOutputs(fluid('carbon_dioxide') * 5)
         .fluidOutputs(fluid('impure_ethylene_oxide') * 45)
         .EUt(30)
@@ -4113,7 +4124,7 @@ CSTR.recipeBuilder()
 
 FBR.recipeBuilder()
     .fluidInputs(fluid('butanediol') * 50)
-    .notConsumable(metaitem('catalystBedCopper'))
+    .notConsumable(ore('catalystBedCopper'))
     .fluidOutputs(fluid('gamma_butyrolactone') * 50)
     .fluidOutputs(fluid('hydrogen') * 200)
     .EUt(120)
@@ -4272,6 +4283,7 @@ CONDENSER.recipeBuilder()
 
 // Nitration Mixture * 2000
 mods.gregtech.mixer.removeByInput(2, null, [fluid('nitric_acid') * 1000, fluid('sulfuric_acid') * 1000])
+mods.gregtech.blender.removeByInput(2, null, [fluid('nitric_acid') * 1000, fluid('sulfuric_acid') * 1000])
 
 MIXER.recipeBuilder()
         .fluidInputs(fluid('nitric_acid') * 1000)

diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/GoldChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/GoldChain.groovy
@@ -14,6 +14,7 @@ mods.gregtech.centrifuge.removeByInput(30, [metaitem('dustRawElectrum') * 2], nu
 
 // Aqua Regia * 3000
 mods.gregtech.mixer.removeByInput(30, null, [fluid('nitric_acid') * 1000, fluid('hydrochloric_acid') * 2000])
+mods.gregtech.blender.removeByInput(30, null, [fluid('nitric_acid') * 1000, fluid('hydrochloric_acid') * 2000])
 
 //GOLD AMALGAMATION (50% EFFICIENCY)
 MIXER.recipeBuilder()

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
@@ -61,6 +61,9 @@ ROASTER.recipeBuilder()
     .EUt(Globals.voltAmps[2])
     .duration(200)
     .buildAndRegister()
+
+// Antimony Trioxide Dust * 1
+mods.gregtech.electric_blast_furnace.removeByInput(120, [metaitem('dustStibnite')], [fluid('oxygen') * 3000])
 
 ROASTER.recipeBuilder()
     .inputs(ore('dustStibnite'))

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
@@ -160,17 +160,17 @@ ROASTER.recipeBuilder()
         .inputs(ore('dustArsenicTrioxide') * 5)
         .outputs(metaitem('dustArsenic') * 2)
         .fluidOutputs(fluid('carbon_monoxide') * 3000)
-        .duration(30)
-        .EUt(16)
+        .duration(60)
+        .EUt(30)
         .buildAndRegister()
 
 ROASTER.recipeBuilder()
         .inputs(ore('dustAnyPurityCarbon') * 5)
-        .inputs(ore('dustArsenicTrioxide') * 5)
+        .inputs(ore('dustArsenicVOxide') * 7)
         .outputs(metaitem('dustArsenic') * 2)
-        .fluidOutputs(fluid('carbon_monoxide') * 3000)
-        .duration(30)
-        .EUt(Globals.voltAmps[1])
+        .fluidOutputs(fluid('carbon_monoxide') * 5000)
+        .duration(60)
+        .EUt(30)
         .buildAndRegister()
 
 //PROUSTITE ALKALINE LEACHING (90% EFFICIENT)

diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy
@@ -1489,8 +1489,10 @@ crafting.replaceShaped("gregtech:multiblock_builder", metaitem('tool.multiblock_
 
 // Glue * 2500
 mods.gregtech.mixer.removeByInput(7, null, [fluid('polyvinyl_acetate') * 1000, fluid('methyl_acetate') * 1500])
+mods.gregtech.blender.removeByInput(7, null, [fluid('polyvinyl_acetate') * 1000, fluid('methyl_acetate') * 1500])
 // Glue * 2500
 mods.gregtech.mixer.removeByInput(7, null, [fluid('polyvinyl_acetate') * 1000, fluid('acetone') * 1500])
+mods.gregtech.blender.removeByInput(7, null, [fluid('polyvinyl_acetate') * 1000, fluid('acetone') * 1500])
 
 MIXER.recipeBuilder()
         .fluidInputs(fluid('polyvinyl_acetate') * 144)

diff --git a/groovy/postInit/mod/SusyCore.groovy b/groovy/postInit/mod/SusyCore.groovy
@@ -88,16 +88,6 @@ mods.gregtech.assembler.recipeBuilder()
     .duration(200)
     .EUt(Globals.voltAmps[1])
     .buildAndRegister()
-
-mods.gregtech.assembler.recipeBuilder()
-    .circuitMeta(11)
-    .inputs(ore('plateStainlessSteel') * 4)
-    .inputs(ore('frameGtStainlessSteel'))
-    .outputs(item('susy:susy_multiblock_casing', 1))
-    .duration(240)
-    .EUt(Globals.voltAmps[3])
-    .buildAndRegister()
-
 //Deposit stuff
 // Crushed Sulfur Ore * 1
 mods.gregtech.forge_hammer.removeByInput(16, [item('gregtech:ore_sulfur_0')], null)