Buildable

19 files changed, 606 insertions, 769 deletions

diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java
index 1a3ed25e6c..fa14abf03d 100644
--- a/src/main/java/gregtech/common/GT_Client.java
+++ b/src/main/java/gregtech/common/GT_Client.java
@@ -292,7 +292,7 @@ public class GT_Client extends GT_Proxy
                 afterSomeTime=0;
                 StatFileWriter sfw= Minecraft.getMinecraft().thePlayer.getStatFileWriter();
                 try {
-                    for(GT_Recipe recipe:GT_Recipe.GT_Recipe_Map.sAssemblylineFakeRecipes.mRecipeList){
+                    for(GT_Recipe recipe:GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList){
                         recipe.mHidden=!sfw.hasAchievementUnlocked(GT_Mod.achievements.getAchievement(recipe.getOutput(0).getUnlocalizedName()));
                     }
                 }catch (Exception e){}
diff --git a/src/main/java/gregtech/common/GT_Pollution.java b/src/main/java/gregtech/common/GT_Pollution.java
index 39dc0c3b8f..5c7678e857 100644
--- a/src/main/java/gregtech/common/GT_Pollution.java
+++ b/src/main/java/gregtech/common/GT_Pollution.java
@@ -16,6 +16,7 @@ import net.minecraftforge.common.DimensionManager;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TreeMap;
 
 //import net.minecraft.entity.EntityLiving;
 
@@ -52,7 +53,7 @@ public class GT_Pollution {//TODO REWORK
 	 * LV (0%), MV (30%), HV (52%), EV (66%), IV (76%), LuV (84%), ZPM (89%), UV (92%), MAX (95%)
 	 */
 
-	static TreeMap<Integer,List<ChunkPosition>> tList = null;
+	static List<ChunkPosition> tList = null;
 	static int loops = 1;
 	static XSTR tRan = new XSTR();
 
@@ -60,8 +61,8 @@ public class GT_Pollution {//TODO REWORK
 		if(!GT_Mod.gregtechproxy.mPollution) return;
 		int aWorldID=aWorld.provider.dimensionId;
 		if(aTick == 0 || (tList==null && GT_Proxy.chunkData!=null)){
-			tList = new TreeMap<>();
-			tList.put(aWorld,new ArrayList<ChunkPosition>(GT_Proxy.chunkData.keySet()));
+			//---tList = new TreeMap<>();
+			//---tList.put(aWorld,new ArrayList<ChunkPosition>(GT_Proxy.chunkData.keySet()));
 			loops = (tList.size()/1200) + 1;
 			//System.out.println("new Pollution loop"+aTick);
 		}
@@ -83,8 +84,8 @@ public class GT_Pollution {//TODO REWORK
 					tNeighbor.add(new ChunkPosition(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ+1));
 					tNeighbor.add(new ChunkPosition(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ-1));
 					for(ChunkPosition tNPos : tNeighbor){
-						if(!GT_Proxy.chunkData.containsKey(tNPos))
-							GT_Utility.undergroundOil(aWorld,tNPos.chunkPosX,tNPos.chunkPosZ,false,0);
+						//---if(!GT_Proxy.chunkData.containsKey(tNPos))
+						//---	GT_Utility.undergroundOil(aWorld,tNPos.chunkPosX,tNPos.chunkPosZ,false,0);
 						
 						//if(GT_Proxy.chunkData.containsKey(tNPos)){
 							int tNPol = GT_Proxy.chunkData.get(tNPos)[1];
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 2a71740231..07c1ea9fce 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -656,12 +656,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
                             'R', OrePrefixes.ring.get(Materials.Steel)});
                     GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L), tBits, new Object[]{"XSX", "XSX",
                             "ShS", 'X', OrePrefixes.plate.get(aMaterial), 'S', OrePrefixes.plate.get(Materials.Steel)});
-                    switch (aMaterial) {
-                        case Wood:
+                    switch (aMaterial.mName) {
+                        case "Wood":
                             GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), tBits, new Object[]{"P ", " s",
                                     'P', OrePrefixes.plank.get(aMaterial)});
                             break;
-                        case Stone:
+                        case "Stone":
                             GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), tBits, new Object[]{"P ", " f",
                                     'P', OrePrefixes.stoneSmooth});
                             break;
@@ -672,12 +672,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
                                     //TODO CHECK
 
                     }
