+ Added Trinium Titanium Cable/wires.

+ Redid material components to better use GT texture assets.
% Gave all 32 ore types new TextureSets.
% Doubled capacity of all fluid pipes.
% Moved Item/Block creation from init() to preInit().
$ Fixed Sludge fluid texture.
$ Moved Darkworld from being a child mod into it's own mod, Renamed to Toxic Everglades.
$ Bundled SegmentHelper.java, for future development ease.

20 files changed, 460 insertions, 315 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 099c89c47e..520cf83532 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -20,7 +20,6 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gtPlusPlus.api.analytics.SegmentAnalytics;
 import gtPlusPlus.api.analytics.SegmentHelper;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.commands.CommandMath;
 import gtPlusPlus.core.common.CommonProxy;
 import gtPlusPlus.core.config.ConfigHandler;
@@ -40,7 +39,6 @@ import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
 import gtPlusPlus.xmod.gregtech.loaders.GT_Material_Loader;
-import net.minecraft.item.Item;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraftforge.oredict.OreDictionary;
 
diff --git a/src/Java/gtPlusPlus/GTplusplus_Secondary.java b/src/Java/gtPlusPlus/GTplusplus_Secondary.java
index ae163191fd..bb9950af19 100644
--- a/src/Java/gtPlusPlus/GTplusplus_Secondary.java
+++ b/src/Java/gtPlusPlus/GTplusplus_Secondary.java
@@ -1,18 +1,17 @@
 package gtPlusPlus;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.io.File;
 
-import cofh.mod.ChildMod;
 import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.CustomProperty;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.event.*;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_Config;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.CORE.*;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.material.ORES;
 import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
@@ -26,15 +25,12 @@ import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.config.Configuration;
 
 @MCVersion(value = "1.7.10")
