From 78ba5745ac33addec0e4ae5f915efe420f388062 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Sat, 6 Jul 2024 23:51:22 +0700 Subject: [PATCH 1/9] init commit --- groovy/material/FirstDegreeMaterials.groovy | 1 - .../p_block/group16/SulfurChain.groovy | 78 +++++++++++++++---- 2 files changed, 61 insertions(+), 18 deletions(-) diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy index a6c6d4036..aea107e4f 100644 --- a/groovy/material/FirstDegreeMaterials.groovy +++ b/groovy/material/FirstDegreeMaterials.groovy @@ -233,7 +233,6 @@ public class FirstDegreeMaterials { .dust() .color(0xb09d99) .components(Iron * 2, Sulfur * 3, Oxygen * 12) - .flags(DECOMPOSITION_BY_ELECTROLYZING) .build() .setFormula("Fe2(SO4)3", true); 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 index 6ae1f31f8..8ff744a17 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy @@ -5,20 +5,64 @@ import gregtech.api.unification.material.Materials; import gregtech.api.unification.ore.OrePrefix; import gregtech.api.unification.stack.UnificationEntry; -def ROASTER_RECIPES = recipemap('roaster'); - -ROASTER_RECIPES.recipeBuilder() -.inputs(ore('dustPyrite') * 2) -.outputs(metaitem('dustIronIiiSulfate')) -.outputs(metaitem('dustSulfur')) -.duration(80) -.EUt(7) -.buildAndRegister() - -ROASTER_RECIPES.recipeBuilder() -.inputs(ore('dustIronIiiSulfate')) -.outputs(metaitem('dustBandedIron')) -.fluidOutputs(fluid('sulfur_trioxide') * 3000) -.duration(160) -.EUt(7) -.buildAndRegister() + +// Banded Iron Dust * 1 +mods.gregtech.electric_blast_furnace.removeByInput(120, [metaitem('dustPyrite')], [fluid('oxygen') * 3000]) + + +ROASTER = recipemap('roaster') +CRYSTALLIZER = recipemap('crystallizer') + + +ROASTER.recipeBuilder() + .inputs(ore('dustAnglesite')) + .outputs(metaitem('dustMassicot') * 2) + .fluidOutputs(fluid('sulfur_trioxide') * 1000) + .duration(400) + .EUt(30) + .buildAndRegister() + + +ROASTER.recipeBuilder() + .circuitMeta(1) + .inputs(ore('dustPyrite') * 1) + .outputs(metaitem('dustIronIISulfide') * 2) + .outputs(metaitem('dustSulfur')) + .duration(80) + .EUt(16) + .buildAndRegister() + +ROASTER.recipeBuilder() + .circuitMeta(1) + .inputs(ore('dustIronIISulfide') * 2) + .outputs(metaitem('dustBandedIron') * 2) + .fluidOutputs(fluid('sulfur_dioxide') * 1000) + .duration(80) + .EUt(30) + .buildAndRegister() + +ROASTER.recipeBuilder() + .inputs(ore('dustPyrite') * 1) + .fluidInputs(fluid('oxygen') * 5000) + .outputs(metaitem('dustBandedIron') * 2) + .fluidOutputs(fluid('sulfur_dioxide') * 2000) + .duration(160) + .EUt(30) + .buildAndRegister() + +CRYSTALLIZER.recipeBuilder() + .inputs(ore('dustPyrite') * 2) + //.fluidInputs(fluid('oxygen') * 15000) //technically this process is done by using air but you can't fit 45k air or 15k oxygen into an LV crystallizer + .outputs(metaitem('dustIronIiiSulfate') * 17) + .fluidOutputs(fluid('diluted_sulfuric_acid') * 2000) + .duration(160) + .EUt(30) + .buildAndRegister() + +ROASTER.recipeBuilder() + .inputs(ore('dustIronIiiSulfate') * 17) + .outputs(metaitem('dustBandedIron') * 2) + .fluidOutputs(fluid('sulfur_trioxide') * 3000) + .duration(160) + .EUt(30) + .buildAndRegister() From 9a024a36aa7d65ba185884ecadbe8ed1232ba791 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Sat, 6 Jul 2024 23:52:53 +0700 Subject: [PATCH 2/9] add comments --- .../elements/p_block/group16/SulfurChain.groovy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 index 8ff744a17..e55db5eac 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy @@ -13,7 +13,7 @@ mods.gregtech.electric_blast_furnace.removeByInput(120, [metaitem('dustPyrite')] ROASTER = recipemap('roaster') CRYSTALLIZER = recipemap('crystallizer') - +//Steam-Age source of SO3/H2SO4 ROASTER.recipeBuilder() .inputs(ore('dustAnglesite')) .outputs(metaitem('dustMassicot') * 2) @@ -22,7 +22,7 @@ ROASTER.recipeBuilder() .EUt(30) .buildAndRegister() - +//Pyrite roasting for SO2 ROASTER.recipeBuilder() .circuitMeta(1) .inputs(ore('dustPyrite') * 1) @@ -50,6 +50,7 @@ ROASTER.recipeBuilder() .EUt(30) .buildAndRegister() +//Wet Oxidation of Pyrite CRYSTALLIZER.recipeBuilder() .inputs(ore('dustPyrite') * 2) //.fluidInputs(fluid('oxygen') * 15000) //technically this process is done by using air but you can't fit 45k air or 15k oxygen into an LV crystallizer From f9b9bde2406e46a07ca947b8881db2c503949cfa Mon Sep 17 00:00:00 2001 From: trainvoi Date: Sat, 6 Jul 2024 23:55:48 +0700 Subject: [PATCH 3/9] moving recipes --- groovy/postInit/chemistry/ChemistryOverhaul.groovy | 8 -------- .../elements/p_block/group16/SulfurChain.groovy | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy index dce180fbe..f11619aca 100644 --- a/groovy/postInit/chemistry/ChemistryOverhaul.groovy +++ b/groovy/postInit/chemistry/ChemistryOverhaul.groovy @@ -1378,14 +1378,6 @@ DISTILLERY.recipeBuilder() .EUt(30) .buildAndRegister() -// Sulfur Trioxide - -ROASTER.recipeBuilder() -.fluidInputs(fluid('oxygen') * 1000) -.fluidInputs(fluid('sulfur_dioxide') * 1000) -.notConsumable(ore('dustVanadiumPentoxide')) -.fluidOutputs(fluid('sulfur_trioxide') * 1000) - .duration(200) .EUt(7) .buildAndRegister() 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 index e55db5eac..f87bd82a5 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy @@ -67,3 +67,11 @@ ROASTER.recipeBuilder() .duration(160) .EUt(30) .buildAndRegister() + +// Sulfur Trioxide + +ROASTER.recipeBuilder() + .fluidInputs(fluid('oxygen') * 1000) + .fluidInputs(fluid('sulfur_dioxide') * 1000) + .notConsumable(ore('dustVanadiumPentoxide')) + .fluidOutputs(fluid('sulfur_trioxide') * 1000) \ No newline at end of file From 032da1a4b793a84bc5cec31c7d1b7b676819f664 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Sun, 7 Jul 2024 00:04:24 +0700 Subject: [PATCH 4/9] forgot to move some stuff --- groovy/postInit/chemistry/ChemistryOverhaul.groovy | 4 ---- .../elements/p_block/group16/SulfurChain.groovy | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy index f11619aca..1a22a3a6e 100644 --- a/groovy/postInit/chemistry/ChemistryOverhaul.groovy +++ b/groovy/postInit/chemistry/ChemistryOverhaul.groovy @@ -1378,10 +1378,6 @@ DISTILLERY.recipeBuilder() .EUt(30) .buildAndRegister() -.duration(200) -.EUt(7) -.buildAndRegister() - // Saltpeter and Sodium Hydroxide Solution MIXER.recipeBuilder() 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 index f87bd82a5..1d304747d 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy @@ -74,4 +74,7 @@ ROASTER.recipeBuilder() .fluidInputs(fluid('oxygen') * 1000) .fluidInputs(fluid('sulfur_dioxide') * 1000) .notConsumable(ore('dustVanadiumPentoxide')) - .fluidOutputs(fluid('sulfur_trioxide') * 1000) \ No newline at end of file + .fluidOutputs(fluid('sulfur_trioxide') * 1000) + .duration(200) + .EUt(7) + .buildAndRegister() \ No newline at end of file From 8e0cb33d0459053e08688af48bb9927afe840e25 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Sun, 7 Jul 2024 00:10:47 +0700 Subject: [PATCH 5/9] increasing SO3 throughput --- .../elements/p_block/group16/SulfurChain.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 index 1d304747d..670aa7cd2 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy @@ -71,10 +71,10 @@ ROASTER.recipeBuilder() // Sulfur Trioxide ROASTER.recipeBuilder() - .fluidInputs(fluid('oxygen') * 1000) - .fluidInputs(fluid('sulfur_dioxide') * 1000) + .fluidInputs(fluid('oxygen') * 4000) + .fluidInputs(fluid('sulfur_dioxide') * 4000) .notConsumable(ore('dustVanadiumPentoxide')) - .fluidOutputs(fluid('sulfur_trioxide') * 1000) + .fluidOutputs(fluid('sulfur_trioxide') * 4000) .duration(200) .EUt(7) .buildAndRegister() \ No newline at end of file From 1047829fadd31d040fa9ef51af6fe95bdb1125fc Mon Sep 17 00:00:00 2001 From: trainvoi Date: Sun, 7 Jul 2024 00:19:01 +0700 Subject: [PATCH 6/9] lead chamber process --- .../elements/p_block/group16/SulfurChain.groovy | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 index 670aa7cd2..92c2cab04 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy @@ -12,6 +12,7 @@ mods.gregtech.electric_blast_furnace.removeByInput(120, [metaitem('dustPyrite')] ROASTER = recipemap('roaster') CRYSTALLIZER = recipemap('crystallizer') +CSTR = recipemap('continuous_stirred_tank_reactor') //Steam-Age source of SO3/H2SO4 ROASTER.recipeBuilder() @@ -77,4 +78,15 @@ ROASTER.recipeBuilder() .fluidOutputs(fluid('sulfur_trioxide') * 4000) .duration(200) .EUt(7) + .buildAndRegister() + +//Lead chamber process + +CSTR.recipeBuilder() + .fluidInputs(fluid('sulfur_dioxide') * 50) + .fluidInputs(fluid('nitrogen_dioxide') * 50) + .fluidOutputs(fluid('sulfuric_acid') * 50) + .fluidOutputs(fluid('nitric_oxide') * 50) + .duration(4) + .EUt(7) .buildAndRegister() \ No newline at end of file From 745b5e7e274b330ffd8113728750876352d0f5ef Mon Sep 17 00:00:00 2001 From: trainvoi Date: Sun, 7 Jul 2024 00:19:14 +0700 Subject: [PATCH 7/9] reducing nitric acid chain power cost --- groovy/postInit/chemistry/ChemistryOverhaul.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy index 1a22a3a6e..e92d08660 100644 --- a/groovy/postInit/chemistry/ChemistryOverhaul.groovy +++ b/groovy/postInit/chemistry/ChemistryOverhaul.groovy @@ -1196,7 +1196,7 @@ CSTR.recipeBuilder() .fluidInputs(fluid('nitric_oxide') * 50) .fluidOutputs(fluid('nitrogen_dioxide') * 50) .duration(8) -.EUt(30) +.EUt(7) .buildAndRegister() CSTR.recipeBuilder() @@ -1205,7 +1205,7 @@ CSTR.recipeBuilder() .fluidOutputs(fluid('nitric_acid') * 100) .fluidOutputs(fluid('nitric_oxide') * 50) .duration(12) -.EUt(30) +.EUt(7) .buildAndRegister() // Methyl Acetate From 57e30932cef23dff806b5bd1f72014ccb0f54869 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Fri, 12 Jul 2024 22:58:20 +0700 Subject: [PATCH 8/9] squash some commits --- .../p_block/group16/SulfurChain.groovy | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) 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 index 92c2cab04..870db6ccc 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy @@ -12,7 +12,7 @@ mods.gregtech.electric_blast_furnace.removeByInput(120, [metaitem('dustPyrite')] ROASTER = recipemap('roaster') CRYSTALLIZER = recipemap('crystallizer') -CSTR = recipemap('continuous_stirred_tank_reactor') +BR = recipemap('batch_reactor') //Steam-Age source of SO3/H2SO4 ROASTER.recipeBuilder() @@ -36,6 +36,7 @@ ROASTER.recipeBuilder() ROASTER.recipeBuilder() .circuitMeta(1) .inputs(ore('dustIronIISulfide') * 2) + .fluidInputs(fluid('oxygen') * 3000) .outputs(metaitem('dustBandedIron') * 2) .fluidOutputs(fluid('sulfur_dioxide') * 1000) .duration(80) @@ -77,16 +78,18 @@ ROASTER.recipeBuilder() .notConsumable(ore('dustVanadiumPentoxide')) .fluidOutputs(fluid('sulfur_trioxide') * 4000) .duration(200) - .EUt(7) + .EUt(30) .buildAndRegister() //Lead chamber process -CSTR.recipeBuilder() - .fluidInputs(fluid('sulfur_dioxide') * 50) - .fluidInputs(fluid('nitrogen_dioxide') * 50) - .fluidOutputs(fluid('sulfuric_acid') * 50) - .fluidOutputs(fluid('nitric_oxide') * 50) - .duration(4) - .EUt(7) - .buildAndRegister() \ No newline at end of file +BR.recipeBuilder() + .fluidInputs(fluid('sulfuric_acid') * 1000) + .fluidInputs(fluid('dense_steam') * 3000) + .fluidInputs(fluid('sulfur_dioxide') * 1000) + .fluidInputs(fluid('nitrogen_dioxide') * 1000) + .fluidOutputs(fluid('diluted_sulfuric_acid') * 4000) + .fluidOutputs(fluid('nitric_oxide') * 1000) + .duration(320) + .EUt(7) + .buildAndRegister() \ No newline at end of file From 04b0105833700091075af9498275832358f96cf3 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Sat, 13 Jul 2024 09:10:05 +0700 Subject: [PATCH 9/9] Update SulfurChain.groovy --- .../elements/p_block/group16/SulfurChain.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 870db6ccc..6bb48bb27 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group16/SulfurChain.groovy @@ -77,7 +77,7 @@ ROASTER.recipeBuilder() .fluidInputs(fluid('sulfur_dioxide') * 4000) .notConsumable(ore('dustVanadiumPentoxide')) .fluidOutputs(fluid('sulfur_trioxide') * 4000) - .duration(200) + .duration(40) .EUt(30) .buildAndRegister()