-                    switch (aMaterial) {
-                        case Wood:
+                    switch (aMaterial.mName) {
+                        case "Wood":
                             GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), tBits, new Object[]{"SPS", "PsP", "SPS",
                                     'P', OrePrefixes.plank.get(aMaterial), 'S', OrePrefixes.stick.get(aMaterial)});
                             break;
-                        case Stone:
+                        case "Stone":
                             GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), tBits, new Object[]{"SPS", "PfP", "SPS",
                                     'P', OrePrefixes.stoneSmooth, 'S', new ItemStack(Blocks.stone_button, 1, 32767)});
                             break;
@@ -739,7 +739,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
                         new Object[]{"h", "X", 'X', OrePrefixes.gemFlawless.get(aMaterial)});
                 GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), tBits,
                         new Object[]{"h", "X", 'X', OrePrefixes.gemExquisite.get(aMaterial)});
-                if ((aMaterial.contains(SubTag.MORTAR_GRINDABLE)) && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.name(), true))) {
+                if ((aMaterial.contains(SubTag.MORTAR_GRINDABLE)) && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true))) {
                     GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), tBits,
                             new Object[]{"X", "m", 'X', OrePrefixes.gemChipped.get(aMaterial)});
                     GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L), tBits,
diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java
index 090f64c1c4..80b6be70c5 100644
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/src/main/java/gregtech/common/GT_RecipeAdder.java
@@ -896,7 +896,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
         	if(tItem==null)System.out.println("addAssemblinglineRecipe"+aResearchItem.getDisplayName());
         }
         GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{aResearchItem}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Writes Research result", new Object[0])}, null, null, aResearchTime, 30, 0);
-        GT_Recipe.GT_Recipe_Map.sAssemblylineFakeRecipes.addFakeRecipe(false, aInputs, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Reads Research result", new Object[0])}, aFluidInputs, null, aDuration, aEUt, 0,true);
+        GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.addFakeRecipe(false, aInputs, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Reads Research result", new Object[0])}, aFluidInputs, null, aDuration, aEUt, 0,true);
         GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe_AssemblyLine( aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt));
         return true;
 	}
diff --git a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
index 6d2df102f8..8d762a0d02 100644
--- a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
+++ b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
@@ -42,7 +42,7 @@ public class GT_Worldgen_GT_Ore_Layer
     //public final boolean mAsteroid;

     public final String aTextWorldgen = "worldgen.";

 

-    public GT_Worldgen_GT_Ore_Layer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity, int aSize, boolean aOverworld, boolean aNether, boolean aEnd, Materials aPrimary, Materials aSecondary, Materials aBetween, Materials aSporadic) {

+    public GT_Worldgen_GT_Ore_Layer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity, int aSize, boolean aOverworld, boolean aNether, boolean aEnd, boolean GC_UNUSED1, boolean GC_UNUSED2, boolean GC_UNUSED3,  Materials aPrimary, Materials aSecondary, Materials aBetween, Materials aSporadic) {

         super(aName, sList, aDefault);

         this.mOverworld = GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld);

         this.mNether = GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Nether", aNether);

diff --git a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java
index 5b0d4d61f5..6a8cd49b6f 100644
--- a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java
+++ b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java
@@ -25,8 +25,8 @@ public class GT_Worldgen_GT_Ore_SmallPieces
 
     public final String mBiome;
     public final String aTextWorldgen = "worldgen.";
