Automatic synchronization

4 files changed, 95 insertions, 5 deletions

diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index d2639a220f..95e3631aaf 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -15,7 +15,7 @@ public final class ALLOY {
 	public static final Material KANTHAL = MaterialUtils.generateMaterialFromGtENUM(Materials.Kanthal);
 	public static final Material NICHROME = MaterialUtils.generateMaterialFromGtENUM(Materials.Nichrome);
 	public static final Material TUNGSTENSTEEL = MaterialUtils.generateMaterialFromGtENUM(Materials.TungstenSteel);
-	public static final Material STAINLESSSTEEL = MaterialUtils.generateMaterialFromGtENUM(Materials.StainlessSteel);
+	public static final Material STAINLESS_STEEL = MaterialUtils.generateMaterialFromGtENUM(Materials.StainlessSteel);
 	public static final Material OSMIRIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Osmiridium);
 
 	public static final Material ENERGYCRYSTAL = new Material(
@@ -695,7 +695,8 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 30),
 					new MaterialStack(ALLOY.MARAGING350, 40),
 					new MaterialStack(ALLOY.TUNGSTENSTEEL, 20),
-					new MaterialStack(ALLOY.OSMIRIDIUM, 10)
+					new MaterialStack(ALLOY.OSMIRIDIUM, 10),
+					new MaterialStack(ELEMENT.getInstance().STRONTIUM, 10)
 			});
 
 
@@ -803,7 +804,7 @@ public final class ALLOY {
 			true, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
-					new MaterialStack(ALLOY.STAINLESSSTEEL, 10),
+					new MaterialStack(ALLOY.STAINLESS_STEEL, 10),
 					new MaterialStack(ALLOY.TUNGSTEN_CARBIDE, 10),
 					new MaterialStack(ALLOY.NICHROME, 10),
 					new MaterialStack(ALLOY.BRONZE, 10),
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 9ba6fe0f1d..99586b37fe 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -51,7 +51,7 @@ public final class ELEMENT {
 	public final Material BROMINE = new Material("Bromine", MaterialState.PURE_LIQUID, new short[]{200, 25, 25}, -7, 58, 35, 45, false, "Br", 0);//Not a GT Inherited Material
 	public final Material KRYPTON = new Material("Krypton", MaterialState.PURE_LIQUID, new short[]{255, 255, 255}, -157, -153, 36, 48, false, "Kr", 0);//Not a GT Inherited Material
 	public final Material RUBIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubidium);
-	public final Material STRONTIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Strontium);
+	public final Material STRONTIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Strontium, new short[] {230, 210, 110}, TextureSet.SET_FLINT);
 	public final Material YTTRIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yttrium);
 	public final Material ZIRCONIUM = new Material("Zirconium", MaterialState.SOLID, new short[]{255, 250, 205}, 1855, 4377, 40, 51, false, "Zr", 0);//Not a GT Inherited Material
 	public final Material NIOBIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Niobium);
diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
new file mode 100644
index 0000000000..c7032ab7c7
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -0,0 +1,89 @@
+package gtPlusPlus.core.material;
+
+import gregtech.api.enums.TextureSet;
+import gtPlusPlus.core.material.nuclear.FLUORIDES;
+import gtPlusPlus.core.material.state.MaterialState;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
+
+public final class MISC_MATERIALS {	
+	
+	/*
+	 * Some of these materials purely exist as data objects, items will most likely be assigned seperately.
+	 * Most are just compositions which will have dusts assigned to them.
+	 */
+	
+	public static void run() {
+		MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_OXIDE, false);
+		MaterialUtils.generateSpecialDustAndAssignToAMaterial(STRONTIUM_HYDROXIDE, false);
+	}
+	
+	public static final Material STRONTIUM_OXIDE = new Material(
+			"Strontium Oxide", 
+			MaterialState.SOLID, 
+			TextureSet.SET_METALLIC,
+			null,
+			-1,
+			-1,
+			-1,
+			-1, 
+			false, 
+			"SrO",
+			0, 
+			false,
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
+					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)
+					});
+	
+	public static final Material STRONTIUM_HYDROXIDE = new Material(
+			"Strontium Hydroxide", 
+			MaterialState.SOLID, 
+			TextureSet.SET_METALLIC,
+			null,
+			-1,
+			-1,
+			-1,
+			-1, 
+			false, 
+			"Sr(OH)2",
+			0, 
+			false,
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
+					new MaterialStack(FLUORIDES.HYDROXIDE, 2)
+					});
+	
+	   public static final Material SELENIUM_DIOXIDE = new Material(
+	            "Selenium Dioxide",
+	            MaterialState.PURE_LIQUID, //State
+	            null, //Material Colour
+	            -1, //Melting Point in C
+	            -1, //Boiling Point in C
+	            -1, //Protons
+	            -1,
+	            false, //Uses Blast furnace?
+	            //Material Stacks with Percentage of required elements.
+	            new MaterialStack[]{
+	                    new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
+	                    new MaterialStack(ELEMENT.getInstance().OXYGEN, 2)
+	            });
+	   
+       public static final Material SELENIOUS_ACID = new Material(
+               "Selenious Acid",
+               MaterialState.PURE_LIQUID, //State
+               null, //Material Colour
+               -1, //Melting Point in C
+               -1, //Boiling Point in C
+               -1, //Protons
+               -1,
+               false, //Uses Blast furnace?
+               //Material Stacks with Percentage of required elements.
+               new MaterialStack[]{
+                       new MaterialStack(SELENIUM_DIOXIDE, 1),
+                       new MaterialStack(ELEMENT.getInstance().HYDROGEN, 8),
+                       new MaterialStack(ELEMENT.getInstance().OXYGEN, 4)
+               });
+
+	
+	
+}
diff --git a/src/Java/gtPlusPlus/core/material/ORES.java b/src/Java/gtPlusPlus/core/material/ORES.java
index 801e4924b3..0e1691a557 100644
--- a/src/Java/gtPlusPlus/core/material/ORES.java
+++ b/src/Java/gtPlusPlus/core/material/ORES.java
@@ -545,7 +545,7 @@ public final class ORES {
 			-1, //Radiation
 			new MaterialStack[]{// (Ca,Sr,Ce,Na)5(PO4)3F
 					new MaterialStack(ELEMENT.getInstance().CALCIUM, 5),
-					new MaterialStack(ELEMENT.getInstance().STRONTIUM, 5),
+					new MaterialStack(MISC_MATERIALS.STRONTIUM_OXIDE, 5),
 					new MaterialStack(ELEMENT.getInstance().CERIUM, 5),
 					new MaterialStack(ELEMENT.getInstance().SODIUM, 5),
 					new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 3),