Merge pull request #590 from 05council1/pdms

Pdms

groovy/material/OrganicChemistryMaterials.groovy

@@ -1801,5 +1801,29 @@ public class OrganicChemistryMaterials {
                 .components(Carbon, 18, Hydrogen, 15, Oxygen, 1, Phosphorus, 1)
                 .colorAverage()
                 .build();
+
+        Methyltrichlorosilane = new Material.Builder(15289, SuSyUtility.susyId("methyltrichlorosilane"))
+                .fluid()
+                .components(Carbon, 1, Hydrogen, 3, Silicon, 1, Chlorine, 3)
+                .color(0xd9dddc)
+                .build();
+
+        Methyltrichlorosilane.setFormula("CH3SiCl3", true)
+
+        Methyldichlorosilane = new Material.Builder(15290, SuSyUtility.susyId("methyldichlorosilane"))
+                .fluid()
+                .components(Carbon, 1, Hydrogen, 4, Chlorine, 2, Silicon, 1)
+                .color(0xd9dddc)
+                .build();
+
+        Methyldichlorosilane.setFormula("CH3Cl2SiH", true)
+
+        Chlorotrimethylsilane = new Material.Builder(15291, SuSyUtility.susyId("chlorotrimethylsilane"))
+                .fluid()
+                .components(Carbon, 3, Hydrogen, 9, Silicon, 1, Chlorine, 1)
+                .color(0xd9dddc)
+                .build();
+
+        Chlorotrimethylsilane.setFormula("(CH3)3SiCl", true)
     }
 }

groovy/material/SuSyMaterials.groovy

@@ -476,6 +476,10 @@ class SuSyMaterials {
         public static Material AcidicHydrogenSilsesquioxaneSolution;
         public static Material HydrogenSilsesquioxaneSolution;
 
+	public static Material OrganosiliconMixture;
+	public static Material ImpurePolydimethylsiloxaneMixture;
+	public static Material RawPolydimethylsiloxaneMixture;
+
         // Petrochem Materials
 
         public static Material DilutedOil;
@@ -1389,6 +1393,9 @@ class SuSyMaterials {
         public static Material TriphenylphosphineDichloride;
         public static Material BistriphenylphosphineiminiumChloride;
         public static Material TriphenylphosphineOxide;
+        public static Material Methyltrichlorosilane;
+        public static Material Methyldichlorosilane;
+        public static Material Chlorotrimethylsilane;
 
         // Third Degree Materials
 
@@ -1513,4 +1520,4 @@ class SuSyMaterials {
                 ThirdDegreeMaterials.register();
                 ThermodynamicsMaterials.register();
         }
-}
+}

groovy/material/UnknownCompositionMaterials.groovy

@@ -1809,5 +1809,20 @@ public class UnknownCompositionMaterials {
                 .fluid()
                 .color(0xa186b0)
                 .build();
+
+        OrganosiliconMixture = new Material.Builder(4345, SuSyUtility.susyId("organosilicon_mixture"))
+                .fluid()
+                .color(0xbebdb8)
+                .build();
+
+        ImpurePolydimethylsiloxaneMixture = new Material.Builder(4346, SuSyUtility.susyId("impure_polydimethylsiloxane_mixture"))
+                .fluid()
+                .color(0xf6f7f0)
+                .build();
+
+        RawPolydimethylsiloxaneMixture = new Material.Builder(4347, SuSyUtility.susyId("raw_polydimethylsiloxane_mixture"))
+                .fluid()
+                .color(0xf6f7f0)
+                .build();  
     }
-}
+}

groovy/postInit/chemistry/ChemistryOverhaul.groovy

@@ -1035,36 +1035,6 @@ DISTILLATION_TOWER.recipeBuilder()
 .EUt(30)
 .buildAndRegister()
 
