Automatic synchronization

4 files changed, 93 insertions, 21 deletions

diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index 4edd36c51f..d2639a220f 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -190,7 +190,7 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 20),
 					new MaterialStack(NICHROME, 10)
 			});
-	
+
 	public static final Material NITINOL_60 = new Material(
 			"Nitinol 60", //Material Name
 			MaterialState.SOLID, //State
@@ -474,7 +474,7 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().CARBON, 50),
 					new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 50)
 			});
-	
+
 	public static final Material TUNGSTEN_TITANIUM_CARBIDE = new Material(
 			"Tungsten Titanium Carbide", //Material Name
 			MaterialState.SOLID, //State
@@ -549,7 +549,7 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 50),
 					new MaterialStack(ELEMENT.getInstance().CARBON, 50)
 			});
-	
+
 	public static final Material ARCANITE = new Material(
 			"Arcanite", //Material Name
 			MaterialState.SOLID, //State
@@ -680,7 +680,7 @@ public final class ALLOY {
 					new MaterialStack(TRINIUM_NAQUADAH, 9),
 					new MaterialStack(ELEMENT.getInstance().CARBON, 1)
 			});
-	
+
 	public static final Material TRINIUM_REINFORCED_STEEL = new Material(
 			"Arceus Alloy 2B", //Material Name
 			MaterialState.SOLID, //State
@@ -697,8 +697,8 @@ public final class ALLOY {
 					new MaterialStack(ALLOY.TUNGSTENSTEEL, 20),
 					new MaterialStack(ALLOY.OSMIRIDIUM, 10)
 			});
-	
-	
+
+
 
 	/*
 	 * Witchery Material
@@ -719,12 +719,12 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().THAUMIUM, 30),
 					new MaterialStack(ELEMENT.getInstance().IRON, 35)
 			});
-	
-	
+
+
 	/*
 	 * Top Tier Alloys
 	 */
-	
+
 	//0lafe Compound
 	public static final Material LAFIUM = new Material(
 			"Lafium Compound", //Material Name
@@ -768,12 +768,12 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
 					new MaterialStack(ALLOY.OSMIRIDIUM, 6)
 			});
-	
+
 	//Piky Alloy
 	public static final Material PIKYONIUM = new Material(
 			"Pikyonium 64B", //Material Name
 			MaterialState.SOLID, //State
-            new short[]{52, 103, 186, 0}, //Material Colour
+			new short[]{52, 103, 186, 0}, //Material Colour
 			7850, //Melting Point in C
 			11765, //Boiling Point in C
 			-1,
@@ -787,10 +787,10 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().CERIUM, 6),
 					new MaterialStack(ELEMENT.getInstance().ANTIMONY, 4),
 					new MaterialStack(ELEMENT.getInstance().PLATINUM, 4),					
-					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2),
 					new MaterialStack(ALLOY.TUNGSTENSTEEL, 8)
 			});
-	
+
 	//Piky Alloy
 	public static final Material ABYSSAL = new Material(
 			"Abyssal Alloy", //Material Name
@@ -812,7 +812,7 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().RADON, 2),
 					new MaterialStack(ELEMENT.getInstance().GERMANIUM, 2),
 			});
-	
+
 	//Titansteel
 	public static final Material TITANSTEEL = new Material(
 			"Titansteel", //Material Name
@@ -830,8 +830,8 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().TERRA, 1),
 					new MaterialStack(ELEMENT.getInstance().PERDITIO, 1),
 			});
-	
-	
+
+
 	public static final Material OCTIRON = new Material(
 			"Octiron", //Material Name
 			MaterialState.SOLID, //State
@@ -849,7 +849,62 @@ public final class ALLOY {
 					new MaterialStack(STEEL_BLACK, 10),
 					new MaterialStack(ELEMENT.getInstance().THAUMIUM, 25)
 			});