-@ChildMod(parent = CORE.MODID, mod = @Mod(modid = "GT++DarkWorld",
-name = "GT++ Dark World",
-version = CORE.VERSION,
-dependencies = "after:Miscutils;after:Gregtech",
-customProperties = @CustomProperty(k = "cofhversion", v = "true")))
-public class GTplusplus_Secondary {
+@Mod(modid = Everglades.MODID, name = Everglades.NAME, version = Everglades.VERSION, dependencies = "required-after:Forge; after:dreamcraft; after:IC2; after:ihl; required-after:gregtech; required-after:miscutils;")
+public class GTplusplus_Secondary implements ActionListener {
 
-	public static final String MODID2 = "GT++ Dark World";
-	public static final String VERSION2 = "0.1";
+	//Mod Instance
+	@Mod.Instance(Everglades.MODID)
+	public static GTplusplus_Secondary instance;
 
 	// Dark World Handler
 	protected static volatile Biome_DarkWorld DarkWorld_Biome;
@@ -44,7 +40,7 @@ public class GTplusplus_Secondary {
 	// Pre-Init
 	@Mod.EventHandler
 	public void preInit(final FMLPreInitializationEvent event) {
-		Logger.INFO("Loading " + MODID2 + " V" + VERSION2);
+		Logger.INFO("Loading " + Everglades.MODID + " V" + Everglades.VERSION);
 
 		//Setup
 		setVars(event);
@@ -53,8 +49,8 @@ public class GTplusplus_Secondary {
 		DarkWorld_Dimension = new Dimension_DarkWorld();
 		
 		// Load Dark World
-		getDarkBiome().instance = GTplusplus.instance;
-		DarkWorld_Dimension.instance = GTplusplus.instance;
+		getDarkBiome().instance = instance;
+		DarkWorld_Dimension.instance = instance;
 		getDarkBiome().preInit(event);
 		DarkWorld_Dimension.preInit(event);
 		
@@ -65,26 +61,22 @@ public class GTplusplus_Secondary {
 
 	@EventHandler
 	public void load(final FMLInitializationEvent e) {
-		Logger.INFO("Begin resource allocation for " + MODID2 + " V" + VERSION2);
+		Logger.INFO("Begin resource allocation for " + Everglades.MODID + " V" +Everglades.VERSION);
 		
 		//Load Dark World and Biome
-		//GameRegistry.registerFuelHandler(this);
-		GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), 50);
+		GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), Short.MAX_VALUE);
 		getDarkBiome().load();
 		DarkWorld_Dimension.load();
 
 	}
 	
 	public static void GenerateOreMaterials() {
-		//Lot 1
 		MaterialGenerator.generateOreMaterial(ORES.CROCROITE);
 		MaterialGenerator.generateOreMaterial(ORES.GEIKIELITE);
 		MaterialGenerator.generateOreMaterial(ORES.NICHROMITE);
 		MaterialGenerator.generateOreMaterial(ORES.TITANITE);
 		MaterialGenerator.generateOreMaterial(ORES.ZIMBABWEITE);
 		MaterialGenerator.generateOreMaterial(ORES.ZIRCONILITE);
-
-		//Lot 2
 		MaterialGenerator.generateOreMaterial(ORES.GADOLINITE_CE);
 		MaterialGenerator.generateOreMaterial(ORES.GADOLINITE_Y);
 		MaterialGenerator.generateOreMaterial(ORES.LEPERSONNITE);
@@ -95,8 +87,6 @@ public class GTplusplus_Secondary {
 		MaterialGenerator.generateOreMaterial(ORES.YTTRIALITE);
 		MaterialGenerator.generateOreMaterial(ORES.YTTROCERITE);
 		MaterialGenerator.generateOreMaterial(ORES.ZIRCON);
-		
-		//Lot 3
 		MaterialGenerator.generateOreMaterial(ORES.POLYCRASE);
 		MaterialGenerator.generateOreMaterial(ORES.ZIRCOPHYLLITE);
 		MaterialGenerator.generateOreMaterial(ORES.ZIRKELITE);
@@ -111,8 +101,7 @@ public class GTplusplus_Secondary {
 		MaterialGenerator.generateOreMaterial(ORES.CERITE);
 		MaterialGenerator.generateOreMaterial(ORES.FLUORCAPHITE);
 		MaterialGenerator.generateOreMaterial(ORES.FLORENCITE);
-		MaterialGenerator.generateOreMaterial(ORES.CRYOLITE);
-		
+		MaterialGenerator.generateOreMaterial(ORES.CRYOLITE);		
 	}
 
 	void setVars(FMLPreInitializationEvent event){
@@ -127,13 +116,12 @@ public class GTplusplus_Secondary {
 		 * Set World Generation Values
 		 */
 		WorldGen_Ores.generateValidOreVeins();
-		WorldGen_GT_Base.oreveinPercentage = 75;
-		WorldGen_GT_Base.oreveinAttempts = 64;
-		WorldGen_GT_Base.oreveinMaxPlacementAttempts = 8;	
+		WorldGen_GT_Base.oreveinPercentage = 64;
+		WorldGen_GT_Base.oreveinAttempts = 32;
+		WorldGen_GT_Base.oreveinMaxPlacementAttempts = 6;	
 		if (CORE.DEBUG || CORE.DEVENV){
 			WorldGen_GT_Base.debugWorldGen = true;
-		}
-		
+		}		
 		DarkWorldContentLoader.run();
 	}
 
@@ -173,7 +161,7 @@ public class GTplusplus_Secondary {
 
 	@EventHandler
 	public static void postInit(final FMLPostInitializationEvent e) {
-		Logger.INFO("Finished loading Dark World plugin for GT++.");
+		Logger.INFO("Finished loading Toxic Everglades plugin for GT++.");
 	}
 
 	public static synchronized Biome_DarkWorld getDarkBiome() {
@@ -184,4 +172,10 @@ public class GTplusplus_Secondary {
 		DarkWorld_Biome = darkWorld_Biome;
 	}
 
+	@Override
+	public void actionPerformed(ActionEvent arg0) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/api/analytics/SegmentHelper.java b/src/Java/gtPlusPlus/api/analytics/SegmentHelper.java
new file mode 100644
index 0000000000..6e264fe1d2
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/analytics/SegmentHelper.java
@@ -0,0 +1,81 @@
+package gtPlusPlus.api.analytics;
+
+import com.segment.analytics.Analytics;
+import com.segment.analytics.Callback;
+import com.segment.analytics.messages.Message;
+import com.segment.analytics.messages.TrackMessage;
+import com.segment.analytics.messages.*;
+import java.util.Map;
+ 
+public class SegmentHelper implements Callback {
+	
+	/**
+	 * Credits to Author: FLAMINSAGANAKI/Theodore Mavrakis
+	 * http://domisydev.com/2015/11/05/using-segment-analytics-in-your-java-servlet/
+	 */	
+	
+    private static final String writeKey = "EDOWl9peleGlUqe1ZwTqKDyuTMFhyT4k";
+    private static volatile SegmentHelper segment = new SegmentHelper();
+    private Analytics analytics;
+ 
+    public SegmentHelper(){
+        try{
+            this.analytics = Analytics.builder(writeKey).callback(this).build();
+        }catch(Exception e){
+            SegmentAnalytics.LOG("exception while creating Analytics : " + e);
+        }
+    }
+ 
+    public static SegmentHelper getInstance(){
+        return segment;
+    }
+  
+    public Analytics getAnalyticsClient(){
+        return segment.analytics;
+    }
+ 
+    public void success(Message message) {
+        SegmentAnalytics.LOG("Successfully uploaded " + message);
+    }
+ 
+    public void failure(Message message, Throwable throwable) {
+        SegmentAnalytics.LOG("Could not upload " + message);
+    }
+ 
+    public void addUser(String user_id, Map<String, Object> properties) {
+        try {
+            this.analytics.enqueue(IdentifyMessage.builder().userId(user_id).traits(properties));
+            //trackUser(user_id, "Logged In", properties);
+        } catch (Exception e) {
+            SegmentAnalytics.LOG("Exception in addUser() - " + e);
+        }
+    }
+ 
+    public void trackUser(String user_id, String description, Map<String, Object> properties) {
+        try {
+            this.analytics.enqueue(TrackMessage.builder(description).userId(user_id).properties(properties));
+        } catch (Exception e) {
+           SegmentAnalytics.LOG("Exception in trackUser() - " + e);
+        }
+    }
+    
+    public void trackUser(String user_id, String description) {
+        try {
+            this.analytics.enqueue(TrackMessage.builder(description).userId(user_id));
+        } catch (Exception e) {
+           SegmentAnalytics.LOG("Exception in trackUser() - " + e);
+        }
+    }
+ 
+    public void groupUser(String group_id, String user_id) {
+        try {
+            this.analytics.enqueue(GroupMessage.builder(group_id).userId(user_id));
+        } catch (Exception e) {
+            SegmentAnalytics.LOG("Exception in groupUser() - " + e);
+        }
+    }
+ 
+    public static void main(String[] args){
+ 
+    }
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/api/objects/Logger.java b/src/Java/gtPlusPlus/api/objects/Logger.java
index 016dcb4c9b..6e2e9f6107 100644
--- a/src/Java/gtPlusPlus/api/objects/Logger.java
+++ b/src/Java/gtPlusPlus/api/objects/Logger.java
@@ -8,6 +8,10 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.proxy.ClientProxy;
 
 public class Logger {
+	
+	public Logger(String string) {
+		
+	}
 
 	// Logging Functions
 	public static final org.apache.logging.log4j.Logger modLogger = Logger.makeLogger();
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 532da59515..191f81cef5 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -73,6 +73,12 @@ public class CommonProxy {
 		registerTileEntities();
 		Logger.INFO("[Proxy] Calling Render registrator.");
 		registerRenderThings();
+		
+		//Moved from Init after Debug Loading.
+		//29/01/18 - Alkalus
+		ModItems.init();
+		ModBlocks.init();
+		CI.Init();
 
 
 	}
@@ -82,9 +88,6 @@ public class CommonProxy {
 		if (CORE.DEBUG){
 			DEBUG_INIT.registerHandlers();
 		}
-		ModItems.init();
-		ModBlocks.init();
-		CI.Init();
 
 		/**
 		 * Register the Event Handlers.
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 97cf3310ea..98043d9775 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -274,7 +274,7 @@ public final class ModItems {
 
 	public static Item itemRope;
 	public static Item itemFiber;
-	
+
 	public static Item itemDragonJar;
 
 	public static final void init(){
@@ -346,27 +346,27 @@ public final class ModItems {
 
 
 		try{
-			
+
 			/**
 			 * Try generate dusts for missing rare earth materials if they don't exist
 			 */
 
 			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGadolinium", 1) == null){
-		    	ItemUtils.generateSpecialUseDusts("Gadolinium", "Gadolinium", Materials.Gadolinium.mElement.name(), Utils.rgbtoHexValue(226, 172, 9));
+				ItemUtils.generateSpecialUseDusts("Gadolinium", "Gadolinium", Materials.Gadolinium.mElement.name(), Utils.rgbtoHexValue(226, 172, 9));
 			}
 			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustYtterbium", 1) == null){
-		    	ItemUtils.generateSpecialUseDusts("Ytterbium", "Ytterbium", Materials.Ytterbium.mElement.name(), Utils.rgbtoHexValue(Materials.Yttrium.mRGBa[0]-60, Materials.Yttrium.mRGBa[1]-60, Materials.Yttrium.mRGBa[2]-60));
+				ItemUtils.generateSpecialUseDusts("Ytterbium", "Ytterbium", Materials.Ytterbium.mElement.name(), Utils.rgbtoHexValue(Materials.Yttrium.mRGBa[0]-60, Materials.Yttrium.mRGBa[1]-60, Materials.Yttrium.mRGBa[2]-60));
 			}
 			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustSamarium", 1) == null){
-		    	ItemUtils.generateSpecialUseDusts("Samarium", "Samarium", Materials.Samarium.mElement.name(), Utils.rgbtoHexValue(161, 168, 114));
+				ItemUtils.generateSpecialUseDusts("Samarium", "Samarium", Materials.Samarium.mElement.name(), Utils.rgbtoHexValue(161, 168, 114));
 			}
 			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLanthanum", 1) == null){
-		    	ItemUtils.generateSpecialUseDusts("Lanthanum", "Lanthanum", Materials.Lanthanum.mElement.name(), Utils.rgbtoHexValue(106, 127, 163));
+				ItemUtils.generateSpecialUseDusts("Lanthanum", "Lanthanum", Materials.Lanthanum.mElement.name(), Utils.rgbtoHexValue(106, 127, 163));
 			}
 			/*if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGadolinium", 1) == null){
 		    	ItemUtils.generateSpecialUseDusts("Gadolinium", "Gadolinium", "", Utils.rgbtoHexValue(Materials.Gadolinium.mRGBa[0], Materials.Gadolinium.mRGBa[1], Materials.Gadolinium.mRGBa[2]));
 			}*/
-			
+
 
 			//Elements generate first so they can be used in compounds.
 			//Missing Elements
@@ -513,16 +513,18 @@ public final class ModItems {
 			MaterialGenerator.generate(ALLOY.HG1223, false, false);
 
 			//Generate Fictional Materials
-			MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM, false);
-			MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM_REFINED, false);
+			if (!CORE.GTNH) {
+				MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM, false);
+				MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM_REFINED, false);
+			}
 			MaterialGenerator.generate(ALLOY.TRINIUM_TITANIUM);
 			MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH, false);
 			MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH_CARBON);			
 
 			//Must be the final Alloy to Generate
 			MaterialGenerator.generate(ALLOY.QUANTUM);
