Merge pull request #609 from trainvoi/strontium-chain

strontium-chain

groovy/globals/SinteringGlobals.groovy

@@ -62,4 +62,16 @@ class SinteringGlobals {
     public static sintering_blankets = [
         new Blanket('argon', 100, 300)
     ]
+
+    public static rotary_kiln_fuels = [
+        new Combustible('methane', false, 25, 50, 'carbon_dioxide', 25),
+        new Combustible('natural_gas', false, 8, 50, 'carbon_dioxide', 25),
+        new Combustible('refinery_gas', false, 8, 50, 'carbon_dioxide', 25),
+        new Combustible('fuel_oil', false, 4, 50, 'carbon_dioxide', 25)
+    ]
+
+    public static rotary_kiln_comburents = [
+        new Comburent('air', 250, 50),
+        new Comburent('oxygen', 50, 30)
+    ]
 }

groovy/material/FirstDegreeMaterials.groovy

@@ -3233,5 +3233,37 @@ public class FirstDegreeMaterials{
                 .build();
 
         Diamminedichloropalladium.setFormula("Pd(NH3)2Cl2", true)
+
+        ImpureBariumSulfide = new Material.Builder(8572, SuSyUtility.susyId("impure_barium_sulfide"))
+                .dust()
+                .components(Barium, 1, Sulfur, 1)
+                .iconSet(DULL)
+                .colorAverage()
+                .build();
+
+        ImpureBariumSulfide.setFormula("(?)(BaS)", true)
+
+        ImpureStrontiumSulfide = new Material.Builder(8573, SuSyUtility.susyId("impure_strontium_sulfide"))
+                .dust()
+                .components(Strontium, 1, Sulfur, 1)
+                .iconSet(DULL)
+                .colorAverage()
+                .build();
+
+        ImpureStrontiumSulfide.setFormula("(?)(SrS)", true)
+
+        StrontiumSulfideSolution = new Material.Builder(8574, SuSyUtility.susyId("strontium_sulfide_solution"))
+                .fluid()
+                .components(Strontium, 1, Sulfur, 1, Water, 1)
+                .colorAverage()
+                .build();
+
+        StrontiumSulfideSolution.setFormula("(SrS)(H2O)", true)
+
+        StrontiumOxide = new Material.Builder(8575, SuSyUtility.susyId("strontium_oxide"))
+                .dust()
+                .components(Strontium, 1, Oxygen, 1)
+                .colorAverage()
+                .build();
     }
 }

groovy/material/OreMaterials.groovy

@@ -8,6 +8,7 @@ import gregtech.api.fluids.fluidType.FluidTypes;
 import gregtech.api.unification.material.properties.*
 
 import supersymmetry.api.util.SuSyUtility;
+import static supersymmetry.api.unification.material.info.SuSyMaterialFlags.*;
 
 import static gregtech.api.unification.material.info.MaterialIconSet.*;
 import static gregtech.api.unification.material.info.MaterialFlags.*;
@@ -170,7 +171,7 @@ public class OreMaterials{
 
         Celestine = new Material.Builder(7018, SuSyUtility.susyId('celestine'))
                 .dust().gem().ore()
-                .flags(NO_SMELTING)
+                .flags(NO_SMELTING, GENERATE_SIFTED, GENERATE_FLOTATED)
                 .color(0xafe3e0)
                 .iconSet(SHINY)
                 .components(Strontium, 1, Sulfur, 1, Oxygen, 4)

groovy/material/SecondDegreeMaterials.groovy

@@ -609,6 +609,24 @@ public class SecondDegreeMaterials {
                 .fluid()
                 .components(Trichlorosilane, 1, Toluene, 6)
                 .colorAverage()
-                .build()
+                .build();
+
+        ImpureBariumSulfideSolution = new Material.Builder(13097, SuSyUtility.susyId("impure_barium_sulfide_solution"))
+                .fluid()
+                .components(ImpureBariumSulfide, 1, Water, 1)
+                .colorAverage()
+                .build();
+
+        ImpureStrontiumSulfideSlurry = new Material.Builder(13098, SuSyUtility.susyId("impure_strontium_sulfide_slurry"))
+                .fluid()
+                .components(ImpureStrontiumSulfide, 1, Water, 1, SiliconDioxide, 1)
+                .colorAverage()
+                .build();
+
+        DilutedSodiumCarbonateSolution = new Material.Builder(13099, SuSyUtility.susyId("diluted_sodium_carbonate_solution"))
+                .fluid()
+                .components(SodaAsh, 1, Water, 3)
+                .colorAverage()
+                .build();
     }
 }

