Merge pull request #596 from SymmetricDevs/master-hotfixes

Hotfixes-0.1.11

groovy/material/FirstDegreeMaterials.groovy

@@ -644,7 +644,7 @@ public class FirstDegreeMaterials{
                 .build();
 
         TetrafluoroboricAcid = new Material.Builder(8182, SuSyUtility.susyId('tetrafluoroboric_acid'))
-                .fluid()
+                .fluid(FluidTypes.ACID)
                 .components(Water, 3, Hydrogen, 1, Boron, 1, Fluorine, 4)
                 .color(0xa4ab91)
                 .build();
@@ -732,7 +732,7 @@ public class FirstDegreeMaterials{
                 .setFormula("(H2O)3(Ni,Co)Cl2", true)
 
         AcidicCopperSolution = new Material.Builder(8194, SuSyUtility.susyId('acidic_copper_solution'))
-                .fluid()
+                .fluid(FluidTypes.ACID)
                 .components(Water, 4, Copper, 2, Sulfur, 2, Oxygen, 8, NitricAcid, 2)
                 .flags(DISABLE_DECOMPOSITION)
                 .colorAverage()
@@ -891,7 +891,7 @@ public class FirstDegreeMaterials{
                 .build()
 
         VeryDilutedSulfuricAcid = new Material.Builder(8219, SuSyUtility.susyId('very_diluted_sulfuric_acid'))
-                .fluid()
+                .fluid(FluidTypes.ACID)
                 .components(Water, 2, SulfuricAcid, 1)
                 .color(0x54362c)
                 .build()
@@ -1018,7 +1018,7 @@ public class FirstDegreeMaterials{
                 .build()
 
         HydrobromicAcid = new Material.Builder(8241, SuSyUtility.susyId('hydrobromic_acid'))
-                .fluid()
+                .fluid(FluidTypes.ACID)
                 .components(Hydrogen, 1, Bromine, 1, Water, 1)
                 .colorAverage()
                 .build()
@@ -1027,7 +1027,7 @@ public class FirstDegreeMaterials{
 
         AluminiumChloride = new Material.Builder(8242, SuSyUtility.susyId('aluminium_chloride'))
                 .dust().fluid(FluidTypes.GAS)
-                .flags(NO_UNIFICATION, GENERATE_CATALYST_BED)
+                .flags(GENERATE_CATALYST_BED)
                 .fluidTemp(460)
                 .components(Aluminium, 1, Chlorine, 3)
                 .colorAverage()
@@ -1123,7 +1123,7 @@ public class FirstDegreeMaterials{
                 .setFormula("(Na3[Ag(S2O3)2])3(Na3AsS3)(H2O)5", true)
 
         AcidicArsenateVSolution = new Material.Builder(8257, SuSyUtility.susyId('acidic_arsenate_v_solution'))
-                .fluid()
+                .fluid(FluidTypes.ACID)
                 .components(NitricAcid, 6, Hydrogen, 9, Arsenic, 3, Oxygen, 12)
                 .flags(DISABLE_DECOMPOSITION)
                 .colorAverage()
@@ -1861,11 +1861,11 @@ public class FirstDegreeMaterials{
                 .iconSet(SHINY)
                 .build();
 
-        HydrogenSilsesquioxane = new Material.Builder(8371, SuSyUtility.susyId('hydrogen_silsesquioxane'))
-                .dust()
-                .color(0xC7C0CB)
-                .components(Hydrogen, 8, Silicon, 8, Oxygen, 12)
-                .build()
+        DecarburizedAir = new Material.Builder(8371, SuSyUtility.susyId('decarburized_air'))
+                .fluid(FluidTypes.GAS)
+                .components(Nitrogen, 78, Oxygen, 21, Argon, 1)
+                .color(0x90bbe0)
+                .build();
 
         BariumChloride = new Material.Builder(8372, SuSyUtility.susyId('barium_chloride'))
                 .dust()
@@ -2311,7 +2311,7 @@ public class FirstDegreeMaterials{
                 .build();
 
         DilutedPhosphoricAcid = new Material.Builder(8437, SuSyUtility.susyId('diluted_phosphoric_acid'))
-                .fluid()
+                .fluid(FluidTypes.ACID)
                 .components(PhosphoricAcid, 3, Water, 1)
                 .colorAverage()
                 .build()
@@ -2367,7 +2367,7 @@ public class FirstDegreeMaterials{
                 .build();
 
         HotSulfuricAcid = new Material.Builder(8445, SuSyUtility.susyId('hot_sulfuric_acid'))
-                .fluid()
+                .fluid(FluidTypes.ACID)
                 .fluidTemp(353)
                 .components(Hydrogen, 2, Sulfur, 1, Oxygen, 4)
                 .color(0xff570f)
@@ -3142,7 +3142,7 @@ public class FirstDegreeMaterials{
         NiobiumOxideDihydrate.setFormula("Nb2O5 * (H2O)2", true)
 
         PurifiedFluoroniobicAcidSolution = new Material.Builder(8556, SuSyUtility.susyId('purified_fluoroniobic_acid_solution'))
-                .fluid()
+                .fluid(FluidTypes.ACID)
                 .components(Hydrogen, 6, Niobium, 3, Fluorine, 9, Water, 6)
                 .colorAverage()
                 .build();
@@ -3156,7 +3156,7 @@ public class FirstDegreeMaterials{
                 .build();
 
         FluorotantalicAcidSolution = new Material.Builder(8558, SuSyUtility.susyId('fluorotantalic_acid_solution'))
-                .fluid()
+                .fluid(FluidTypes.ACID)
                 .components(Hydrogen, 2, Tantalum, 1, Fluorine, 7, Water, 1)
                 .colorAverage()
                 .build();
@@ -3233,17 +3233,5 @@ public class FirstDegreeMaterials{
                 .build();
 
         Diamminedichloropalladium.setFormula("Pd(NH3)2Cl2", true)
-
-        DecarburizedAir = new Material.Builder(8572, SuSyUtility.susyId('decarburized_air'))
-                .fluid(FluidTypes.GAS)
-                .components(Nitrogen, 78, Oxygen, 21, Argon, 1)
-                .color(0x90bbe0)
-                .build();
-
-        ZincOxide = new Material.Builder(8573, SuSyUtility.susyId("zinc_oxide"))
-                .dust()
-                .components(Zinc, 1, Oxygen, 1)
-                .color(0xFFFFF5)
-                .build();
     }
 }

groovy/material/OrganicChemistryMaterials.groovy

@@ -390,25 +390,30 @@ public class OrganicChemistryMaterials {
                 .colorAverage()
                 .build();
 
-        BisphenolADiglycidylEther = new Material.Builder(15063, SuSyUtility.susyId('bisphenola_diglycidyl_ether'))
+        Chlorotrimethylsilane = new Material.Builder(15063, SuSyUtility.susyId("chlorotrimethylsilane"))
                 .fluid()
-                .components(Carbon, 21, Hydrogen, 24, Oxygen, 4)
-                .colorAverage()
+                .components(Carbon, 3, Hydrogen, 9, Silicon, 1, Chlorine, 1)
+                .color(0xd9dddc)
                 .build();
 
-        ImpureEpoxyResin = new Material.Builder(15064, SuSyUtility.susyId('impure_epoxy_resin'))
+        Chlorotrimethylsilane.setFormula("(CH3)3SiCl", true)
+
+        Methyldichlorosilane = new Material.Builder(15064, SuSyUtility.susyId("methyldichlorosilane"))
                 .fluid()
-                .components(SaltWater, 1, Epoxy, 1)
-                .colorAverage()
+                .components(Carbon, 1, Hydrogen, 4, Chlorine, 2, Silicon, 1)
+                .color(0xd9dddc)
                 .build();
 
-        UncuredEpoxyResin = new Material.Builder(15065, SuSyUtility.susyId('uncured_epoxy_resin'))
+        Methyldichlorosilane.setFormula("CH3Cl2SiH", true)
+
+        Methyltrichlorosilane = new Material.Builder(15065, SuSyUtility.susyId("methyltrichlorosilane"))
                 .fluid()
-                .components(Epoxy, 1)
-                .colorAverage()
-                .flags(DISABLE_DECOMPOSITION)
+                .components(Carbon, 1, Hydrogen, 3, Silicon, 1, Chlorine, 3)
+                .color(0xd9dddc)
                 .build();
 
+        Methyltrichlorosilane.setFormula("CH3SiCl3", true)
+
         TNTSolution = new Material.Builder(15066, SuSyUtility.susyId('tnt_solution'))
                 .fluid()
                 .components(TNT, 1, DilutedSulfuricAcid, 1)
@@ -1764,10 +1769,10 @@ public class OrganicChemistryMaterials {
                 .color(0xff6e6e)
                 .build();
 
-        TriarylsulfoniumHexafluoroantimonate = new Material.Builder(15283, SuSyUtility.susyId("triarylsulfonium_hexafluoroantimonate"))
+        TriphenylphosphineOxide = new Material.Builder(15283, SuSyUtility.susyId('triphenylphosphine_oxide'))
                 .dust()
-                .components(Carbon, 24, Hydrogen, 19, Fluorine, 6, Sulfur, 2, Antimony, 1)
-                .color(0x31a374)
+                .components(Carbon, 18, Hydrogen, 15, Oxygen, 1, Phosphorus, 1)
+                .colorAverage()
                 .build();
 
         TosylicAcidSolution = new Material.Builder(15284, SuSyUtility.susyId("tosylic_acid_solution"))
@@ -1796,34 +1801,6 @@ public class OrganicChemistryMaterials {
                 .colorAverage()
                 .build();
 
-        TriphenylphosphineOxide = new Material.Builder(15288, SuSyUtility.susyId('triphenylphosphine_oxide'))
-                .dust()
-                .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/SecondDegreeMaterials.groovy

@@ -253,7 +253,7 @@ public class SecondDegreeMaterials {
                 .build()
 
         ChloroauricAcidSolution = new Material.Builder(13039, SuSyUtility.susyId('chloroauric_acid_solution'))
-                .fluid()
+                .fluid(FluidTypes.ACID)
                 .components(ChloroauricAcid, 3, NitricAcid, 1, Water, 6)
                 .color(0xd69129)
                 .build();
@@ -335,7 +335,7 @@ public class SecondDegreeMaterials {
                 .setFormula('(H2O)2(Na2SO4)', true);
 
         DilutedHydrofluoricAcid = new Material.Builder(13052, SuSyUtility.susyId('diluted_hydrofluoric_acid'))
-                .fluid()
+                .fluid(FluidTypes.ACID)
                 .components(Water, 2, HydrogenFluoride, 1)
                 .colorAverage()
                 .build();

groovy/material/SuSyMaterials.groovy

@@ -1154,9 +1154,6 @@ class SuSyMaterials {
         public static Material Hydroxylamine;
         public static Material Cyclohexanone;
         public static Material CaprolactamSolution;
-        public static Material BisphenolADiglycidylEther;
-        public static Material ImpureEpoxyResin;
-        public static Material UncuredEpoxyResin;
         public static Material TNTSolution;
         public static Material VinylChlorideSuspension;
         public static Material PolyvinylChlorideSuspension;

groovy/material/ThirdDegreeMaterials.groovy

@@ -349,6 +349,7 @@ public class ThirdDegreeMaterials {
 
         WetEpoxy = new Material.Builder(24054, SuSyUtility.susyId('wet_epoxy'))
                 .dust()
+                .flags(DISABLE_DECOMPOSITION)
                 .components(Epoxy, 1)
                 .color(0xa16f0d)
                 .build();
@@ -367,6 +368,7 @@ public class ThirdDegreeMaterials {
 
         WetFlameRetardantEpoxy = new Material.Builder(24057, SuSyUtility.susyId('wet_flame_retardant_epoxy'))
                 .dust()
+                .flags(DISABLE_DECOMPOSITION)
                 .components(FlameRetardantEpoxy, 1)
                 .color(0xa1530b)
                 .build();