-			
-			
+
+
 			//Ores
 			MaterialGenerator.generateOreMaterial(FLUORIDES.FLUORITE);
 			GTplusplus_Secondary.GenerateOreMaterials();
@@ -692,7 +694,7 @@ public final class ModItems {
 		itemLavaFilter = new ItemLavaFilter();
 
 		itemGrindleTablet = new BaseItemGrindle();
-		
+
 		itemDragonJar = new ItemEntityCatcher();
 
 		//Chemistry
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 235d50ae36..4e22fb959b 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -3,6 +3,9 @@ package gtPlusPlus.core.item.base;
 import java.util.List;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.TextureSet;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
@@ -10,13 +13,16 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.entity.EntityUtils;
+import gtPlusPlus.core.util.input.KeyboardUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 public class BaseItemComponent extends Item{
@@ -28,6 +34,9 @@ public class BaseItemComponent extends Item{
 	public final int componentColour;
 	public Object extraData;
 
+	protected IIcon base;
+	protected IIcon overlay;
+
 	public BaseItemComponent(final Material material, final ComponentTypes componentType) {
 		this.componentMaterial = material;
 		this.unlocalName = "item"+componentType.COMPONENT_NAME+material.getUnlocalizedName();
@@ -36,7 +45,7 @@ public class BaseItemComponent extends Item{
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
 		this.setUnlocalizedName(this.unlocalName);
 		this.setMaxStackSize(64);
-		this.setTextureName(this.getCorrectTextures());
+		//this.setTextureName(this.getCorrectTextures());
 		this.componentColour = material.getRgbAsHex();
 		GameRegistry.registerItem(this, this.unlocalName);
 		GT_OreDictUnificator.registerOre(componentType.getOreDictName()+material.getUnlocalizedName(), ItemUtils.getSimpleStack(this));
@@ -62,46 +71,19 @@ public class BaseItemComponent extends Item{
 		if (!CORE.ConfigSwitches.useGregtechTextures){
 			return CORE.MODID + ":" + "item"+this.componentType.COMPONENT_NAME;
 		}
-		if (this.componentType == ComponentTypes.GEAR){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "gearGt";
-		}
-		else if (this.componentType == ComponentTypes.SMALLGEAR){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "gearGtSmall";
-		}
-		else if (this.componentType == ComponentTypes.ROD){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "stick";
-		}
-		else if (this.componentType == ComponentTypes.RODLONG){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "stickLong";
-		}
-		else if (this.componentType == ComponentTypes.PLATEDOUBLE){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "plateDouble";
-		}
-		else if (this.componentType == ComponentTypes.CELL){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "cell";
-		}
-		else if (this.componentType == ComponentTypes.PLASMACELL){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "cellPlasma";
-		}
-		else if (this.componentType == ComponentTypes.BOLT){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "bolt";
-		}
-		else if (this.componentType == ComponentTypes.RING){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "ring";
-		}
-		else if (this.componentType == ComponentTypes.ROTOR){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "rotor";
-		}
-		else if (this.componentType == ComponentTypes.SCREW){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "screw";
-		}
-		else if (this.componentType == ComponentTypes.INGOT){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "ingot";
-		}
-		else if (this.componentType == ComponentTypes.HOTINGOT){
-			return "gregtech" + ":" + "materialicons/METALLIC/" + "ingotHot";
-		}
-		return "gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME.toLowerCase();
+		String metType = "9j4852jyo3rjmh3owlhw9oe"; 
+		if (this.componentMaterial != null) {
+			TextureSet u = this.componentMaterial.getTextureSet();
+			if (u != null) {
+				metType = u.mSetName;				
+			}
+		}		
+		metType = (metType.equals("9j4852jyo3rjmh3owlhw9oe") ? "METALLIC" : metType);		
+		return "gregtech" + ":" + "materialicons/"+metType+"/" + this.componentType.getOreDictName();
+
+
+
+		//return "gregtech" + ":" + "materialicons/"+metType+"/" + this.componentType.COMPONENT_NAME.toLowerCase();
 	}
 
 	@Override
@@ -128,42 +110,6 @@ public class BaseItemComponent extends Item{
 		if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("") && (this.componentMaterial != null)){
 
 
-			if (this.componentType == ComponentTypes.DUST){
-				//list.add(EnumChatFormatting.GRAY+"A pile of " + materialName + " dust.");
-			}
-			if (this.componentType == ComponentTypes.INGOT){
-				//list.add(EnumChatFormatting.GRAY+"A solid ingot of " + materialName + ".");
-				if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("") && this.unlocalName.toLowerCase().contains("ingothot")){
-					list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.RED+"Very hot! "+EnumChatFormatting.GRAY+" Avoid direct handling..");
-				}
-			}
-			if (this.componentType == ComponentTypes.PLATE){
-				//list.add(EnumChatFormatting.GRAY+"A flat plate of " + materialName + ".");
-			}
-			if (this.componentType == ComponentTypes.PLATEDOUBLE){
-				//list.add(EnumChatFormatting.GRAY+"A double plate of " + materialName + ".");
-			}
-			if (this.componentType == ComponentTypes.ROD){
-				//list.add(EnumChatFormatting.GRAY+"A 40cm Rod of " + materialName + ".");
-			}
-			if (this.componentType == ComponentTypes.RODLONG){
-				//list.add(EnumChatFormatting.GRAY+"A 80cm Rod of " + materialName + ".");
-			}
-			if (this.componentType == ComponentTypes.ROTOR){
-				//list.add(EnumChatFormatting.GRAY+"A Rotor made out of " + materialName + ". ");
-			}
-			if (this.componentType == ComponentTypes.BOLT){
-				//list.add(EnumChatFormatting.GRAY+"A small Bolt, constructed from " + materialName + ".");
-			}
-			if (this.componentType == ComponentTypes.SCREW){
-				//list.add(EnumChatFormatting.GRAY+"A 8mm Screw, fabricated out of some " + materialName + ".");
-			}
-			if (this.componentType == ComponentTypes.GEAR){
-				//list.add(EnumChatFormatting.GRAY+"A large Gear, constructed from " + materialName + ".");
-			}
-			if (this.componentType == ComponentTypes.RING){
-				//list.add(EnumChatFormatting.GRAY+"A " + materialName + " Ring.");
-			}
 			if (this.componentMaterial != null){
 				if (!this.componentMaterial.vChemicalFormula.equals("??") && !this.componentMaterial.vChemicalFormula.equals("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
 					list.add(Utils.sanitizeStringKeepBrackets(this.componentMaterial.vChemicalFormula));
@@ -172,19 +118,33 @@ public class BaseItemComponent extends Item{
 				if (this.componentMaterial.isRadioactive){
 					list.add(CORE.GT_Tooltip_Radioactive);
 				}
+
+				if (this.componentType == ComponentTypes.INGOT){
+					if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("") && this.unlocalName.toLowerCase().contains("ingothot")){
+						list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.RED+"Very hot! "+EnumChatFormatting.GRAY+" Avoid direct handling..");
+					}
+				}
+			}
+
+			//Hidden Tooltip
+			if (KeyboardUtils.isCtrlKeyDown()) {
+				if (this.componentMaterial != null) {
+					String type = this.componentMaterial.getTextureSet().mSetName;
+					String output = type.substring(0, 1).toUpperCase() + type.substring(1);
+					list.add(EnumChatFormatting.GRAY+"Material Type: "+output+".");
+					list.add(EnumChatFormatting.GRAY+"Material State: "+this.componentMaterial.getState().name()+".");
+					list.add(EnumChatFormatting.GRAY+"Radioactivity Level: "+this.componentMaterial.vRadiationLevel+".");
+				}
 			}
+			else {
+				list.add(EnumChatFormatting.DARK_GRAY+"Hold Ctrl to show additional info.");				
+			}			
 
 		}
 
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
-
-	@Override
-	public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) {
-		return this.componentColour;
-	}
-
 	@Override
 	public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) {
 		if (this.componentMaterial != null){
@@ -197,8 +157,52 @@ public class BaseItemComponent extends Item{
 	}
 
 
+	/**
+	 * 
+	 * Handle Custom Rendering
+	 *
+	 */
 
+	@Override
+	@SideOnly(Side.CLIENT)
+	public boolean requiresMultipleRenderPasses(){
+		return (CORE.ConfigSwitches.useGregtechTextures ? true : false);
+	}
 
+	@Override
+	public int getColorFromItemStack(final ItemStack stack, final int renderPass) {
+		if (renderPass == 0 && !CORE.ConfigSwitches.useGregtechTextures){
+			return Utils.rgbtoHexValue(255, 255, 255);
+		}
+		if (renderPass == 1 && CORE.ConfigSwitches.useGregtechTextures){
+			return Utils.rgbtoHexValue(255, 255, 255);
+		}
+		return this.componentColour;
+	}
+
+	@Override
+	public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
+		if (CORE.ConfigSwitches.useGregtechTextures) {
+			if(pass == 0) {
+				return this.base;
+			}
+			return this.overlay;			
+		}
+		return this.base;
+	}
+
+	@Override
+	public void registerIcons(final IIconRegister i) {
+
+		if (CORE.ConfigSwitches.useGregtechTextures){
+			this.base = i.registerIcon(getCorrectTextures());
+			this.overlay = i.registerIcon(getCorrectTextures() + "_OVERLAY");
+		}
+		else {
+			this.base = i.registerIcon(getCorrectTextures());
+			//this.overlay = i.registerIcon(getCorrectTextures() + "_OVERLAY");
+		}
+	}
 
 
 
@@ -211,7 +215,7 @@ public class BaseItemComponent extends Item{
 		PLATEDOUBLE("PlateDouble", " Double Plate", "plateDouble"),
 		ROD("Rod", " Rod", "stick"),
 		RODLONG("RodLong", " Long Rod", "stickLong"),
-		GEAR("Gear", " Gear", "gear"),
+		GEAR("Gear", " Gear", "gearGt"),
 		SMALLGEAR("SmallGear", " Gear", "gearGtSmall"), //TODO
 		SCREW("Screw", " Screw", "screw"),
 		BOLT("Bolt", " Bolt", "bolt"),
diff --git a/src/Java/gtPlusPlus/core/item/base/CoreItem.java b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
index 8baf909af7..3b0fa7b621 100644
--- a/src/Java/gtPlusPlus/core/item/base/CoreItem.java
+++ b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
@@ -155,7 +155,7 @@ public class CoreItem extends Item
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-		list.add(this.descColour+this.itemDescription);
+		//list.add(this.descColour+this.itemDescription);
 		//super.addInformation(stack, aPlayer, list, bool);
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
index f2228afb78..275e7bbb3a 100644
--- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
+++ b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
@@ -17,8 +17,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 
 public class BaseItemCell extends BaseItemComponent{
 
-	private IIcon base;
-	private IIcon overlay;
 	ComponentTypes Cell = ComponentTypes.CELL;
 
 	public BaseItemCell(final Material material) {
@@ -40,12 +38,6 @@ public class BaseItemCell extends BaseItemComponent{
 	}
 
 	@Override
-	@SideOnly(Side.CLIENT)
-	public boolean requiresMultipleRenderPasses(){
-		return true;
-	}
-
-	@Override
 	public void registerIcons(final IIconRegister i) {
 
 		if (CORE.ConfigSwitches.useGregtechTextures){
@@ -73,13 +65,4 @@ public class BaseItemCell extends BaseItemComponent{
 		return this.componentColour;
 	}
 
-
-	@Override
-	public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
-		if(pass == 0) {
-			return this.base;
-		}
-		return this.overlay;
-	}
-
 }
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index a681baaa98..d81e6fd280 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -76,146 +76,152 @@ public class CORE {
 	public static boolean BRC = false;
 
 
-	
+
 	/**
 	 * Lists/Maps
 	 */
 
-	 //Burnables List
-	 public static List<Pair<Integer, ItemStack>> burnables = new ArrayList<Pair<Integer, ItemStack>>();
+	//Burnables List
+	public static List<Pair<Integer, ItemStack>> burnables = new ArrayList<Pair<Integer, ItemStack>>();
+
+
+	//TesseractMapss
+	public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> sTesseractGeneratorOwnershipMap = new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>();
+	public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> sTesseractTerminalOwnershipMap = new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>();
 
+	//BookMap
+	public static final Map<String, ItemStack> sBookList = new ConcurrentHashMap<String, ItemStack>();
 
-	 //TesseractMapss
-	 public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> sTesseractGeneratorOwnershipMap = new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>();
-	 public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> sTesseractTerminalOwnershipMap = new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>();
 
-	 //BookMap
-	 public static final Map<String, ItemStack> sBookList = new ConcurrentHashMap<String, ItemStack>();
 
 
-	 
-	 
 	/**
 	 * Some Gregtech Material and Recipe Variables
 	 */
-	 
-	 @Deprecated
-	 public static IGregtech_RecipeAdder sRecipeAdder;
-	 public static GregtechRecipe GT_Recipe = new GregtechRecipe();
-	 public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000];
-
-	 /**
-	  * File Paths and Resource Paths
-	  */
-
-	 public static final String
-	 TEX_DIR = "textures/",
-	 TEX_DIR_GUI = TEX_DIR + "gui/",
-	 TEX_DIR_ITEM = TEX_DIR + "items/",
-	 TEX_DIR_BLOCK = TEX_DIR + "blocks/",
-	 TEX_DIR_ENTITY = TEX_DIR + "entity/",
-	 TEX_DIR_ASPECTS = TEX_DIR + "aspects/",
-	 TEX_DIR_FLUIDS = TEX_DIR_BLOCK + "fluids/",
-	 RES_PATH = MODID + ":" + TEX_DIR,
-	 RES_PATH_GUI = MODID + ":" + TEX_DIR_GUI,
-	 RES_PATH_ITEM = MODID + ":" + TEX_DIR_ITEM,
-	 RES_PATH_BLOCK = MODID + ":" + TEX_DIR_BLOCK,
-	 RES_PATH_ENTITY = MODID + ":" + TEX_DIR_ENTITY,
-	 RES_PATH_ASPECTS = MODID + ":" + TEX_DIR_ASPECTS,
-	 RES_PATH_FLUIDS = MODID + ":" + TEX_DIR_FLUIDS;