groovy/material/SuSyMaterials.groovy

@@ -475,6 +475,9 @@ class SuSyMaterials {
         public static Material SuEight;
         public static Material AcidicHydrogenSilsesquioxaneSolution;
         public static Material HydrogenSilsesquioxaneSolution;
+        public static Material ImpureCelestineSlurry;
+        public static Material CelestineSlurry;
+        public static Material BariumResidue;
 
 	public static Material OrganosiliconMixture;
 	public static Material ImpurePolydimethylsiloxaneMixture;
@@ -1003,6 +1006,10 @@ class SuSyMaterials {
         public static Material SodiumHexafluoroantimonate;
         public static Material AcidWashedSiliconDioxide;
         public static Material DisulfurDichloride;
+        public static Material StrontiumSulfideSolution;
+        public static Material StrontiumOxide;
+        public static Material ImpureBariumSulfide;
+        public static Material ImpureStrontiumSulfide;
 
         // Second Degree Materials
 
@@ -1101,6 +1108,8 @@ class SuSyMaterials {
         public static Material SodiumHexafluoroantimonateSolution;
         public static Material EGlass;
         public static Material TrichlorosilaneSolution;
+        public static Material ImpureBariumSulfideSolution;
+        public static Material ImpureStrontiumSulfideSlurry;
 
         // Organic Chemistry Materials
 
@@ -1393,6 +1402,7 @@ class SuSyMaterials {
         public static Material Methyltrichlorosilane;
         public static Material Methyldichlorosilane;
         public static Material Chlorotrimethylsilane;
+        public static Material DilutedSodiumCarbonateSolution;
 
         // Third Degree Materials
 

groovy/material/UnknownCompositionMaterials.groovy

@@ -1809,18 +1809,33 @@ public class UnknownCompositionMaterials {
                 .fluid()
                 .color(0xa186b0)
                 .build();
+
+        ImpureCelestineSlurry = new Material.Builder(4345, SuSyUtility.susyId("impure_celestine_slurry"))
+                .fluid()
+                .color(0x698886)
+                .build();
+
+        CelestineSlurry = new Material.Builder(4346, SuSyUtility.susyId("celestine_slurry"))
+                .fluid()
+                .color(0x8cb5b3)
+                .build();
+
+        BariumResidue = new Material.Builder(4347, SuSyUtility.susyId("barium_residue"))
+                .dust()
+                .color(0xc9c4b1)
+                .build();
 
-        OrganosiliconMixture = new Material.Builder(4345, SuSyUtility.susyId("organosilicon_mixture"))
+        OrganosiliconMixture = new Material.Builder(4348, SuSyUtility.susyId("organosilicon_mixture"))
                 .fluid()
                 .color(0xbebdb8)
                 .build();
 
-        ImpurePolydimethylsiloxaneMixture = new Material.Builder(4346, SuSyUtility.susyId("impure_polydimethylsiloxane_mixture"))
+        ImpurePolydimethylsiloxaneMixture = new Material.Builder(4349, SuSyUtility.susyId("impure_polydimethylsiloxane_mixture"))
                 .fluid()
                 .color(0xf6f7f0)
                 .build();
 
-        RawPolydimethylsiloxaneMixture = new Material.Builder(4347, SuSyUtility.susyId("raw_polydimethylsiloxane_mixture"))
+        RawPolydimethylsiloxaneMixture = new Material.Builder(4350, SuSyUtility.susyId("raw_polydimethylsiloxane_mixture"))
                 .fluid()
                 .color(0xf6f7f0)
                 .build();  

groovy/postInit/chemistry/ChemistryOverhaul.groovy

@@ -4653,3 +4653,22 @@ FLUID_HEATER.recipeBuilder()
         .duration(20)
         .EUt(Globals.voltAmps[1])
         .buildAndRegister()
+
+// Soda Ash Solution
+BCR.recipeBuilder()
+        .fluidInputs(fluid('sodium_hydroxide_solution') * 100)
+        .fluidInputs(fluid('carbon_dioxide') * 50)
+        .fluidOutputs(fluid('diluted_sodium_carbonate_solution') * 150)
+        .duration(4)
+        .EUt(30)
+        .buildAndRegister()
+
+DISTILLERY.recipeBuilder()
+        .fluidInputs(fluid('diluted_sodium_carbonate_solution') * 3000)
+        .outputs(metaitem('dustSodaAsh') * 6)
+        .fluidOutputs(fluid('water') * 3000)
+        .duration(120)
+        .EUt(30)
+        .buildAndRegister()
+
+

groovy/postInit/chemistry/elements/BariumChain.groovy

@@ -1,4 +1,5 @@
 import static globals.Globals.*
+import static globals.SinteringGlobals.*
 
 FLOTATION = recipemap('froth_flotation')
 ROASTER = recipemap('roaster')
@@ -9,6 +10,8 @@ MIXER = recipemap('mixer')
 CLARIFIER = recipemap('clarifier')
 CENTRIFUGE = recipemap('centrifuge')
 REACTION_FURNACE = recipemap('reaction_furnace')
+ROTARY_KILN = recipemap('rotary_kiln')
+CRYSTALLIZER = recipemap('crystallizer')
 
 //OPTIONAL FLOTATION
 
@@ -46,11 +49,44 @@ CENTRIFUGE.recipeBuilder()
     .duration(20)
     .buildAndRegister()
 
-ROASTER.recipeBuilder()
-    .inputs(ore('dustBarite'))
-    .inputs(ore('dustCarbon') * 4)
+for (fuel in rotary_kiln_fuels) {
+    for (comburent in rotary_kiln_comburents) {
+        ROTARY_KILN.recipeBuilder()
+            .inputs(ore('dustBarite'))
+            .inputs(ore('dustCarbon') * 2)
+            .fluidInputs(fluid(fuel.name) * fuel.amountRequired)
+            .fluidInputs(fluid(comburent.name) * comburent.amountRequired)
+            .outputs(metaitem('dustImpureBariumSulfide') * 2)
+            .fluidOutputs(fluid('carbon_dioxide') * 2025)
+            .EUt(Globals.voltAmps[1])
+            .duration(fuel.duration + comburent.duration)
+            .buildAndRegister()
+    }
+}
+
+MIXER.recipeBuilder()
+    .inputs(ore('dustImpureBariumSulfide') * 4)
+    .fluidInputs(fluid('gtfo_heated_water') * 1000)
+    .outputs(metaitem('dustBariumResidue') * 2)
+    .fluidOutputs(fluid('impure_barium_sulfide_solution') * 1000)
+    .EUt(Globals.voltAmps[1])
+    .duration(100)
+    .buildAndRegister()
+
+BR.recipeBuilder()
+    .inputs(ore('dustBariumResidue') * 2)
+    .fluidInputs(fluid('gtfo_heated_water') * 1000)
+    .fluidInputs(fluid('hydrogen_sulfide') * 1000)
+    .fluidOutputs(fluid('impure_barium_sulfide_solution') * 1000)
+    .outputs(metaitem('dustSiliconDioxide'))
+    .EUt(Globals.voltAmps[1])
+    .duration(100)
+    .buildAndRegister()
+
+CRYSTALLIZER.recipeBuilder()
+    .fluidInputs(fluid('impure_barium_sulfide_solution') * 1000)
     .outputs(metaitem('dustBariumSulfide') * 2)
-    .fluidOutputs(fluid('carbon_monoxide') * 4000)
+    .fluidOutputs(fluid('wastewater') * 1000)
     .EUt(Globals.voltAmps[1])
     .duration(100)
     .buildAndRegister()

groovy/postInit/chemistry/elements/LeadChain.groovy

@@ -9,7 +9,6 @@ REACTION_FURNACE = recipemap('reaction_furnace')
 BR = recipemap('batch_reactor')
 ELECTROLYTIC_CELL = recipemap('electrolytic_cell')
 FLOTATION = recipemap('froth_flotation')
-SINTERING_OVEN = recipemap('sintering_oven')
 VACUUM_CHAMBER = recipemap('vacuum_chamber')
 DISTILLERY = recipemap('distillery')
 FLUID_EXTRACTOR = recipemap('extractor')
@@ -139,47 +138,37 @@ CLARIFIER.recipeBuilder()
         .buildAndRegister()
 
 //CONCENTRATE SINTERING
-SINTERING_OVEN.recipeBuilder()
-        .inputs(ore('dustAnglesite') * 1)
-        .outputs(metaitem('dustSinteredLeadConcentrate') * 2)
-        .fluidOutputs(fluid('sulfur_trioxide') * 1000)
-        .EUt(120)
-        .duration(200)
-        .buildAndRegister()
-
-for (fuel in sintering_fuels) {
-    if (!fuel.isPlasma) {
-        for (comburent in sintering_comburents) {
-            ROTARY_KILN.recipeBuilder()
-                    .inputs(ore('dustMassicot') * 2)
-                    .outputs(metaitem('dustSinteredLeadConcentrate') * 2)
-                    .fluidInputs(fluid(fuel.name) * fuel.amountRequired)
-                    .fluidInputs(fluid(comburent.name) * comburent.amountRequired)
-                    .fluidOutputs(fluid(fuel.byproduct) * fuel.byproductAmount)
-                    .duration(fuel.duration + comburent.duration)
-                    .EUt(120)
-                    .buildAndRegister()
-
-            ROTARY_KILN.recipeBuilder()
-                    .inputs(ore('dustGalena') * 1)
-                    .outputs(metaitem('dustSinteredLeadConcentrate') * 2)
-                    .fluidInputs(fluid(fuel.name) * fuel.amountRequired)
-                    .fluidInputs(fluid(comburent.name) * (comburent.amountRequired * 40))
-                    .fluidOutputs(fluid('sulfur_dioxide') * 1000)
-                    .duration(fuel.duration + comburent.duration)
-                    .EUt(120)
-                    .buildAndRegister()
-
-            ROTARY_KILN.recipeBuilder()
-                    .inputs(ore('dustAnglesite') * 1)
-                    .outputs(metaitem('dustSinteredLeadConcentrate') * 2)
-                    .fluidInputs(fluid(fuel.name) * fuel.amountRequired)
-                    .fluidInputs(fluid(comburent.name) * comburent.amountRequired)
-                    .fluidOutputs(fluid('sulfur_trioxide') * 1000)
-                    .duration(fuel.duration + comburent.duration)
-                    .EUt(120)
-                    .buildAndRegister()
-        }
+for (fuel in rotary_kiln_fuels) {
+    for (comburent in rotary_kiln_comburents) {
+        ROTARY_KILN.recipeBuilder()
+                .inputs(ore('dustMassicot') * 2)
+                .outputs(metaitem('dustSinteredLeadConcentrate') * 2)
+                .fluidInputs(fluid(fuel.name) * fuel.amountRequired)
+                .fluidInputs(fluid(comburent.name) * comburent.amountRequired)
+                .fluidOutputs(fluid(fuel.byproduct) * fuel.byproductAmount)
+                .duration(fuel.duration + comburent.duration)
+                .EUt(120)
+                .buildAndRegister()
+
+        ROTARY_KILN.recipeBuilder()
+                .inputs(ore('dustGalena') * 1)
+                .outputs(metaitem('dustSinteredLeadConcentrate') * 2)
+                .fluidInputs(fluid(fuel.name) * fuel.amountRequired)
+                .fluidInputs(fluid(comburent.name) * comburent.amountRequired)
+                .fluidOutputs(fluid('sulfur_dioxide') * 1000)
+                .duration(fuel.duration + comburent.duration)
+                .EUt(120)
+                .buildAndRegister()
+
+        ROTARY_KILN.recipeBuilder()
+                .inputs(ore('dustAnglesite') * 1)
+                .outputs(metaitem('dustSinteredLeadConcentrate') * 2)
+                .fluidInputs(fluid(fuel.name) * fuel.amountRequired)
+                .fluidInputs(fluid(comburent.name) * comburent.amountRequired)
+                .fluidOutputs(fluid('sulfur_trioxide') * 1000)
+                .duration(fuel.duration + comburent.duration)
+                .EUt(120)
+                .buildAndRegister()
     }
 }