-// Polydimethylsiloxane
-
-FLUIDIZEDBR.recipeBuilder()
-.fluidInputs(fluid('chloromethane') * 2000)
-.notConsumable(ore('dustCuprousOxide'))
-.inputs(ore('dustSilicon'))
-.fluidOutputs(fluid('dimethyldichlorosilane') * 1000)
-.duration(160)
-.EUt(480)
-.buildAndRegister()
-
-MIXER.recipeBuilder()
-.fluidInputs(fluid('dimethyldichlorosilane') * 1000)
-.fluidInputs(fluid('water') * 2000)
-.fluidInputs(fluid('gtfo_sodium_stearate') * 100)
-.fluidOutputs(fluid('dimethyldichlorosilane_emulsion') * 3000)
-.duration(120)
-.EUt(30)
-.buildAndRegister()
-
-POLYMERIZATION.recipeBuilder()
-.fluidInputs(fluid('dimethyldichlorosilane_emulsion') * 3000)
-.inputs(ore('dustTinyPotassiumPersulfate'))
-.outputs(metaitem('dustPolydimethylsiloxane') * 3)
-.fluidOutputs(fluid('hydrogen_chloride') * 2000)
-.EUt(30)
-.duration(160)
-.buildAndRegister()
-//Vulcanisation in Rubber Recipes 
-
 // Ammonia
 
 MIXER.recipeBuilder()
@@ -4875,4 +4845,4 @@ FLUID_HEATER.recipeBuilder()
         .fluidOutputs(fluid('gtfo_heated_water') * 1000)
         .duration(20)
         .EUt(Globals.voltAmps[1])
-        .buildAndRegister()
+        .buildAndRegister()

groovy/postInit/chemistry/organic_chemistry/polymers/PolydimethylsiloxaneChain.groovy