-
-    public GT_Worldgen_GT_Ore_SmallPieces(String aName, boolean aDefault, int aMinY, int aMaxY, int aAmount, boolean aOverworld, boolean aNether, boolean aEnd, Materials aPrimary) {
+    //TODO CHECk IF INSTANTIATION IS CORRECT
+    public GT_Worldgen_GT_Ore_SmallPieces(String aName, boolean aDefault, int aMinY, int aMaxY, int aAmount, boolean aOverworld, boolean aNether, boolean aEnd, boolean GC_UNUSED1, boolean GC_UNUSED2, boolean GC_UNUSED3, Materials aPrimary) {
         super(aName, GregTech_API.sWorldgenList, aDefault);
         this.mOverworld = GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld);
         this.mNether = GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Nether", aNether);
diff --git a/src/main/java/gregtech/common/items/armor/ArmorData.java b/src/main/java/gregtech/common/items/armor/ArmorData.java
index 9a2b161a0f..00ec76aeea 100644
--- a/src/main/java/gregtech/common/items/armor/ArmorData.java
+++ b/src/main/java/gregtech/common/items/armor/ArmorData.java
@@ -1,344 +1,426 @@
-package gregtech.common.items.armor.gui;
-
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Network;
-import gregtech.common.items.armor.ArmorData;
-import gregtech.common.items.armor.components.StatType;
+package gregtech.common.items.armor;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+import java.util.Random;
 
-import org.lwjgl.opengl.GL11;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.gui.inventory.GuiContainer;
+import gregtech.api.damagesources.GT_DamageSources;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.items.armor.components.ArmorComponent;
+import gregtech.common.items.armor.components.StatType;
+import gregtech.common.items.armor.gui.ContainerBasicArmor;
+import gregtech.common.items.armor.gui.ContainerModularArmor;
+import gregtech.common.items.armor.gui.InventoryArmor;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.DamageSource;
 import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidContainerItem;
 
-@SideOnly(Side.CLIENT)
-public class GuiElectricArmor1 extends GuiContainer {
-	ContainerModularArmor cont;
-	EntityPlayer player;
-	private int tab;
-	
-	public GuiElectricArmor1(ContainerModularArmor containerModularArmor, EntityPlayer aPlayer) {
-		super(containerModularArmor);
-		player = aPlayer;
-		cont = containerModularArmor;
-		tab = 0;
-	}
-	@Override
-	public void onGuiClosed() 
-	{
-		cont.saveInventory(player);
-		super.onGuiClosed();
-	};
-	public String seperateNumber(long number){
-		DecimalFormat formatter = (DecimalFormat) NumberFormat.getInstance(Locale.US);
-		DecimalFormatSymbols symbols = formatter.getDecimalFormatSymbols();
-		symbols.setGroupingSeparator(' ');
-		return formatter.format(number);
-	}
+public class ArmorData {
 
-	@Override
-	protected void drawGuiContainerForegroundLayer(int x, int y) {
-		int xStart = (width - xSize) / 2;
-		int yStart = (height - ySize) / 2;
-		int x2 = x - xStart;
-		int y2 = y - yStart;
-		drawTooltip(x2, y2 + 5);
-	}
+	public int type; // 0 = helmet; 1 = chestplate; 2 = leggings; 3 = boots;
+	public int armorTier; // 0 = Basic Modular Armor; 1 = Modular Exoskeleton; 2= Modular Nanosuit; 3 = Heavy Power Armor
+	public List info; // needs Localization
+	public boolean isTopItem;
+	public int tooltipUpdate;
+	public boolean openGui;
 
-	@Override
-	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
-		GL11.glColor4f(1F, 1F, 1F, 1F);
-		this.mc.getTextureManager().bindTexture(new ResourceLocation("gregtech", "textures/gui/armorgui3x4.png"));
-		int xStart = (width - xSize) / 2;
-		int yStart = (height - ySize) / 2;
-		//Draw background
-		drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize);
-		//Draw active arrows
-		drawTexturedModalRect(xStart + 10, yStart + 70, 219, 11, 14, 5);
-		//Draw active armor symbol
-		switch (cont.mInvArmor.data.type) {
-		case 0:
-			drawTexturedModalRect(xStart + 73, yStart + 68, 177, 10, 10, 9);
-			break;
-		case 1:
-			drawTexturedModalRect(xStart + 83, yStart + 68, 187, 10, 10, 9);
-			break;
-		case 2:
-			drawTexturedModalRect(xStart + 93, yStart + 68, 197, 10, 10, 9);
-			break;
-		case 3:
-			drawTexturedModalRect(xStart + 103, yStart + 68, 207, 10, 10, 9);
-			break;
-		default:
-			break;
+	public ArmorData helmet;
+	public ArmorData chestplate;
+	public ArmorData leggings;
+	public ArmorData boots;	
+
+	public Map<StatType,Float> mStat = new HashMap<StatType,Float>();
+	public Map<StatType,Boolean> mBStat = new HashMap<StatType,Boolean>();
+	static ArrayList<StatType> updateArmorStatTypeList;
+//	public boolean fullArmor;
+//	public boolean fullRadiationDef;
+//	public boolean fullElectricDef;
+//
+//	public float fallDef;
+//	public float physicalDef;
+//	public float projectileDef;
+//	public float fireDef;
+//	public float magicDef;
+//	public float explosionDef;
+//	public float radiationDef;
+//	public float electricDef;
+//	public float witherDef;
+//
+//	public float thorns;
+//	public float thornsSingle;
+//	public int magnet;
+//	public int magnetSingle;
+//
+//	public int partsCharge;
+	public int maxCharge;
+	public int charge;
+//	public boolean thaumicGoggles;
+//	public boolean nightVision;
+//	public boolean potionInjector;
+//	public boolean autoFeeder;
+
+	public FluidStack fluid;
+//	public int tankCap;
+//
+//	public int weight;
+	public float maxWeight;
+//	public int processingPower;
+//	public int processingPowerUsed;
+//	public int partProcessing;
+//	public int partProcessingUsed;
+//
+//	public int motorPower;
+//	public int motorEUusage;
+//	public int pistonJumpboost;
+//	public int pistonEUusage;
+//	public int electrolyzerProd;
+//	public int electrolyzerEUusage;
+//	public int fieldGenCap;
+//	public int fieldGenEUusage;
+//
+//	public int jetpackMaxWeight;
+//	public int antiGravMaxWeight;
+
+	public ArmorData(EntityPlayer player, ItemStack stack, int type, int tier) {
+		if(updateArmorStatTypeList == null)
+		{
+			updateArmorStatTypeList = new ArrayList<StatType>();
+			updateArmorStatTypeList.add(StatType.MAGNET);
+			updateArmorStatTypeList.add(StatType.THORNS);
+			updateArmorStatTypeList.add(StatType.PROCESSINGPOWER);
+			updateArmorStatTypeList.add(StatType.PROCESSINGPOWERUSED);
 		}
-		//Draw active tab
-		switch(tab){
+		this.type = type;
+		this.armorTier = tier;
+		ContainerModularArmor tmp = new ContainerBasicArmor((EntityPlayer) player, new InventoryArmor(ModularArmor_Item.class, stack));
+		calculateArmor(tmp.mInvArmor.parts);
+		switch (tier) {
 		case 0:
+			maxCharge = 0;
 			break;
 		case 1:
-			drawTexturedModalRect(xStart + 7, yStart + 14, 2, 167, 104, 54);
+			maxCharge = 250000;
 			break;
 		case 2:
-			drawTexturedModalRect(xStart + 7, yStart + 14, 107, 167, 104, 54);
-			break;
-		default:
-			break;
+			maxCharge = 1000000;
 		}
-		float tankCap = cont.mInvArmor.data.mStat.containsKey(StatType.TANKCAP) ? cont.mInvArmor.data.mStat.get(StatType.TANKCAP) :0.0f;
-		if(tankCap>0){
-			drawTexturedModalRect(xStart + 94, yStart + 32, 231, 69, 16, 34);
+		readNBT(stack.getTagCompound());
+	}
+
+	private void readNBT(NBTTagCompound nbt) {
+		if (nbt == null) {
+			return;
 		}
-		float weight = cont.mInvArmor.data.mStat.containsKey(StatType.WEIGHT) ? cont.mInvArmor.data.mStat.get(StatType.WEIGHT) : 0.0f;
-		int bar = (int) Math.floor(18 * (weight)/(float)1000);
-		drawTexturedModalRect(xStart + 15, yStart + 7, 217, 26, bar, 5);
-		drawTexturedModalRect(xStart + bar + 15, yStart + 7, 197+bar, 26, 18-bar, 5);
-		
-		if(tab==0){
-			//processing power bar
-			bar = Math.min((int) Math.floor(52 * ((float)cont.mInvArmor.data.mStat.get(StatType.PROCESSINGPOWERUSED)/(float)cont.mInvArmor.data.mStat.get(StatType.PROCESSINGPOWER))),52);
-			drawTexturedModalRect(xStart + 17, yStart + 17, 177, 146, bar, 5);
-			drawTexturedModalRect(xStart + bar + 17, yStart + 17, 177+bar, 139, 52-bar, 5);
-		}else if(tab==1){
-			
-		}else{
-			//Def tab values
-			if(cont.mInvArmor.data.mStat.get(StatType.PHYSICALDEFENCE)>0)drawTexturedModalRect(xStart + 30, yStart + 20, 186, 33, 7, 7);
-			drawBars(31, 20, cont.mInvArmor.data.mStat.get(StatType.PHYSICALDEFENCE));
-			if(cont.mInvArmor.data.mStat.get(StatType.PROJECTILEDEFENCE)>0)drawTexturedModalRect(xStart + 30, yStart + 29, 186, 42, 7, 7);
-			drawBars(31, 29, cont.mInvArmor.data.mStat.get(StatType.PROJECTILEDEFENCE));
-			if(cont.mInvArmor.data.mStat.get(StatType.FIREDEFENCE)>0)drawTexturedModalRect(xStart + 30, yStart + 38, 186, 51, 7, 7);
-			drawBars(31, 38, cont.mInvArmor.data.mStat.get(StatType.FIREDEFENCE));
-			if(cont.mInvArmor.data.mStat.get(StatType.MAGICDEFENCE)>0)drawTexturedModalRect(xStart + 30, yStart + 47, 186, 60, 7, 7);
-			drawBars(31, 47, cont.mInvArmor.data.mStat.get(StatType.MAGICDEFENCE));
-			if(cont.mInvArmor.data.mStat.get(StatType.EXPLOSIONDEFENCE)>0)drawTexturedModalRect(xStart + 30, yStart + 56, 186, 69, 7, 7);
-			drawBars(31, 56, cont.mInvArmor.data.mStat.get(StatType.EXPLOSIONDEFENCE));
-			if(cont.mInvArmor.data.mStat.get(StatType.RADIATIONDEFENCE)>0)drawTexturedModalRect(xStart + 61, yStart + 20, 186, 87, 7, 7);
-			drawBars(62, 20, cont.mInvArmor.data.mStat.get(StatType.RADIATIONDEFENCE));
-			if(cont.mInvArmor.data.mStat.get(StatType.ELECTRICALDEFENCE)>0)drawTexturedModalRect(xStart + 61, yStart + 29, 186, 96, 7, 7);
-			drawBars(62, 29, cont.mInvArmor.data.mStat.get(StatType.ELECTRICALDEFENCE));
-			if(cont.mInvArmor.data.mStat.get(StatType.WITHERDEFENCE)>0)drawTexturedModalRect(xStart + 61, yStart + 38, 186, 105, 7, 7);
-			drawBars(62, 38, cont.mInvArmor.data.mStat.get(StatType.WITHERDEFENCE));
-			if(cont.mInvArmor.data.mStat.get(StatType.FALLDEFENCE)>0)drawTexturedModalRect(xStart + 61, yStart + 47, 186, 114, 7, 7);
-			if(cont.mInvArmor.data.mStat.get(StatType.THORNS)>0)drawTexturedModalRect(xStart + 61, yStart + 56, 186, 123, 7, 7);
-			if(cont.mInvArmor.data.mStat.get(StatType.MAGNET)>0)drawTexturedModalRect(xStart + 70, yStart + 56, 186, 78, 7, 7);
+		if (nbt.hasKey("Charge")) {
+			this.charge = nbt.getInteger("Charge");
 		}
-		
-		
 	}
 
-	protected void mouseClicked(int mouseX, int mouseY, int mouseBtn) {
-		int xStart = mouseX-((width - xSize) / 2);
-		int yStart = mouseY-((height - ySize) / 2);
-		if(yStart>68&&yStart<77){
-			if(xStart>18&&xStart<26){
-				tab++;
-			}else if(xStart>8&&xStart<17){
-				tab--;
-			}
-			if(tab>2){tab=0;}
-			if(tab<0){tab=2;}
-			if(xStart>72&&xStart<112){
-				if(xStart>72&&xStart<81&&cont.mInvArmor.data.helmet!=null){cont.mInvArmor.data.helmet.openGui=true;}
-				if(xStart>82&&xStart<91&&cont.mInvArmor.data.chestplate!=null){cont.mInvArmor.data.chestplate.openGui=true;}
-				if(xStart>92&&xStart<101&&cont.mInvArmor.data.leggings!=null){cont.mInvArmor.data.leggings.openGui=true;}
-				if(xStart>102&&xStart<112&&cont.mInvArmor.data.boots!=null){cont.mInvArmor.data.boots.openGui=true;}
-				
-//				if(xStart>72&&xStart<81&&cont.mInvArmor.data.helmet!=null){cont.mInvArmor.data.helmet.openGui=true;player.closeScreen();}
-//				if(xStart>82&&xStart<91&&cont.mInvArmor.data.chestplate!=null){cont.mInvArmor.data.chestplate.openGui=true;player.closeScreen();}
-//				if(xStart>92&&xStart<101&&cont.mInvArmor.data.leggings!=null){cont.mInvArmor.data.leggings.openGui=true;player.closeScreen();}
-//				if(xStart>102&&xStart<112&&cont.mInvArmor.data.boots!=null){cont.mInvArmor.data.boots.openGui=true;player.closeScreen();}
-			}
+	public void writeToNBT(NBTTagCompound nbt) {
+		if (nbt == null) {
+			return;
 		}
-//		Slot slot = getSlotAtPosition(mouseX, mouseY);
-//		if (slot != null && slot instanceof SlotFluid && player != null && cont.mInvArmor.data.helmet!=null) {
-//			ItemStack tmp = player.inventory.getItemStack();
-//			//GT_Network gtn = new GT_Network();
-//			if (tmp == null) {
-//				//GT_Values.NW.sendToServer(new FluidSync(player.getCommandSenderName(), 0, "null"));				
-//			}
-//			//ArmorData armorData = new ArmorData(player,);
-//			if (tmp != null && tmp.getItem() instanceof IFluidContainerItem) {
-//				FluidStack tmp2 = ((IFluidContainerItem) tmp.getItem()).getFluid(tmp);
-//				if (!slot.getHasStack() && tmp2 != null) {
-//					slot.putStack(GT_Utility.getFluidDisplayStack(tmp2, true));					
-//					
-//					if(cont.mInvArmor.data.helmet.fluid == null)
-//					{
-//						cont.mInvArmor.data.helmet.fluid = new FluidStack(tmp2.getFluid(), tmp2.amount);
-//					}
-//					else
-//					{
-//						cont.mInvArmor.data.helmet.fluid.amount += tmp2.amount;
-//					}
-//					
-//					//GT_Values.NW.sendToServer(new FluidSync(player.getCommandSenderName(), tmp2.amount, GT_Utility.getFluidName(tmp2, false)));
-//					ItemStack tmp4 = GT_Utility.getContainerForFilledItem(tmp, true);					
-//					tmp4.stackSize = 1;
-//					if (tmp.stackSize > 1) {
-//						player.inventory.addItemStackToInventory(tmp4);
-//						tmp.stackSize--;
-//						player.inventory.setItemStack(tmp);
-//						//GT_Values.NW.sendToServer(new FluidSync2(player.getCommandSenderName()));
-//					} else {
-//						player.inventory.setItemStack(null);
-//						player.inventory.addItemStackToInventory(tmp4);
-//						//GT_Values.NW.sendToServer(new FluidSync2(player.getCommandSenderName()));
-//					}
-//
-//				} else if (slot.getHasStack() && tmp2 != null) {
-//					Item fluidSlot = slot.getStack().getItem();
-//					if (fluidSlot.getDamage(slot.getStack()) == tmp2.getFluidID()) {
-//						NBTTagCompound nbt = slot.getStack().getTagCompound();
-//						if (nbt != null) {
-//							tmp2.amount += nbt.getLong("mFluidDisplayAmount");
-//							ItemStack tmp3 = player.inventory.getItemStack();
-//							if (tmp3.stackSize <= 1) {
-//								tmp3 = null;
-//							} else {
-//								tmp3.stackSize--;
-//							}
-//							player.inventory.setItemStack(tmp3);
-//							//GT_Values.NW.sendToServer(new FluidSync2(player.getCommandSenderName()));
-//							slot.putStack(GT_Utility.getFluidDisplayStack(tmp2, true));
-//							if(cont.mInvArmor.data.helmet.fluid == null)
-//							{
-//								cont.mInvArmor.data.helmet.fluid = new FluidStack(tmp2.getFluid(), tmp2.amount);
-//							}
-//							else
-//							{
-//								cont.mInvArmor.data.helmet.fluid.amount += tmp2.amount;
-//							}
-//							//GT_Values.NW.sendToServer(new FluidSync(player.getCommandSenderName(), tmp2.amount, GT_Utility.getFluidName(tmp2, false)));
-//						}
-//					}
-//				}
-//			}
-//		}
-		super.mouseClicked(mouseX, mouseY, mouseBtn);
+		nbt.setInteger("Charge", this.charge);
 	}
-	
-	protected void drawTooltip(int x, int y) {
-		List<String> list = new ArrayList<String>();
-		//General tooltips
-		if(x>=7&&y>=11&&x<=33&&y<=17){
-				list.add(GT_LanguageManager.getTranslation("Weight") + ": " + cont.mInvArmor.data.mStat.get(StatType.WEIGHT));
-				list.add("Total Weight: "+cont.mInvArmor.data.maxWeight);
-				if (cont.mInvArmor.data.mStat.get(StatType.WEIGHT) > 1000)
-					list.add("Too Heavy!");
+
+	public ArmorData calculateArmor(ItemStack[] parts) {
+		mStat.clear();
+		mBStat.clear();
+		for(ItemStack tPart : parts){
+			if(tPart!=null && ArmorComponent.mStacks.containsKey(tPart.getUnlocalizedName()))
+				ArmorComponent.mStacks.get(tPart.getUnlocalizedName()).calculateArmor(this);
 		}
-		if(x>=56&&y>=11&&x<=112&&y<=17){
-			list.add("Stored Energy: "+seperateNumber(cont.mInvArmor.data.charge)+" EU");
+		for(StatType tType : StatType.values())if(!mStat.containsKey(tType))mStat.put(tType, .0f);
+		for(StatType tType : StatType.values())if(!mBStat.containsKey(tType))mBStat.put(tType, false);
+		updateTooltip();
+		return this;
+	}
+
+	public void updateTooltip() {
+		List<String> tagList = new ArrayList<String>();
+		String tmp2 = "";
+		if (maxWeight > 4000) {
+			tmp2 = " " + GT_LanguageManager.getTranslation("Too Heavy");
 		}
-		if(y>74&&y<83){
-			if(x>8&&x<17){
-				list.add("Previous Page");
-			}else if(x>18&&x<27){
-				list.add("Next Page");
-			}else if(x>72&&x<80){
-				list.add("Helmet");
-			}else if(x>81&&x<90){
-				list.add("Chestplate");
-			}else if(x>91&&x<100){
-				list.add("Leggings");
-			}else if(x>101&&x<110){
-				list.add("Boots");
+		if (maxCharge != 0) {
+			DecimalFormat formatter = (DecimalFormat) NumberFormat.getInstance(Locale.US);
+			DecimalFormatSymbols symbols = formatter.getDecimalFormatSymbols();
+			symbols.setGroupingSeparator(' ');
+			if (type == 0) {
+				if (mBStat.get(StatType.THAUMICGOGGLES)) {
+					tagList.add(GT_LanguageManager.getTranslation("Thaumic Goggles installed"));
+				}
+				if (mBStat.get(StatType.NIGHTVISION)) {
+					tagList.add(GT_LanguageManager.getTranslation("Nightvision installed"));
+				}
+			}
+			tagList.add("EU: " + formatter.format(charge + mStat.get(StatType.PARTSCHARGE)));
+			if (type == 2) {
+				tagList.add(GT_LanguageManager.getTranslation("Jumpboost") + ": " + mStat.get(StatType.PISTONJUMPBOOST) / 3 + "m");
 			}
+			if (type == 2 && mStat.get(StatType.PISTONJUMPBOOST) > 0) {
+				tagList.add(GT_LanguageManager.getTranslation("Uphill step assist active"));
+			}
+			if (type == 2 && mStat.get(StatType.MOTPRPOWER) > 0) {
+				tagList.add(GT_LanguageManager.getTranslation("Speedup") + ": " + mStat.get(StatType.MOTPRPOWER));
+				tagList.add(GT_LanguageManager.getTranslation("Motor energy usage") + ": " + mStat.get(StatType.MOTOREUUSAGE) + " EU");
+				if (maxWeight > 4000) {
+					tagList.add(GT_LanguageManager.getTranslation("Too Heavy!!!"));
+				}
+			}
+			tagList.add(GT_LanguageManager.getTranslation("Processing power ") + " " + mStat.get(StatType.PARTPROCESSING) + " " + GT_LanguageManager.getTranslation(""));
+			tagList.add(GT_LanguageManager.getTranslation("Processing power used") + ": " + mStat.get(StatType.PARTPROCESSINGUSED) + " " + GT_LanguageManager.getTranslation(""));
+			if (type == 0 && mStat.get(StatType.ELECTROLYZERPROD) > 0) {
+				tagList.add(GT_LanguageManager.getTranslation("Electrolyzer produces ") + " " + mStat.get(StatType.ELECTROLYZERPROD) / 2 + GT_LanguageManager.getTranslation("per second"));
+			}
+			if (mStat.get(StatType.TANKCAP) > 0) {
+				if (fluid != null) {
+					tagList.add(GT_LanguageManager.getTranslation("Tank Capacity") + ": " + fluid.getLocalizedName() + " " + fluid.amount + "L (" + mStat.get(StatType.TANKCAP) + ")");
+				} else {
+					tagList.add(GT_LanguageManager.getTranslation("tankcap") + ": " + mStat.get(StatType.TANKCAP));
+				}
+			}
+		}
+		tagList.add(GT_LanguageManager.getTranslation("Weight") + ": " + mStat.get(StatType.WEIGHT) + tmp2);
+		tagList.add(GT_LanguageManager.getTranslation("Physical Defence") + ": " + (Math.round(mStat.get(StatType.PHYSICALDEFENCE) * 1000) / 10.0) + "%");
+		tagList.add(GT_LanguageManager.getTranslation("Projectile Defence") + ": " + (Math.round(mStat.get(StatType.PROJECTILEDEFENCE) * 1000) / 10.0) + "%");
+		tagList.add(GT_LanguageManager.getTranslation("Fire Defence") + ": " + (Math.round(mStat.get(StatType.FIREDEFENCE) * 1000) / 10.0) + "%");
+		tagList.add(GT_LanguageManager.getTranslation("Magic Defence") + ": " + (Math.round(mStat.get(StatType.MAGICDEFENCE) * 1000) / 10.0) + "%");
+		tagList.add(GT_LanguageManager.getTranslation("Explosive Defence") + ": " + (Math.round(mStat.get(StatType.EXPLOSIONDEFENCE) * 1000) / 10.0) + "%");
+		if (mStat.get(StatType.FALLDEFENCE) > 0 && type == 3) {
+			tagList.add(GT_LanguageManager.getTranslation("Absorbs") + " " + mStat.get(StatType.FALLDEFENCE) + GT_LanguageManager.getTranslation(" m of Fall Defence"));
+		}
+		if (mStat.get(StatType.THORNS) > 0) {
+			tagList.add(GT_LanguageManager.getTranslation("Thorns") + ": " + mStat.get(StatType.THORNS));
+		}
+		if (mStat.get(StatType.MAGNET) > 0) {
+			tagList.add(GT_LanguageManager.getTranslation("Magnet") + ": " + mStat.get(StatType.MAGNET) + "m");
 		}
-		if(tab==0){
-			if(x>=93&&y>=36&&x<=110&&y<=71){list.add("Tank Capacity: "+cont.mInvArmor.data.mStat.get(StatType.TANKCAP)+"L");
+		if (mBStat.get(StatType.FULLRADIATIONARMOR)) {
+			tagList.add(GT_LanguageManager.getTranslation("Is Full Radiation Defence"));
+		} else {
+			if (mStat.get(StatType.RADIATIONDEFENCE) > 0.01d) {
+				tagList.add(GT_LanguageManager.getTranslation("Radiation Defence") + ": " + (Math.round(mStat.get(StatType.RADIATIONDEFENCE) * 1000) / 10.0) + "%");
 			}
-			if(x>=7&&y>=22&&x<=70&&y<=28){list.add("Processing Power Provided: "+cont.mInvArmor.data.mStat.get(StatType.PROCESSINGPOWER));
-										  list.add("Processing Power Used: "+cont.mInvArmor.data.mStat.get(StatType.PROCESSINGPOWERUSED));
+		}
+		info = tagList;
+	}
+
+	public void armorPartsEquipped(EntityPlayer aPlayer) {
+		helmet = null;
+		chestplate = null;
+		leggings = null;
+		boots = null;
+		for (int i = 1; i < 5; i++) {
+			ItemStack stack = aPlayer.getEquipmentInSlot(i);
+			if (stack != null && stack.getItem() instanceof ModularArmor_Item) {
+				ModularArmor_Item tmp = (ModularArmor_Item) stack.getItem();
+				ContainerModularArmor tmp2 = new ContainerBasicArmor(aPlayer, new InventoryArmor(ModularArmor_Item.class, stack));
+				if ((this.type + i) == 4) {
+					fluid = ArmorCalculation.getFluid(tmp2.mInvArmor.parts, Math.round(mStat.get(StatType.TANKCAP)));
+				}
+				if (maxCharge > 0 && charge < maxCharge) {
+					int loaded = ArmorCalculation.deChargeBatterys(tmp2.mInvArmor.parts, maxCharge - charge);
+					charge = charge + loaded;
+					change(mStat, StatType.PARTSCHARGE, -loaded);
+
+				}
+				switch (tmp.armorType) {
+				case 0:
+					helmet = tmp.data;
+					break;
+				case 1:
+					chestplate = tmp.data;
+					break;
+				case 2:
+					leggings = tmp.data;
+					break;
+				case 3:
+					boots =