+
+
+
+	public static final Material BLACK_TITANIUM = new Material(
+			"Black Titanium", //Material Name
+			MaterialState.SOLID, //State
+			null, //Material Colour
+			Materials.Titanium.mMeltingPoint*4, //Melting Point in C
+			Materials.Titanium.mMeltingPoint*16,
+			-1,
+			-1,
+			true, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().TITANIUM, 55),
+					new MaterialStack(ELEMENT.getInstance().LANTHANUM, 12),
+					new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 8),
+					new MaterialStack(ELEMENT.getInstance().COBALT, 6),
+					new MaterialStack(ELEMENT.getInstance().MANGANESE, 4),
+					new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 4),
+					new MaterialStack(ELEMENT.getInstance().PALLADIUM, 4),
+					new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().ARGON, 5)
+			});
 	
+	public static final Material BABBIT_ALLOY = new Material(
+			"Babbit Alloy", //Material Name
+			MaterialState.SOLID, //State
+			null, //Material Colour
+			268, //Melting Point in C
+			589,
+			-1,
+			-1,
+			true, //Uses Blast furnace?
+			//Material Stacks with Percentage of required elements.
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().TIN, 10),
+					new MaterialStack(ELEMENT.getInstance().LEAD, 72),
+					new MaterialStack(ELEMENT.getInstance().ANTIMONY, 16),
+					new MaterialStack(ELEMENT.getInstance().ARSENIC, 2)
+			});
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 	//Quantum
 	public static final Material QUANTUM = new Material(
 			"Quantum", //Material Name
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 62e1163a39..e972992391 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -11,7 +11,7 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
 
 public final class ELEMENT {
 
-	public static final String[] NAMES = new String[]{"Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminum", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Cesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};	
+	public static final String[] NAMES = new String[]{"Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};	
 	
 	//First 50 Elements
 	public final Material HYDROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Hydrogen);
@@ -68,7 +68,7 @@ public final class ELEMENT {
 	public final Material TELLURIUM = new Material("Tellurium", MaterialState.SOLID, new short[]{210, 210, 210}, 449, 989, 52, 76, false, "Te", 0);//Not a GT Inherited Material
 	public final Material IODINE = new Material("Iodine", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{96, 96, 96}, 114, 184, 53, 74, false, "I", 0);//Not a GT Inherited Material
 	public final Material XENON = new Material("Xenon", MaterialState.GAS, new short[]{255, 255, 255}, -111, -108, 54, 77, false, "Xe", 0);//Not a GT Inherited Material
-	public final Material CESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Caesium);
+	public final Material CAESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Caesium);
 	public final Material BARIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Barium);
 	public final Material LANTHANUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Lanthanum);
 	public final Material CERIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Cerium);