@@ -0,0 +1,95 @@
+import static globals.Globals.*
+
+
+DISTILLATION_TOWER = recipemap('distillation_tower')
+FLUIDIZED_BED_REACTOR = recipemap('fluidized_bed_reactor')
+CSTR = recipemap('continuous_stirred_tank_reactor')
+CENTRIFUGE = recipemap('centrifuge')
+ROASTER = recipemap('roaster')
+DUMPER = recipemap('dumping')
+PHASE_SEPARATOR = recipemap('phase_separator')
+CHEMICAL_BATH = recipemap('chemical_bath')
+POLYMERIZATION = recipemap('polymerization_tank')
+
+// Polydimethylsiloxane
+
+FLUIDIZED_BED_REACTOR.recipeBuilder()
+  .fluidInputs(fluid('chloromethane') * 2000)
+  .notConsumable(ore('dustCuprousOxide'))
+  .inputs(ore('dustSilicon'))
+  .fluidOutputs(fluid('organosilicon_mixture') * 2000)
+  .duration(160)
+  .EUt(Globals.voltAmps[3] * 2)
+  .buildAndRegister()
+
+DISTILLATION_TOWER.recipeBuilder()
+  .fluidInputs(fluid('organosilicon_mixture') * 1000)
+  .fluidOutputs(fluid('dimethyldichlorosilane') * 800)
+  .fluidOutputs(fluid('methyltrichlorosilane') * 100)
+  .fluidOutputs(fluid('methyldichlorosilane') * 50)
+  .fluidOutputs(fluid('chlorotrimethylsilane') * 50)
+  .duration(400)
+  .EUt(Globals.voltAmps[1] * 2)
+  .buildAndRegister()
+
+DUMPER.recipeBuilder()
+  .fluidInputs(fluid('methyltrichlorosilane')* 50)
+  .duration(2)
+  .buildAndRegister()
+
+DUMPER.recipeBuilder()
+  .fluidInputs(fluid('methyldichlorosilane')* 50)
+  .duration(2)
+  .buildAndRegister()
+
+DUMPER.recipeBuilder()
+  .fluidInputs(fluid('chlorotrimethylsilane')* 50)
+  .duration(2)
+  .buildAndRegister()
+//Methyltrichlorosilane can be used as a water repellent when put on a surface with water
+//methyldichlorosilane is useless as far as i know
+//Chlorotrimethylsilane has some uses but mostly in reactions that are not relevant to this
+
+CSTR.recipeBuilder()
+  .fluidInputs(fluid('dimethyldichlorosilane') * 50)
+  .fluidInputs(fluid('water') * 75)
+  .fluidOutputs(fluid('impure_polydimethylsiloxane_mixture') * 75)
+  .fluidOutputs(fluid('hydrochloric_acid') * 50)
+  .duration(10)
+  .EUt(Globals.voltAmps[1])
+  .buildAndRegister()
+
+PHASE_SEPARATOR.recipeBuilder()
+  .fluidInputs(fluid('impure_polydimethylsiloxane_mixture') * 1500)
+  .fluidOutputs(fluid('hydrochloric_acid') * 500)
+  .fluidOutputs(fluid('raw_polydimethylsiloxane_mixture') * 1000)
+  .duration(200)
+  .buildAndRegister()
+
+MIXER.recipeBuilder()
+  .fluidInputs(fluid('raw_polydimethylsiloxane_mixture') * 1000)
+  .fluidInputs(fluid('water') * 500)
+  .fluidOutputs(fluid('hydrochloric_acid') * 500)
+  .fluidOutputs(fluid('polydimethylsiloxane') * 1000)
+  .duration(200)
+  .EUt(Globals.voltAmps[1])
+  .buildAndRegister()
+
+POLYMERIZATION.recipeBuilder()
+  .fluidInputs(fluid('polydimethylsiloxane') * 1000)
+  .fluidInputs(fluid('di_tert_butyl_peroxide') * 50)
+  .inputs(ore('dustSiliconDioxide'))
+  .fluidOutputs(fluid('silicone_rubber') * 1000)
+  .duration(100)
+  .EUt(Globals.voltAmps[3])
+  .buildAndRegister()
+
+POLYMERIZATION.recipeBuilder()
+  .fluidInputs(fluid('polydimethylsiloxane') * 1000)
+  .fluidInputs(fluid('di_tert_butyl_peroxide') * 50)
+  .inputs(ore('dustCarbon'))
+  .fluidOutputs(fluid('silicone_rubber') * 1000)
+  .duration(100)
+  .EUt(Globals.voltAmps[3])
+  .buildAndRegister()
+

resources/langfiles/lang/en_us.lang

@@ -185,6 +185,15 @@ susy.material.black_liquor=Black Liquor
 susy.material.concentrated_black_liquor=Concentrated Black Liquor
 susy.material.green_liquor=Green Liquor
 
+susy.material.organosilicon_mixture=Organosilicon Mixture
+susy.material.impure_polydimethylsiloxane_mixture=Impure Polydimethylsiloxane Mixture
+susy.material.raw_polydimethylsiloxane_mixture=Raw Polydimethylsiloxane Mixture
+susy.material.polydimethylsiloxane=Polydimethylsiloxane
+susy.material.chlorotrimethylsilane=Chlorotrimethylsilane
+susy.material.methyldichlorosilane=Methyldichlorosilane
+susy.material.methyltrichlorosilane=Methyltrichlorosilane
+susy.material.dimethyldichlorosilane=Dimethyldichlorosilane
+
 # Solids
 
 susy.material.pig_iron=Pig Iron
@@ -2151,4 +2160,4 @@ tooltip.computronics.waila.tape.tapeinserted=Tape Inserted
 gregtech.block_group_members.extractable_logs_1.name=Birch, Jungle, Oak, and Spruce Log
 gregtech.block_group_members.extractable_logs_2.name=Acacia and Dark Oak
 
-gregtech.block_group_members.latex_logs.name=Rubber Log
+gregtech.block_group_members.latex_logs.name=Rubber Log