@@ -212,7 +212,15 @@ public final class ELEMENT {
 		public static final Material ASTRAL_TITANIUM = new Material("Astral Titanium", MaterialState.SOLID, TextureSets.REFINED.get(), new short[] {220, 160, 240, 2}, INSTANCE.TITANIUM.getMeltingPointC()+7500, INSTANCE.TITANIUM.getBoilingPointC()+7500, 145, 133, true, "✧◇✧", 0);//Not a GT Inherited Material
 		public static final Material CHRONOMATIC_GLASS = new Material("Chromatic Glass", MaterialState.SOLID, new short[]{255, 255, 255, 3}, 9200, 17550, 40, 51, false, "⌘☯𓍰 𓍱 𓍲 𓍳 𓍴 𓍵 𓍶 𓍷 𓍸 ☯⌘ ", 0);//Not a GT Inherited Material
 		public static final Material ADVANCED_NITINOL = new Material("Advanced Nitinol", MaterialState.SOLID, TextureSets.ENRICHED.get(), ALLOY.NITINOL_60.getRGB(), 8400, 14377, 40, 51, true, "⚷⚙⚷ Ni4Ti6", 0);//Not a GT Inherited Material
-		public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
+		public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75, 2}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
+		
+		
+		//Runescape materials
+		public static final Material BLACK_METAL = new Material("Black Metal", MaterialState.SOLID, TextureSet.SET_METALLIC, new short[] {5, 5, 5}, 2350, 4650, 24, 17, false, "҈", 0, new MaterialStack[]{new MaterialStack(getInstance().LEAD, 15), new MaterialStack(getInstance().TUNGSTEN, 25), new MaterialStack(getInstance().CARBON, 60)});//Not a GT Inherited Material
+		public static final Material WHITE_METAL = new Material("White Metal", MaterialState.SOLID, TextureSet.SET_METALLIC, new short[] {255, 255, 255}, 4560, 7580, 35, 41, false, "҉", 0, new MaterialStack[]{new MaterialStack(getInstance().COPPER, 5), new MaterialStack(getInstance().ANTIMONY, 10), new MaterialStack(getInstance().PLATINUM, 10), new MaterialStack(getInstance().TIN, 75)});//Not a GT Inherited Material
+		public static final Material GRANITE = new Material("Ancient Granite", MaterialState.SOLID, TextureSet.SET_SAND, new short[] {107, 107, 107}, 500, 2000, 16, 12, false, "«»", 0, false);//Not a GT Inherited Material
+		public static final Material RUNITE = new Material("Runite", MaterialState.SOLID, TextureSet.SET_FINE, new short[] {60, 200, 190}, 6750, 11550, 73, 87, true, "§", 0);//Not a GT Inherited Material
+		public static final Material DRAGON_METAL = new Material("Dragonblood", MaterialState.SOLID, TextureSet.SET_SHINY, new short[] {220, 40, 20, 2}, 10160, 17850, 96, 105, true, "۞", 0);//Not a GT Inherited Material
 		
 	}
 
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 58a7f68afe..8fb3c5fc3b 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -141,7 +141,7 @@ public class Material {
 		this (materialName, defaultState, set, durability, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, true, true, inputs);
 	}	
 
-	public Material(final String materialName, final MaterialState defaultState, final TextureSet set, final long durability, short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, boolean generateCells, boolean generateFluid, final MaterialStack... inputs){
+	public Material(final String materialName, final MaterialState defaultState, final TextureSet set, final long durability, short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, String chemicalSymbol, final int radiationLevel, boolean generateCells, boolean generateFluid, final MaterialStack... inputs){
 
 		if (mMaterialMap.add(this)) {
 
@@ -442,6 +442,11 @@ public class Material {
 
 
 			//Makes a Fancy Chemical Tooltip
+			
+			if (chemicalSymbol == null) {
+				chemicalSymbol = "";
+			}
+			
 			this.vChemicalSymbol = chemicalSymbol;
 			if (this.vMaterialInput != null){
 				this.vChemicalFormula = this.getToolTip(chemicalSymbol, OrePrefixes.dust.mMaterialAmount / M, true);
diff --git a/src/Java/gtPlusPlus/core/material/NONMATERIAL.java b/src/Java/gtPlusPlus/core/material/NONMATERIAL.java
index 4da34ae16c..7ab72d50bc 100644
--- a/src/Java/gtPlusPlus/core/material/NONMATERIAL.java
+++ b/src/Java/gtPlusPlus/core/material/NONMATERIAL.java
@@ -27,7 +27,11 @@ public class NONMATERIAL {
 	//Wrought Iron
 	public static final Material WROUGHT_IRON = MaterialUtils.generateMaterialFromGtENUM(Materials.WroughtIron);
 
-	
+	//PTFE
+	public static final Material PTFE = MaterialUtils.generateMaterialFromGtENUM(MaterialUtils.getMaterial("Polytetrafluoroethylene", "Plastic"));
+
+	//Plastic
+	public static final Material PLASTIC = MaterialUtils.generateMaterialFromGtENUM(MaterialUtils.getMaterial("Plastic", "Rubber"));
 	
 	
 	static {