Debloat - Remove Modular Armor (It's buggy and not in use anyway)

29 files changed, 6 insertions, 3149 deletions

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 1d6b059411..544a8768b5 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -24,7 +24,6 @@ import gregtech.common.GT_RecipeAdder;
 import gregtech.common.entities.GT_Entity_Arrow;
 import gregtech.common.entities.GT_Entity_Arrow_Potion;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.armor.components.LoadArmorComponents;
 import gregtech.common.items.behaviors.Behaviour_DataOrb;
 import gregtech.common.misc.GT_Command;
 import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Massfabricator;
@@ -191,7 +190,6 @@ public class GT_Mod implements IGT_Mod {
         GregTech_API.sUnification = new GT_Config(new Configuration(new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "Unification.cfg")));
         GregTech_API.sSpecialFile = new GT_Config(new Configuration(new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "Other.cfg")));
         GregTech_API.sOPStuff = new GT_Config(new Configuration(new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "OverpoweredStuff.cfg")));
-        GregTech_API.sModularArmor = new GT_Config(new Configuration(new File(new File(aEvent.getModConfigurationDirectory(), "GregTech"), "ModularArmor.cfg")));
 
         GregTech_API.sClientDataFile = new GT_Config(new Configuration(new File(aEvent.getModConfigurationDirectory().getParentFile(), "GregTech.cfg")));
         GregTech_API.mIC2Classic = Loader.isModLoaded("IC2-Classic-Spmod");
@@ -747,8 +745,6 @@ public class GT_Mod implements IGT_Mod {
         new GT_Worldgenloader().run();
         new GT_CoverLoader().run();
 
-        LoadArmorComponents.init();
-
         GT_RecipeRegistrator.registerUsagesForMaterials(null, false, new ItemStack(Blocks.planks, 1), new ItemStack(Blocks.cobblestone, 1), new ItemStack(Blocks.stone, 1), new ItemStack(Items.leather, 1));
 
         GT_OreDictUnificator.addItemData(GT_ModHandler.getRecipeOutput(null, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L), null, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L), null, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L), null, null, null), new ItemData(Materials.Tin, 10886400L));
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index 17f171a953..53bb805528 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -221,7 +221,6 @@ public class GregTech_API {
             sRecipeFile = null,
             sMachineFile = null,
             sWorldgenFile = null,
-            sModularArmor = null,
             sMaterialProperties = null,
             sMaterialComponents = null,
             sUnification = null,
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 94efa0605f..57e42ea37f 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -1553,20 +1553,6 @@ public enum ItemList implements IItemContainer {
     Moxcell_2,
     Moxcell_4,
 
-    ModularBasicHelmet,
-    ModularBasicChestplate,
-    ModularBasicLeggings,
-    ModularBasicBoots,
-
-    ModularElectric1Helmet,
-    ModularElectric1Chestplate,
-    ModularElectric1Leggings,
-    ModularElectric1Boots,
-
-    ModularElectric2Helmet,
-    ModularElectric2Chestplate,
-    ModularElectric2Leggings,
-    ModularElectric2Boots,
     Block_Powderbarrel,
     GelledToluene,
 
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index dd0a369cdf..18dfc8e410 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -53,12 +53,6 @@ import gregtech.common.entities.GT_Entity_Arrow;
 import gregtech.common.gui.GT_ContainerVolumetricFlask;
 import gregtech.common.gui.GT_GUIContainerVolumetricFlask;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.armor.ModularArmor_Item;
-import gregtech.common.items.armor.gui.ContainerBasicArmor;
-import gregtech.common.items.armor.gui.ContainerElectricArmor1;
-import gregtech.common.items.armor.gui.GuiElectricArmor1;
-import gregtech.common.items.armor.gui.GuiModularArmor;
-import gregtech.common.items.armor.gui.InventoryArmor;
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
@@ -1533,32 +1527,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
     public Object getServerGuiElement(int aID, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) {
         if(aID>=1000){
             int ID = aID-1000;
-            switch(ID){
-                case 0:
-                    return new ContainerBasicArmor(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem()));
-                case 1:
-                    return new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem()));
-                case 2:
-                    return new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem()));
-                case 10:
-                    return new GT_ContainerVolumetricFlask(aPlayer.inventory);
-                    default:
-                    return getRightItem(aPlayer, ID);
+            if (ID == 10) {
+                return new GT_ContainerVolumetricFlask(aPlayer.inventory);
             }
-        }
-        if(aID>=100){
-        	int tSlot = aID / 100;
-            int ID = aID%100;
-            switch(ID){
-            case 0:
-                return new ContainerBasicArmor(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getEquipmentInSlot(tSlot)));
-            case 1:
-                return new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getEquipmentInSlot(tSlot)));
-            case 2:
-                return new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getEquipmentInSlot(tSlot)));
-                    default:
-                return getRightItem(aPlayer, ID);
-        }
+            return null;
         }
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if ((tTileEntity instanceof IGregTechTileEntity)) {
@@ -1573,52 +1545,14 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
         return null;
     }
 
-    public Object getRightItem(EntityPlayer player, int ID){
-        ItemStack mStack = player.getEquipmentInSlot(ID/100);
-        if(mStack==null||!(mStack.getItem() instanceof ModularArmor_Item))return null;
-
-        switch(ID % 100){
-            case 0:
-                return new ContainerBasicArmor(player, new InventoryArmor(ModularArmor_Item.class, mStack));
-            case 1:
-                return new ContainerElectricArmor1(player, new InventoryArmor(ModularArmor_Item.class, mStack));
-            case 2:
-                return new ContainerElectricArmor1(player, new InventoryArmor(ModularArmor_Item.class, mStack));
-        }
-        return null;
-
-    }
-
     @Override
     public Object getClientGuiElement(int aID, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) {
         if(aID>=1000){
             int ID = aID-1000;
-            switch(ID){
-                case 0:
-                    return new GuiModularArmor(new ContainerBasicArmor(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem())), aPlayer);
-                case 1:
-                    return new GuiElectricArmor1(new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem())), aPlayer);
-                case 2:
-                    return new GuiElectricArmor1(new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem())), aPlayer);
-                case 10:
-                    return new GT_GUIContainerVolumetricFlask(new GT_ContainerVolumetricFlask(aPlayer.inventory));
-                default:
-                    return getRightItemGui(aPlayer, ID);
+            if (ID == 10) {
+                return new GT_GUIContainerVolumetricFlask(new GT_ContainerVolumetricFlask(aPlayer.inventory));
             }
-        }
-        if(aID>=100){
-        	int tSlot = aID / 100;
-            int ID = aID%100;
-            switch(ID){
-            case 0:
-                return new GuiModularArmor(new ContainerBasicArmor(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getEquipmentInSlot(tSlot))), aPlayer);
-            case 1:
-                return new GuiElectricArmor1(new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getEquipmentInSlot(tSlot))), aPlayer);
-            case 2:
-                return new GuiElectricArmor1(new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getEquipmentInSlot(tSlot))), aPlayer);
-            default:
-                return getRightItem(aPlayer, ID);
-        }
+            return null;
         }
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if ((tTileEntity instanceof IGregTechTileEntity)) {
@@ -1641,22 +1575,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
         return null;
     }
 
-	public Object getRightItemGui(EntityPlayer player, int ID){
-		ItemStack mStack = player.getEquipmentInSlot(ID/100);
-		if(mStack==null||!(mStack.getItem() instanceof ModularArmor_Item))return null;
-
-        switch(ID % 100){
-            case 0:
-                return new GuiModularArmor(new ContainerBasicArmor(player, new InventoryArmor(ModularArmor_Item.class, mStack)),player);
-            case 1:
-                return new GuiElectricArmor1(new ContainerElectricArmor1(player, new InventoryArmor(ModularArmor_Item.class, mStack)), player);
-            case 2:
-                return new GuiElectricArmor1(new ContainerElectricArmor1(player, new InventoryArmor(ModularArmor_Item.class, mStack)), player);
-        }
-        return null;
-
-	}
-
     public int getBurnTime(ItemStack aFuel) {
         if ((aFuel == null) || (aFuel.getItem() == null)) {
             return 0;
diff --git a/src/main/java/gregtech/common/items/armor/ArmorCalculation.java b/src/main/java/gregtech/common/items/armor/ArmorCalculation.java
deleted file mode 100644
index 8ecc5766ba..0000000000
--- a/src/main/java/gregtech/common/items/armor/ArmorCalculation.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package gregtech.common.items.armor;
-
-import gregtech.api.util.GT_ModHandler;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
-
-public class ArmorCalculation {
-	public static float[] calculateArmor(ItemStack[] parts) {
-		return new float[32];
-	}
-
-	public static int deChargeBatterys(ItemStack[] parts, int amount) {
-		int decharged = 0;
-		for (int i = 0; decharged < amount && i < parts.length; i++) {
-			if (GT_ModHandler.isChargerItem(parts[i])) {
-				decharged = (int) (decharged + ic2.api.item.ElectricItem.manager.discharge(parts[i], amount - decharged, 10, false, false, false));
-			}
-		}
-		return decharged;
-	}
-
-	public static FluidStack getFluid(ItemStack[] parts, int tankCap) {
-		int fluidAmount;
-		if (parts.length > 12 && parts[12] != null) {
-			NBTTagCompound nbt = parts[12].getTagCompound();
-			if (nbt != null) {
-				fluidAmount = (int) nbt.getLong("mFluidDisplayAmount");
-				if (fluidAmount > tankCap) {
-					nbt.setLong("mFluidDisplayAmount", tankCap);
-					parts[12].setTagCompound(nbt);
-					fluidAmount = tankCap;
-				}
-				return new FluidStack(parts[12].getItemDamage(), fluidAmount);
-			}
-
-		}
-		return null;
-	}
-
-	public static void useFluid(ItemStack[] parts, int usedAmount) {
-		int fluidAmount;
-		if (parts.length > 12 && parts[12] != null) {
-			NBTTagCompound nbt = parts[12].getTagCompound();
-			if (nbt != null) {
-				fluidAmount = (int) nbt.getLong("mFluidDisplayAmount");
-				nbt.setLong("mFluidDisplayAmount", fluidAmount - usedAmount);
-				parts[12].setTagCompound(nbt);
-			}
-		}
-	}
-}
diff --git a/src/main/java/gregtech/common/items/armor/ArmorData.java b/src/main/java/gregtech/common/items/armor/ArmorData.java
deleted file mode 100644
index c8061db988..0000000000
--- a/src/main/java/gregtech/common/items/armor/ArmorData.java
+++ /dev/null
@@ -1,418 +0,0 @@
-package gregtech.common.items.armor;
-
-import gregtech.api.util.GT_LanguageManager;
-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.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidStack;
-
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.NumberFormat;
-import java.util.*;
-
-import static gregtech.GT_Mod.GT_FML_LOGGER;
-
-public class ArmorData {
-
-	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;
-
-	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);
-		}
-		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:
-			maxCharge = 250000;
-			break;
-		case 2:
-			maxCharge = 1000000;
-		}
-		readNBT(stack.getTagCompound());
-	}
-
-	private void readNBT(NBTTagCompound nbt) {
-		if (nbt == null) {
-			return;
-		}
-		if (nbt.hasKey("Charge")) {
-			this.charge = nbt.getInteger("Charge");
-		}
-	}
-
-	public void writeToNBT(NBTTagCompound nbt) {
-		if (nbt == null) {
-			return;
-		}
-		nbt.setInteger("Charge", this.charge);
-	}
-
-	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);
-		}
-		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 (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 (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) + "%");
-			}
-		}
-		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 = tmp.data;
-					break;
-				default:
-					break;
-				}
-				writeToNBT(stack.getTagCompound());
-			}
-		}
-		if (helmet != null && chestplate != null && leggings != null && boots != null) {
-			set(mBStat, StatType.FULLARMOR, true);
-			boolean helmHasFullRadiationDefence=false;			
-			boolean chestplateHasFullRadiationDefence=false;
-			boolean leggingsHasFullRadiationDefence=false;
-			boolean bootsHasFullRadiationDefence=false;
-			
-			boolean helmHasFullElectricalDefenceDefence=false;
-			boolean chestplateHasFullElectricalDefenceDefence=false;
-			boolean leggingsHasFullElectricalDefenceDefence=false;
-			boolean bootsHasFullElectricalDefenceDefence=false;
-			//Check each armor pieces for valid mStat value and verify that the Hash contains the StatType key
-			if(helmet.mStat!= null)
-			{
-				if(helmet.mStat.containsKey(StatType.RADIATIONDEFENCE))
-				{
-					helmHasFullRadiationDefence = helmet.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
-				}
-				if(helmet.mStat.containsKey(StatType.ELECTRICALDEFENCE))
-				{
-					helmHasFullElectricalDefenceDefence = helmet.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
-				}
-			}
-			if(chestplate.mStat!= null)
-			{
-				if(chestplate.mStat.containsKey(StatType.RADIATIONDEFENCE))
-				{
-					chestplateHasFullRadiationDefence = chestplate.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
-				}
-				if(chestplate.mStat.containsKey(StatType.ELECTRICALDEFENCE))
-				{
-					chestplateHasFullElectricalDefenceDefence = chestplate.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
-				}
-			}
-			if(leggings.mStat!= null)
-			{
-				if(leggings.mStat.containsKey(StatType.RADIATIONDEFENCE))
-				{
-					leggingsHasFullRadiationDefence = leggings.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
-				}
-				if(leggings.mStat.containsKey(StatType.ELECTRICALDEFENCE))
-				{
-					leggingsHasFullElectricalDefenceDefence = leggings.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
-				}
-			}
-			if(boots.mStat!= null)
-			{
-				if(boots.mStat.containsKey(StatType.RADIATIONDEFENCE))
-				{
-					bootsHasFullRadiationDefence = boots.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
-				}
-				if(boots.mStat.containsKey(StatType.ELECTRICALDEFENCE))
-				{
-					bootsHasFullElectricalDefenceDefence = boots.mStat.get(StatType.RADIATIONDEFENCE)> 0.9f;
-				}
-			}
-			//Set Status of Full Armor types
-			set(mBStat, StatType.FULLRADIATIONARMOR, helmHasFullRadiationDefence&&chestplateHasFullRadiationDefence&&leggingsHasFullRadiationDefence &&bootsHasFullRadiationDefence);
-			set(mBStat, StatType.FULLELECTRICARMOR, helmHasFullElectricalDefenceDefence&&chestplateHasFullElectricalDefenceDefence&&leggingsHasFullElectricalDefenceDefence &&bootsHasFullElectricalDefenceDefence);	
-		} else {
-			//Reset Full armor type status to false for all types if StatType.FULLARMOR is false
-			set(mBStat, StatType.FULLARMOR, false);
-			set(mBStat, StatType.FULLRADIATIONARMOR, false);
-			set(mBStat, StatType.FULLELECTRICARMOR, false);
-		}
-		
-		
-		set(mBStat, StatType.MAGNET, 0);
-		set(mBStat, StatType.THORNS, 0);
-		set(mBStat, StatType.PROCESSINGPOWER, 0);
-		set(mBStat, StatType.PROCESSINGPOWERUSED, 0);
-		
-		if (helmet != null) {			
-			updateArmorStats(helmet,updateArmorStatTypeList );
-		}
-		if (chestplate != null) {
-			updateArmorStats(chestplate,updateArmorStatTypeList );
-
-		}
-		if (leggings != null) {
-			updateArmorStats(leggings,updateArmorStatTypeList );
-
-		}
-		if (boots != null) {
-			updateArmorStats(boots,updateArmorStatTypeList );
-
-		}
-		isTopItem = false;
-		if (type == 0) {
-			isTopItem = true;
-		} else if (helmet == null && type == 1) {
-			isTopItem = true;
-		} else if (helmet == null && chestplate == null && type == 2) {
-			isTopItem = true;
-		} else if (helmet == null && chestplate == null && leggings == null && type == 3) {
-			isTopItem = true;
-		}
-		if (helmet != null) {
-			maxWeight = helmet.mStat.get(StatType.WEIGHT);
-		}
-		if (chestplate != null) {
-			maxWeight += chestplate.mStat.get(StatType.WEIGHT);
-		}
-		if (leggings != null) {
-			maxWeight += leggings.mStat.get(StatType.WEIGHT);
-		}
-		if (boots != null) {
-			maxWeight += boots.mStat.get(StatType.WEIGHT);
-		}
-	}
-
-	private void updateArmorStats(ArmorData armorData, ArrayList<StatType> statTypes) {
-		for (StatType statType : statTypes) {
-			if(armorData == null || armorData.mStat == null || !armorData.mStat.containsKey(statType))
-				continue;
-//			if(armorData != null && armorData.mStat != null && armorData.mStat.containsKey(statType))
-//			{
-				set(mStat, statType, armorData.mStat.get(statType));
-//			}
-			/*change(mStat, StatType.MAGNET, armorData.mStat.get(StatType.MAGNET));
-			change(mStat, StatType.THORNS, armorData.mStat.get(StatType.THORNS));
-			change(mStat, StatType.PROCESSINGPOWER, armorData.mStat.get(StatType.PROCESSINGPOWER));
-			change(mStat, StatType.PROCESSINGPOWERUSED, armorData.mStat.get(StatType.PROCESSINGPOWERUSED));*/			
-		}
-		
-		
-	}
-	
-	public void set(Map aMap, StatType aType, boolean aSet){
-		if(aMap.containsKey(aType))aMap.remove(aType);
-		aMap.put(aType, aSet);
-	}
-	
-	public void set(Map aMap, StatType aType, float aSet){
-		if(aMap.containsKey(aType))aMap.remove(aType);
-		aMap.put(aType, aSet);
-	}
-	
-	public void change(Map aMap, StatType aType, float aChange){
-		float tChange = 0;
-		if(aMap==null)
-			GT_FML_LOGGER.info("changeMapnull");
-		if(aMap.containsKey(aType)){
-			Object value = aMap.get(aType);
-			tChange = value != null ? (float) aMap.get(aType) : 0.0f;
-		aMap.remove(aType);
-		}
-		aMap.put(aType, (tChange + aChange));		
-	}
-	
-	public void dechargeComponents(int aCharge){
-		
-	}
-
-	public double getBaseAbsorptionRatio() {
-		switch (this.type) {
-		case 0:
-			return 0.15;
-		case 1:
-			return 0.40;
-		case 2:
-			return 0.30;
-		case 3:
-			return 0.15;
-		default:
-			return 0.00;
-		}
-	}
-}
diff --git a/src/main/java/gregtech/common/items/armor/ElectricModularArmor1.java b/src/main/java/gregtech/common/items/armor/ElectricModularArmor1.java
deleted file mode 100644
index d310fa4c96..0000000000
--- a/src/main/java/gregtech/common/items/armor/ElectricModularArmor1.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package gregtech.common.items.armor;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-public class ElectricModularArmor1 extends ModularArmor_Item{
-	
-	public boolean mChargeProvider=false;
-
-	public ElectricModularArmor1(int aArmorIndex, int aType, String name,int gui) {
-		super(aArmorIndex, aType, name,gui);
-	}
-	
-	public boolean canProvideEnergy(ItemStack aStack) {
-		return mChargeProvider;
-	}
-	
-	public Item getChargedItem(ItemStack aStack) {
-		return this;
-	}
-	
-	public Item getEmptyItem(ItemStack aStack) {
-		return this;
-	}
-	
-	public int getMaxCharge(ItemStack aStack) {
-		return data.charge;
-	}
-	
-	public int getTier(ItemStack aStack) {
-		return 2;
-	}
-	
-	public int getTransferLimit(ItemStack aStack) {
-		return openGuiNr==1?128:512;
-	}
-}
diff --git a/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java b/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
deleted file mode 100644
index be0596fc92..0000000000
--- a/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
+++ /dev/null
@@ -1,460 +0,0 @@
-package gregtech.common.items.armor;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.damagesources.GT_DamageSources;
-import gregtech.api.enums.GT_Values;
-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 ic2.core.IC2;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.client.settings.GameSettings;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemArmor;
-import net.minecraft.item.ItemStack;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.DamageSource;
-import net.minecraft.world.World;
-import net.minecraftforge.common.ISpecialArmor;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.living.LivingFallEvent;
-import thaumcraft.api.IGoggles;
-import thaumcraft.api.nodes.IRevealer;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
-
-@Optional.InterfaceList(value = { @Optional.Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft", striprefs = true),
-		@Optional.Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft", striprefs = true) })
-public class ModularArmor_Item extends ItemArmor implements ISpecialArmor, IGoggles, IRevealer {
-
-	public String mName;
-	public int timer = 160;
-	public Item repairMaterial;
-	public int openGuiNr;
-	public ArmorData data;
-	public int jumpticks;
-	public int fail = 0;
-
-	// public int maxEU;
-
-	public ModularArmor_Item(int aArmorIndex, int aType, String name, int gui) {
-		super(ArmorMaterial.DIAMOND, aArmorIndex, aType);
-		MinecraftForge.EVENT_BUS.register(this);
-		setUnlocalizedName("gregtech:" + name);
-		GameRegistry.registerItem(this, name);
-		mName = name;
-		int mMaxDamage = (gui + 1) * 1024;
-		mMaxDamage *= getBaseAbsorptionRatio() * 2.5;
-		setMaxDamage(mMaxDamage);
-		repairMaterial = Items.leather;
-		openGuiNr = gui;
-	}
-
-	@Override
-	public ItemStack onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
-		if (data == null) {
-			data = fillArmorData(aPlayer, aStack);
-		}
-		if (!aWorld.isRemote) {
-			aPlayer.openGui(GT_Values.GT, openGuiNr+1000, aWorld, (int) aPlayer.posX, (int) aPlayer.posY, (int) aPlayer.posZ);
-		}
-		return aStack;
-	}
-
-	@Override
-	public ISpecialArmor.ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) {
-		if (data == null) {
-			data = fillArmorData((EntityPlayer) player, armor);
-		}
-		if (player != null && armor != null && source != null) {
-			try{
-			double tmp = 0.0d;
-			if (source.isMagicDamage()) {
-				tmp = data.mStat.get(StatType.MAGICDEFENCE);
-			} else if (source == GT_DamageSources.getRadioactiveDamage()) {
-				tmp = data.mStat.get(StatType.RADIATIONDEFENCE);
-			} else if (source == GT_DamageSources.getElectricDamage()) {
-				tmp = data.mStat.get(StatType.ELECTRICALDEFENCE);
-			} else if (source == DamageSource.wither) {
-				tmp = data.mStat.get(StatType.WITHERDEFENCE);
-			} else if (source.isFireDamage() || source == GT_DamageSources.getHeatDamage()) {
-				tmp = data.mStat.get(StatType.FIREDEFENCE);
-			} else if (source.isExplosion()) {
-				tmp = data.mStat.get(StatType.EXPLOSIONDEFENCE);
-			} else if (source.isProjectile()) {
-				tmp = data.mStat.get(StatType.PROJECTILEDEFENCE);
-			} else {
-				tmp = data.mStat.get(StatType.PHYSICALDEFENCE);
-			}
-			if (data.mStat.get(StatType.THORNS) > 0.1d && source != DamageSource.fall && source.getSourceOfDamage() != null) {
-				source.getSourceOfDamage().attackEntityFrom(new DamageSource("Thorns"), data.mStat.get(StatType.THORNS));
-			}
-
-			// fallDamage
-			if (source == DamageSource.fall) {
-				int fallDef = 0;
-				ItemStack stack = player.getEquipmentInSlot(1);
-				if (stack != null && stack.getItem() instanceof ModularArmor_Item) {
-					fallDef =  Math.round(data.boots.mStat.get(StatType.FALLDEFENCE));
-				}
-				tmp = 1.0d - (fallDef > damage ? 0.0d : (1.0d - tmp) * 0.5d);
-			}
-			if (tmp == 0.0d) {
-				tmp = data.mStat.get(StatType.PHYSICALDEFENCE);
-			}
-			if (openGuiNr == 2) {
-				tmp = 1.0f - ((1.0f - tmp) / 2.0f);
-			}
-			return new ISpecialArmor.ArmorProperties(0, data.getBaseAbsorptionRatio() * tmp, 1000);
-			}catch(Exception e){System.err.println(e);
-			return new ISpecialArmor.ArmorProperties(0, 0, 0);
-			}
-
-		} else {
-			return new ISpecialArmor.ArmorProperties(0, 0, 0);
-		}
-	}
-
-	@Override
-	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
-		if (data == null) {
-			data = fillArmorData(player, armor);
-		}
-		int tmp = (int) -Math.floor(-(data.getBaseAbsorptionRatio() * 20 * data.mStat.get(StatType.PHYSICALDEFENCE)));
-
-		return tmp;
-	}
-
-	public void addInformation(ItemStack itemStack, EntityPlayer player, List info, boolean b) {
-		if (data == null) {
-			data = fillArmorData(player, itemStack);
-		}
-		if (data.info != null)
-			info.addAll(data.info);
-	}
-
-	@Override
-	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
-		if (data == null) {
-			data = fillArmorData((EntityPlayer) entity, stack);
-		}
-		stack.damageItem(damage, entity);
-		ContainerModularArmor tmp = new ContainerBasicArmor((EntityPlayer) entity, new InventoryArmor(ModularArmor_Item.class, stack));
-		if (stack.getItemDamage() > stack.getMaxDamage() / 2 && XSTR_INSTANCE.nextInt(100) < 5) {
-			tmp.getSlot(XSTR_INSTANCE.nextInt(tmp.getSlotCount())).decrStackSize(1);
-			tmp.mInvArmor.onGuiSaved((EntityPlayer) entity);
-			
-				/*public void eject(ItemStack drop)
-				{
-				if ((!IC2.platform.isSimulating()) || (drop == null)) {
-				return;
-				}
-				float f = 0.7F;
-				double d = this.worldObj.rand.nextFloat() * f + (1.0F - f) * 0.5D;
-				double d1 = this.worldObj.rand.nextFloat() * f + (1.0F - f) * 0.5D;
-				double d2 = this.worldObj.rand.nextFloat() * f + (1.0F - f) * 0.5D;
-				EntityItem entityitem = new EntityItem(this.worldObj, this.xCoord + d, this.yCoord + d1, this.zCoord + d2, drop);
-				entityitem.delayBeforeCanPickup = 10;
-				this.worldObj.spawnEntityInWorld(entityitem);
-				}*/
-			
-		}
-	}
-
-	@SubscribeEvent
-	public void onEntityLivingFallEvent(LivingFallEvent event) {
-		if (FMLCommonHandler.instance().getEffectiveSide().isServer() && event.entity instanceof EntityPlayer) {
-			EntityPlayer player = (EntityPlayer) event.entity;
-			ItemStack armor = player.inventory.armorInventory[0];
-			if (data != null && event != null && data.type == 3 && data.charge >= data.mStat.get(StatType.PISTONEUUSAGE) && event.distance - 3 <= data.mStat.get(StatType.FALLDEFENCE)) {
-				event.setCanceled(true);
-			} else if (data != null && event != null && data.type == 3 && data.charge >= data.mStat.get(StatType.PISTONEUUSAGE)) {
-				event.distance -= data.mStat.get(StatType.FALLDEFENCE);
-			}
-		}
-	}
-
-	@Override
-	public void onArmorTick(World aWorld, EntityPlayer aPlayer, ItemStack aStack) {
-		if(fail>0){
-			fail--;
-			return;
-		}
-		try{
-		if (data == null) {
-			data = fillArmorData(aPlayer, aStack);
-		}
-		if (data.tooltipUpdate > 40) {
-			data.armorPartsEquipped(aPlayer);
-			data.tooltipUpdate = 0;
-			data.updateTooltip();
-		} else {
-			data.tooltipUpdate++;
-		}
-		if (aPlayer.onGround) {
-			jumpticks = 4;
-		} else {
-			jumpticks--;
-		}
-
-		// Breathing
-		if (data.type == 0 && aPlayer.getAir() < 100 && data.fluid != null) {
-			int air = 0;			
-			if (data.fluid.getUnlocalizedName().equals("fluid.oxygen") && data.fluid.amount >= 150) {
-				aPlayer.setAir(aPlayer.getAir() + 150);
-				air = 150;
-			} else if (data.fluid.getUnlocalizedName().equals("fluid.air") && data.fluid.amount >= 500) {
-				aPlayer.setAir(aPlayer.getAir() + 100);
-				air = 500;
-			}
-			if (air > 0) {
-				data.fluid.amount -= air;
-				ItemStack stack = aPlayer.getEquipmentInSlot(4);
-				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));
-					ArmorCalculation.useFluid(tmp2.mInvArmor.parts, air);
-				}
-			}
-		}
-		// Fill Air Tank
-		if (data.tooltipUpdate == 40 && data.mStat.get(StatType.PROCESSINGPOWER) > data.mStat.get(StatType.PROCESSINGPOWERUSED) && data.type == 0 && data.fluid != null
-				&& data.fluid.getUnlocalizedName().equals("oxygen") && data.fluid.amount < data.mStat.get(StatType.TANKCAP) && data.charge > data.mStat.get(StatType.ELECTROLYZEREUUSAGE)) {
-			data.charge -= data.mStat.get(StatType.ELECTROLYZEREUUSAGE);
-			ItemStack stack = aPlayer.getEquipmentInSlot(4);
-			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));
-				ArmorCalculation.useFluid(tmp2.mInvArmor.parts, -Math.round(data.mStat.get(StatType.ELECTROLYZERPROD)));
-			}
-		}
-
-		if (data.isTopItem) {
-			if(IC2.keyboard.isModeSwitchKeyDown(aPlayer)&&!aWorld.isRemote){
-				int typeMod=0;
-				switch(data.type){
-				case 0:
-					typeMod=400;
-					break;
-				case 1:
-					typeMod=300;
-					break;
-				case 2:
-					typeMod=200;
-					break;
-				case 3:
-					typeMod=100;
-					break;
-				}
-					aPlayer.openGui(GT_Values.GT, openGuiNr+(typeMod), aWorld, (int) aPlayer.posX, (int) aPlayer.posY, (int) aPlayer.posZ);
-			}
-//			if(data.helmet!=null&&data.helmet.openGui){data.helmet.openGui=false;aPlayer.openGui(GT_Values.GT, openGuiNr+400, aWorld, (int) aPlayer.posX, (int) aPlayer.posY, (int) aPlayer.posZ);}
-//			if(data.chestplate!=null&&data.chestplate.openGui){data.chestplate.openGui=false;aPlayer.openGui(GT_Values.GT, openGuiNr+300, aWorld, (int) aPlayer.posX, (int) aPlayer.posY, (int) aPlayer.posZ);}
-//			if(data.leggings!=null&&data.leggings.openGui){data.leggings.openGui=false;aPlayer.openGui(GT_Values.GT, openGuiNr+200, aWorld, (int) aPlayer.posX, (int) aPlayer.posY, (int) aPlayer.posZ);}
-//			if(data.boots!=null&&data.boots.openGui){data.boots.openGui=false;aPlayer.openGui(GT_Values.GT, openGuiNr+100, aWorld, (int) aPlayer.posX, (int) aPlayer.posY, (int) aPlayer.posZ);}
-			// Night Vision
-			if (timer >= 200) {
-				timer = 0;
-				if (data.mStat.get(StatType.PROCESSINGPOWER) > data.mStat.get(StatType.PROCESSINGPOWERUSED) && data.helmet != null && data.helmet.mBStat.get(StatType.NIGHTVISION) && data.charge > 3) {
-					aPlayer.addPotionEffect(new PotionEffect(Potion.nightVision.getId(), 500, -3));
-					data.charge -= 4;
-				} else {
-					PotionEffect nv = aPlayer.getActivePotionEffect(Potion.nightVision);
-					if (nv != null && nv.getAmplifier() == -3) {
-						if (aPlayer.worldObj.isRemote) {
-							aPlayer.removePotionEffectClient(Potion.nightVision.id);
-						} else {
-							aPlayer.removePotionEffect(Potion.nightVision.id);
-						}
-					}
-				}
-			} else {
-				timer++;
-			}
-
-			// Item Magnet
-			if (data.mStat.get(StatType.MAGNET) > 1) {
-				double x = aPlayer.posX;
-				double y = aPlayer.posY - (aPlayer.worldObj.isRemote ? 1.62 : 0) + 0.75;
-				double z = aPlayer.posZ;
-				int tMagnet = Math.round(data.mStat.get(StatType.MAGNET));
-				List<EntityItem> items = aPlayer.worldObj.getEntitiesWithinAABB(EntityItem.class,
-						AxisAlignedBB.getBoundingBox(x - tMagnet, y - tMagnet, z - tMagnet, x + tMagnet, y + tMagnet, z + tMagnet));
-				for (EntityItem item : items) {
-					ItemStack stack = item.getEntityItem();
-					if (!item.isDead && stack != null) {
-						setEntityMotionFromVector(item, new Vector3(x, y, z), 0.45F);
-					}
-				}
-			}
-			// Weight limit calcuation
-			double motorSpeed = 0;
-			if (data.leggings != null) {
-				motorSpeed = data.leggings.mStat.get(StatType.MOTPRPOWER);
-			}
-			if (data.maxWeight > 4000) {
-				if (data.leggings != null && data.leggings.charge > data.leggings.mStat.get(StatType.MOTOREUUSAGE)) {
-					motorSpeed -= data.maxWeight - 4000;
-					data.leggings.charge -= (data.leggings.mStat.get(StatType.MOTOREUUSAGE) / 100);
-				} else {
-					aPlayer.motionX *= (4000.0d / data.maxWeight);
-					aPlayer.motionZ *= (4000.0d / data.maxWeight);
-				}
-			}
-			if (data.leggings != null && data.leggings.charge > data.leggings.mStat.get(StatType.MOTOREUUSAGE) && data.mStat.get(StatType.PROCESSINGPOWER) > data.mStat.get(StatType.PROCESSINGPOWERUSED) && motorSpeed > 0
-					&& aPlayer.isSprinting() && jumpticks > 0
-					&& (aPlayer.onGround && Math.abs(aPlayer.motionX) + Math.abs(aPlayer.motionZ) > 0.10000000149011612D)) {
-				data.leggings.charge -= data.leggings.mStat.get(StatType.MOTOREUUSAGE);
-				motorSpeed = Math.sqrt(motorSpeed) / 3;
-
-				float var7 = (float) (0.02f * motorSpeed);
-				if (aPlayer.isInWater()) {
-					var7 = 0.1F;
-					if (aPlayer.motionY > 0) {
-						aPlayer.motionY += 0.10000000149011612D;
-					}
-				}
-
-				if (var7 > 0.0F) {
-					aPlayer.moveFlying(0.0F, 1.0F, var7);
-				}
-			}
-
-			// jump+step up assist
-			if (data.mStat.get(StatType.PROCESSINGPOWER) > data.mStat.get(StatType.PROCESSINGPOWERUSED) && data.leggings != null) {
-				double stepup = data.leggings.mStat.get(StatType.PISTONJUMPBOOST);
-				if (stepup > 1) {
-					aPlayer.stepHeight = 1.0f;
-				}
-				if (aWorld.isRemote && GameSettings.isKeyDown(Minecraft.getMinecraft().gameSettings.keyBindJump)) {
-					if (stepup > 0 && jumpticks > 0) {
-						if (data.maxWeight > 2000) {
-							stepup *= 2000.0D / data.maxWeight;
-						}
-						aPlayer.motionY += 0.04 * stepup;
-					}
-					aPlayer.jumpMovementFactor = aPlayer.getAIMoveSpeed() * .2f;
-				}
-
-			}
-
-			// immune effect removal
-			List<PotionEffect> effects = new LinkedList(aPlayer.getActivePotionEffects());
-			for (PotionEffect effect : effects) {
-				int id = effect.getPotionID();
-				if (id == 24 && data.mBStat.get(StatType.FULLRADIATIONARMOR)) {
-					aPlayer.removePotionEffect(id);
-				}
-			}
-		}
-		}catch(Exception e){System.err.print(e);
-			fail = 200;
-		}
-	}
-
-	public void setEntityMotionFromVector(Entity entity, Vector3 originalPosVector, float modifier) {
-		Vector3 entityVector = Vector3.fromEntityCenter(entity);
-		Vector3 finalVector = originalPosVector.copy().subtract(entityVector);
-		if (finalVector.mag() > 1)
-			finalVector.normalize();
-		entity.motionX = finalVector.x * modifier;
-		entity.motionY = finalVector.y * modifier;
-		entity.motionZ = finalVector.z * modifier;
-	}
-
-	@Override
-	public int getItemEnchantability() {
-		return 0;
-	}
-
-	@Override
-	public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) {
-		return false;
-	}
-
-	@Override
-	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-		return true;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister aIconRegister) {
-		this.itemIcon = aIconRegister.registerIcon(GT_Values.MOD_ID+":" + mName);
-	}
-
-	@SideOnly(Side.CLIENT)
-	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
-		String armor=GT_Values.RES_PATH_ITEM+"armorhelmet.png";
-		String tier="";
-		try{
-		if (data == null) {
-			data = fillArmorData((EntityPlayer) entity, stack);
-		}
-		if(this.data.armorTier==0){
-			tier="basic";
-		}else if(this.data.armorTier==1){
-			tier="e1";
-		}else if(this.data.armorTier==2){
-			tier="e2";
-		}
-		if(this.data.type==0||this.data.type==1||this.data.type==3){
-			armor = GT_Values.RES_PATH_MODEL+"armor/"+tier+"_helmet_chest.png";
-		}else{
-			armor = GT_Values.RES_PATH_MODEL+"armor/"+tier+"_leggings_boots.png";
-		}}catch(Exception e){System.err.println(e);}
-		return armor;
-	}
-
-	@Override
-	public boolean showNodes(ItemStack aStack, EntityLivingBase aPlayer) {
-		if (data == null) {
-			data = fillArmorData((EntityPlayer) aPlayer, aStack);
-		}
-		return data.mBStat.get(StatType.THAUMICGOGGLES) && data.armorTier > 0 && data.charge > 0;
-	}
-
-	@Override
-	public boolean showIngamePopups(ItemStack aStack, EntityLivingBase aPlayer) {
-		if (data == null) {
-			data = fillArmorData((EntityPlayer) aPlayer, aStack);
-		}
-		return data.mBStat.get(StatType.THAUMICGOGGLES) && data.armorTier > 0 && data.charge > 0;
-	}
-
-	public ArmorData fillArmorData(EntityPlayer player, ItemStack stack) {
-		return new ArmorData(player, stack, this.armorType, openGuiNr);
-	}
-
-	public double getBaseAbsorptionRatio() {
-		switch (this.armorType) {
-		case 0:
-			return 0.15;
-		case 1:
-			return 0.40;
-		case 2:
-			return 0.30;
-		case 3:
-			return 0.15;
-		default:
-			return 0.00;
-		}
-	}
-}
diff --git a/src/main/java/gregtech/common/items/armor/Vector3.java b/src/main/java/gregtech/common/items/armor/Vector3.java
deleted file mode 100644
index 2f79ff4c69..0000000000
--- a/src/main/java/gregtech/common/items/armor/Vector3.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package gregtech.common.items.armor;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.entity.Entity;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.Vec3;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.util.vector.Vector3f;
-import org.lwjgl.util.vector.Vector4f;
-
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.math.RoundingMode;
-
-public class Vector3 {
-	public static Vector3 zero = new Vector3();
-	public static Vector3 one = new Vector3(1, 1, 1);
-	public static Vector3 center = new Vector3(0.5, 0.5, 0.5);
-	public double x;
-	public double y;
-	public double z;
-
-	public Vector3() {
-	}
-
-	public Vector3(double d, double d1, double d2) {
-		x = d;
-		y = d1;
-		z = d2;
-	}
-
-	public Vector3(Vector3 vec) {
-		x = vec.x;
-		y = vec.y;
-		z = vec.z;
-	}
-
-	public Vector3(Vec3 vec) {
-		x = vec.xCoord;
-		y = vec.yCoord;
-		z = vec.zCoord;
-	}
-
-	public Vector3 copy() {
-		return new Vector3(this);
-	}
-
-	public static Vector3 fromEntity(Entity e) {
-		return new Vector3(e.posX, e.posY, e.posZ);
-	}
-
-	public static Vector3 fromEntityCenter(Entity e) {
-		return new Vector3(e.posX, e.posY - e.yOffset + e.height / 2, e.posZ);
-	}
-
-	public static Vector3 fromTileEntity(TileEntity e) {
-		return new Vector3(e.xCoord, e.yCoord, e.zCoord);
-	}
-
-	public static Vector3 fromTileEntityCenter(TileEntity e) {
-		return new Vector3(e.xCoord + 0.5, e.yCoord + 0.5, e.zCoord + 0.5);
-	}
-
-	public Vector3 set(double d, double d1, double d2) {
-		x = d;
-		y = d1;
-		z = d2;
-		return this;
-	}
-
-	public Vector3 set(Vector3 vec) {
-		x = vec.x;
-		y = vec.y;
-		z = vec.z;
-		return this;
-	}
-
-	public double dotProduct(Vector3 vec) {
-		double d = vec.x * x + vec.y * y + vec.z * z;
-		if (d > 1 && d < 1.00001)
-			d = 1;
-		else if (d < -1 && d > -1.00001)
-			d = -1;
-		return d;
-	}
-
-	public double dotProduct(double d, double d1, double d2) {
-		return d * x + d1 * y + d2 * z;
-	}
-
-	public Vector3 crossProduct(Vector3 vec) {
-		double d = y * vec.z - z * vec.y;
-		double d1 = z * vec.x - x * vec.z;
-		double d2 = x * vec.y - y * vec.x;
-		x = d;
-		y = d1;
-		z = d2;
-		return this;
-	}
-
-	public Vector3 add(double d, double d1, double d2) {
-		x += d;
-		y += d1;
-		z += d2;
-		return this;
-	}
-
-	public Vector3 add(Vector3 vec) {
-		x += vec.x;
-		y += vec.y;
-		z += vec.z;
-		return this;
-	}
-
-	public Vector3 add(double d) {
-		return add(d, d, d);
-	}
-
-	public Vector3 sub(Vector3 vec) {
-		return subtract(vec);
-	}
-
-	public Vector3 subtract(Vector3 vec) {
-		x -= vec.x;
-		y -= vec.y;
-		z -= vec.z;
-		return this;
-	}
-
-	public Vector3 negate(Vector3 vec) {
-		x = -x;
-		y = -y;
-		z = -z;
-		return this;
-	}
-
-	public Vector3 multiply(double d) {
-		x *= d;
-		y *= d;
-		z *= d;
-		return this;
-	}
-
-	public Vector3 multiply(Vector3 f) {
-		x *= f.x;
-		y *= f.y;
-		z *= f.z;
-		return this;
-	}
-
-	public Vector3 multiply(double fx, double fy, double fz) {
-		x *= fx;
-		y *= fy;
-		z *= fz;
-		return this;
-	}
-
-	public double mag() {
-		return Math.sqrt(x * x + y * y + z * z);
-	}
-
-	public double magSquared() {
-		return x * x + y * y + z * z;
-	}
-
-	public Vector3 normalize() {
-		double d = mag();
-		if (d != 0)
-			multiply(1 / d);
-		return this;
-	}
-
-	@Override
-	public String toString() {
-		MathContext cont = new MathContext(4, RoundingMode.HALF_UP);
-		return "Vector3(" + new BigDecimal(x, cont) + ", " + new BigDecimal(y, cont) + ", " + new BigDecimal(z, cont) + ")";
-	}
-
-	public Vector3 perpendicular() {
-		if (z == 0)
-			return zCrossProduct();
-		return xCrossProduct();
-	}
-
-	public Vector3 xCrossProduct() {
-		double d = z;
-		double d1 = -y;
-		x = 0;
-		y = d;
-		z = d1;
-		return this;
-	}
-
-	public Vector3 zCrossProduct() {
-		double d = y;
-		double d1 = -x;
-		x = d;
-		y = d1;
-		z = 0;
-		return this;
-	}
-
-	public Vector3 yCrossProduct() {
-		double d = -z;
-		double d1 = x;
-		x = d;
-		y = 0;
-		z = d1;
-		return this;
-	}
-
-	public Vec3 toVec3D() {
-		return Vec3.createVectorHelper(x, y, z);
-	}
-
-	public double angle(Vector3 vec) {
-		return Math.acos(copy().normalize().dotProduct(vec.copy().normalize()));
-	}
-
-	public boolean isInside(AxisAlignedBB aabb) {
-		return x >= aabb.minX && y >= aabb.maxY && z >= aabb.minZ && x < aabb.maxX && y < aabb.maxY && z < aabb.maxZ;
-	}
-
-	public boolean isZero() {
-		return x == 0 && y == 0 && z == 0;
-	}
-
-	public boolean isAxial() {
-		return x == 0 ? y == 0 || z == 0 : y == 0 && z == 0;
-	}
-
-	@SideOnly(Side.CLIENT)
-	public Vector3f vector3f() {
-		return new Vector3f((float) x, (float) y, (float) z);
-	}
-
-	@SideOnly(Side.CLIENT)
-	public Vector4f vector4f() {
-		return new Vector4f((float) x, (float) y, (float) z, 1);
-	}
-
-	@SideOnly(Side.CLIENT)
-	public void glVertex() {
-		GL11.glVertex3d(x, y, z);
-	}
-
-	public Vector3 negate() {
-		x = -x;
-		y = -y;
-		z = -z;
-		return this;
-	}
-
-	public double scalarProject(Vector3 b) {
-		double l = b.mag();
-		return l == 0 ? 0 : dotProduct(b) / l;
-	}
-
-	public Vector3 project(Vector3 b) {
-		double l = b.magSquared();
-		if (l == 0) {
-			set(0, 0, 0);
-			return this;
-		}
-		double m = dotProduct(b) / l;
-		set(b).multiply(m);
-		return this;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (!(o instanceof Vector3))
-			return false;
-		Vector3 v = (Vector3) o;
-		return x == v.x && y == v.y && z == v.z;
-	}
-}
diff --git a/src/main/java/gregtech/common/items/armor/components/ArmorComponent.java b/src/main/java/gregtech/common/items/armor/components/ArmorComponent.java
deleted file mode 100644
index ea2f0184dd..0000000000
--- a/src/main/java/gregtech/common/items/armor/components/ArmorComponent.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package gregtech.common.items.armor.components;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.items.armor.ArmorData;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public abstract class ArmorComponent implements IArmorComponent {
-	public ItemStack mStack;
-	public String mOreDict;
-	public String mConfigName;
-	public static Map<String, ArmorComponent> mOreDicts = new HashMap<String, ArmorComponent>();
-	public static Map<String, ArmorComponent> mStacks = new HashMap<String, ArmorComponent>();
-	public Map<StatType,Float> mStat = new HashMap<StatType,Float>();
-	public Map<StatType,Boolean> mBStat = new HashMap<StatType,Boolean>();
-	
-	public ArmorComponent(String aName, String aOreDict, boolean aElectric, float aWeight){
-		mConfigName = aName;
-		if(!GregTech_API.sModularArmor.get( mConfigName, "Enabled", true))return;        
-		mOreDict = GregTech_API.sModularArmor.get( mConfigName, "OreDict", aOreDict);
-		mBStat.put(StatType.ELECTRIC, aElectric);
-		mOreDicts.put(aOreDict, this);
-		for(ItemStack tStack : OreDictionary.getOres(aOreDict))if(tStack!=null)mStacks.put(tStack.getUnlocalizedName(), this);
-		mStat.put(StatType.WEIGHT, (float) GregTech_API.sModularArmor.get( mConfigName, "Weight", aWeight));
-	}
-	
-	public ArmorComponent(String aName, ItemStack aStack, boolean aElectric, float aWeight){
-		mConfigName = aName;
-		String tStackName = GregTech_API.sModularArmor.get( mConfigName, "Stack", GameRegistry.findUniqueIdentifierFor(aStack.getItem()).toString()+(aStack.getItemDamage()==0 ? "" : ":"+aStack.getItemDamage()));
-		mStack = GameRegistry.findItemStack(tStackName.split(":")[0], tStackName.split(":")[1], 1);
-		if(tStackName.split(":").length>2)mStack.setItemDamage(Integer.parseInt(tStackName.split(":")[2]));
-		if(!GregTech_API.sModularArmor.get( mConfigName, "Enabled", true))return;       
-		mStack = aStack;
-		mBStat.put(StatType.ELECTRIC, aElectric);
-		mStacks.put(aStack.getUnlocalizedName(), this);
-		mStat.put(StatType.WEIGHT, (float) GregTech_API.sModularArmor.get( mConfigName, "Weight", aWeight));
-	}
-
-	@Override
-	public boolean isArmorComponent(ItemStack aStack) {
-		if(mStack!=null && GT_Utility.areStacksEqual(mStack, aStack, true)){return true;}
-		if(mOreDict!=null){
-			for(ItemStack tStack : OreDictionary.getOres(mOreDict))
-				if(GT_Utility.areStacksEqual(tStack, aStack, true))return true;}
-		return false;
-	}
-	
-	public void addVal(StatType aType, ArmorData aArmorData){
-		float tArmorDef = 0.0f;
-		if(aArmorData.mStat.containsKey(aType)){
-		tArmorDef = aArmorData.mStat.get(aType);
-		aArmorData.mStat.remove(aType);}
-		aArmorData.mStat.put(aType, tArmorDef + mStat.get(aType));		
-	}
-
-	public abstract void calculateArmor(ArmorData aArmorData);
-
-}
diff --git a/src/main/java/gregtech/common/items/armor/components/ArmorComponentBattery.java b/src/main/java/gregtech/common/items/armor/components/ArmorComponentBattery.java
deleted file mode 100644
index 15946863fb..0000000000
--- a/src/main/java/gregtech/common/items/armor/components/ArmorComponentBattery.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package gregtech.common.items.armor.components;
-
-import gregtech.api.GregTech_API;
-import gregtech.common.items.armor.ArmorData;
-import net.minecraft.item.ItemStack;
-
-public class ArmorComponentBattery extends ArmorComponent{
-	public ArmorComponentBattery(String aName, ItemStack aStack, boolean aElectric, float aWeight, float aBatteryCapacity) {
-		super(aName, aStack, aElectric, aWeight);
-		mStat.put(StatType.BATTERYCAPACITY, (float) GregTech_API.sModularArmor.get( mConfigName, "ProcessingUsed", aBatteryCapacity));
-	}
-
-	@Override
-	public void calculateArmor(ArmorData aArmorData) {
-		addVal(StatType.BATTERYCAPACITY, aArmorData);
-	}
-
-}
diff --git a/src/main/java/gregtech/common/items/armor/components/ArmorComponentFunction.java b/src/main/java/gregtech/common/items/armor/components/ArmorComponentFunction.java
deleted file mode 100644
index dcdc59d19c..0000000000
--- a/src/main/java/gregtech/common/items/armor/components/ArmorComponentFunction.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package gregtech.common.items.armor.components;
-
-import gregtech.api.GregTech_API;
-import gregtech.common.items.armor.ArmorData;
-import net.minecraft.item.ItemStack;
-
-public class ArmorComponentFunction extends ArmorComponent{
-	StatType mType;
-	public ArmorComponentFunction(String aName, ItemStack aStack, boolean aElectric, float aWeight, StatType aType, float aProcessingUsed) {
-		super(aName, aStack, aElectric, aWeight);
-		mType = StatType.valueOf(GregTech_API.sModularArmor.get(mConfigName, "StatType", aType.toString()));
-		mStat.put(StatType.PROCESSINGPOWERUSED, (float) GregTech_API.sModularArmor.get( mConfigName, "ProcessingUsed", aProcessingUsed));
-	}
-
-	@Override
-	public void calculateArmor(ArmorData aArmorData) {
-		addVal(StatType.PROCESSINGPOWERUSED, aArmorData);
-		if(!aArmorData.mBStat.containsKey(mType))aArmorData.mBStat.put(mType, true);
-	}
-
-}
diff --git a/src/main/java/gregtech/common/items/armor/components/ArmorElectricComponent.java b/src/main/java/gregtech/common/items/armor/components/ArmorElectricComponent.java
deleted file mode 100644
index 3e9e22ee28..0000000000
--- a/src/main/java/gregtech/common/items/armor/components/ArmorElectricComponent.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package gregtech.common.items.armor.components;
-
-import gregtech.api.GregTech_API;
-import gregtech.common.items.armor.ArmorData;
-import net.minecraft.item.ItemStack;
-
-public class ArmorElectricComponent extends ArmorComponent{
-	StatType mType1;
-	StatType mType2;
-	StatType mType3;
-	
-	public ArmorElectricComponent(String aName, ItemStack aStack, float aWeight, StatType aType1, float aValue1, StatType aType2, float aValue2, StatType aType3, float aValue3) {
-		super(aName, aStack, true, aWeight);
-		mType1 = StatType.valueOf(GregTech_API.sModularArmor.get(mConfigName, "StatType", aType1.toString()));
-		String tType2 = GregTech_API.sModularArmor.get(mConfigName, "StatType", aType2==null ? "null" : aType2.toString());
-		mType2 = tType2.equals("null") ? null : StatType.valueOf(tType2);
-		String tType3 = GregTech_API.sModularArmor.get(mConfigName, "StatType", aType3==null ? "null" : aType3.toString());
-		mType3 = tType3.equals("null") ? null : StatType.valueOf(tType3);
-		mStat.put(aType1, (float) GregTech_API.sModularArmor.get( mConfigName, "Value1", aValue1));
-		if(mType2!=null)mStat.put(mType2, (float) GregTech_API.sModularArmor.get( mConfigName, "Value2", aValue2));
-		if(mType3!=null)mStat.put(mType3, (float) GregTech_API.sModularArmor.get( mConfigName, "Value3", aValue3));
-	}
-
-	@Override
-	public void calculateArmor(ArmorData aArmorData) {		
-		addVal(mType1, aArmorData);	
-		if(mType2!=null)addVal(mType2, aArmorData);	
-		if(mType3!=null)addVal(mType3, aArmorData);
-	}
-
-}
diff --git a/src/main/java/gregtech/common/items/armor/components/ArmorPlating.java b/src/main/java/gregtech/common/items/armor/components/ArmorPlating.java
deleted file mode 100644
index 2e02ac7ba6..0000000000
--- a/src/main/java/gregtech/common/items/armor/components/ArmorPlating.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package gregtech.common.items.armor.components;
-
-import gregtech.api.GregTech_API;
-import gregtech.common.items.armor.ArmorData;
-import net.minecraft.item.ItemStack;
-
-public class ArmorPlating extends ArmorComponent{
-	StatType mType;
-	public ArmorPlating(String aName, ItemStack aStack, float aWeight, float aPhysicalDef, float aProjectileDef, float aFireDef, float aMagicDef, float aExplosionDef, float aFallDef, float aRadiationDef, float aElectricDef, float aWitherDef) {		
-		super(aName, aStack, false, aWeight);
-		aPhysicalDef = (float) GregTech_API.sModularArmor.get( mConfigName, "PhysicalDef", aPhysicalDef);
-		aProjectileDef = (float) GregTech_API.sModularArmor.get( mConfigName, "ProjectileDef", aProjectileDef);
-		aFireDef = (float) GregTech_API.sModularArmor.get( mConfigName, "FireDef", aFireDef);
-		aMagicDef = (float) GregTech_API.sModularArmor.get( mConfigName, "MagicDef", aMagicDef);
-		aExplosionDef = (float) GregTech_API.sModularArmor.get( mConfigName, "ExplosionDef", aExplosionDef);
-		aFallDef = (float) GregTech_API.sModularArmor.get( mConfigName, "FallDef", aFallDef);
-		aRadiationDef = (float) GregTech_API.sModularArmor.get( mConfigName, "RadiationDef", aRadiationDef);
-		aElectricDef = (float) GregTech_API.sModularArmor.get( mConfigName, "ElectricalDef", aElectricDef);
-		aWitherDef = (float) GregTech_API.sModularArmor.get( mConfigName, "WitherDef", aWitherDef);
-		addStats(aPhysicalDef, aProjectileDef, aFireDef, aMagicDef, aExplosionDef, aFallDef, aRadiationDef, aElectricDef, aWitherDef);
-	}
-	
-	public ArmorPlating(String aName, String aOreDict, float aWeight, float aPhysicalDef, float aProjectileDef, float aFireDef, float aMagicDef, float aExplosionDef, float aFallDef, float aRadiationDef, float aElectricDef, float aWitherDef) {
-		super(aName, aOreDict, false, aWeight);
-		aPhysicalDef = (float) GregTech_API.sModularArmor.get( mConfigName, "PhysicalDef", aPhysicalDef);
-		aProjectileDef = (float) GregTech_API.sModularArmor.get( mConfigName, "ProjectileDef", aProjectileDef);
-		aFireDef = (float) GregTech_API.sModularArmor.get( mConfigName, "FireDef", aFireDef);
-		aMagicDef = (float) GregTech_API.sModularArmor.get( mConfigName, "MagicDef", aMagicDef);
-		aExplosionDef = (float) GregTech_API.sModularArmor.get( mConfigName, "ExplosionDef", aExplosionDef);
-		aFallDef = (float) GregTech_API.sModularArmor.get( mConfigName, "FallDef", aFallDef);
-		aRadiationDef = (float) GregTech_API.sModularArmor.get( mConfigName, "RadiationDef", aRadiationDef);
-		aElectricDef = (float) GregTech_API.sModularArmor.get( mConfigName, "ElectricalDef", aElectricDef);
-		aWitherDef = (float) GregTech_API.sModularArmor.get( mConfigName, "WitherDef", aWitherDef);
-		addStats(aPhysicalDef, aProjectileDef, aFireDef, aMagicDef, aExplosionDef, aFallDef, aRadiationDef, aElectricDef, aWitherDef);
-	}
-	
-	public ArmorPlating(String aName, String aOreDict, float aWeight, float aPhysicalDef, float aProjectileDef, float aFireDef, float aMagicDef, float aExplosionDef, float aFallDef, float aRadiationDef, float aElectricDef, float aWitherDef, StatType aType, float aSpecial) {
-		super(aName, aOreDict, false, aWeight);
-		aPhysicalDef = (float) GregTech_API.sModularArmor.get( mConfigName, "PhysicalDef", aPhysicalDef);
-		aProjectileDef = (float) GregTech_API.sModularArmor.get( mConfigName, "ProjectileDef", aProjectileDef);
-		aFireDef = (float) GregTech_API.sModularArmor.get( mConfigName, "FireDef", aFireDef);
-		aMagicDef = (float) GregTech_API.sModularArmor.get( mConfigName, "MagicDef", aMagicDef);
-		aExplosionDef = (float) GregTech_API.sModularArmor.get( mConfigName, "ExplosionDef", aExplosionDef);
-		aFallDef = (float) GregTech_API.sModularArmor.get( mConfigName, "FallDef", aFallDef);
-		aRadiationDef = (float) GregTech_API.sModularArmor.get( mConfigName, "RadiationDef", aRadiationDef);
-		aElectricDef = (float) GregTech_API.sModularArmor.get( mConfigName, "ElectricalDef", aElectricDef);
-		aWitherDef = (float) GregTech_API.sModularArmor.get( mConfigName, "WitherDef", aWitherDef);
-		addStats(aPhysicalDef, aProjectileDef, aFireDef, aMagicDef, aExplosionDef, aFallDef, aRadiationDef, aElectricDef, aWitherDef);
-		mType = StatType.valueOf(GregTech_API.sModularArmor.get(mConfigName, "StatType", aType.toString()));
-		mStat.put(mType, (float) GregTech_API.sModularArmor.get( mConfigName, "SpecialType", aSpecial));
-	}
-	
-	public ArmorPlating(String aName, String aOreDict,float aWeight, float aPhysicalDef, float aProjectileDef, float aFireDef, float aMagicDef, float aExplosionDef) {
-		super(aName, aOreDict, false, aWeight);
-		aPhysicalDef = (float) GregTech_API.sModularArmor.get( mConfigName, "PhysicalDef", aPhysicalDef);
-		aProjectileDef = (float) GregTech_API.sModularArmor.get( mConfigName, "ProjectileDef", aProjectileDef);
-		aFireDef = (float) GregTech_API.sModularArmor.get( mConfigName, "FireDef", aFireDef);
-		aMagicDef = (float) GregTech_API.sModularArmor.get( mConfigName, "MagicDef", aMagicDef);
-		aExplosionDef = (float) GregTech_API.sModularArmor.get( mConfigName, "ExplosionDef", aExplosionDef);
-		float aFallDef = (float) GregTech_API.sModularArmor.get( mConfigName, "FallDef", 0.0f);
-		float aRadiationDef = (float) GregTech_API.sModularArmor.get( mConfigName, "RadiationDef", 0.0f);
-		float aElectricDef = (float) GregTech_API.sModularArmor.get( mConfigName, "ElectricalDef", 0.0f);
-		float aWitherDef = (float) GregTech_API.sModularArmor.get( mConfigName, "WitherDef", 0.0f);
-		addStats(aPhysicalDef, aProjectileDef, aFireDef, aMagicDef, aExplosionDef, aFallDef, aRadiationDef, aElectricDef, aWitherDef);
-	}
-	
-	public void addStats(float aPhysicalDef, float aProjectileDef, float aFireDef, float aMagicDef, float aExplosionDef, float aFallDef, float aRadiationDef, float aElectricDef, float aWitherDef){
-		mStat.put(StatType.FALLDEFENCE, aFallDef);
-		mStat.put(StatType.PHYSICALDEFENCE, aPhysicalDef);
-		mStat.put(StatType.PROJECTILEDEFENCE, aProjectileDef);
-		mStat.put(StatType.FIREDEFENCE, aFireDef);
-		mStat.put(StatType.MAGICDEFENCE, aMagicDef);
-		mStat.put(StatType.EXPLOSIONDEFENCE, aExplosionDef);
-		mStat.put(StatType.RADIATIONDEFENCE, aRadiationDef);
-		mStat.put(StatType.ELECTRICALDEFENCE, aElectricDef);
-		mStat.put(StatType.WITHERDEFENCE, aWitherDef);
-	}
-
-	@Override
-	public void calculateArmor(ArmorData aArmorData) {
-		calDefAdd(StatType.FALLDEFENCE, aArmorData);
-		calDef(StatType.PHYSICALDEFENCE, aArmorData);
-		calDef(StatType.PROJECTILEDEFENCE, aArmorData);
-		calDef(StatType.FIREDEFENCE, aArmorData);
-		calDef(StatType.MAGICDEFENCE, aArmorData);
-		calDef(StatType.EXPLOSIONDEFENCE, aArmorData);
-		calDef(StatType.RADIATIONDEFENCE, aArmorData);
-		calDef(StatType.ELECTRICALDEFENCE, aArmorData);
-		calDef(StatType.WITHERDEFENCE, aArmorData);
-		addVal(StatType.WEIGHT, aArmorData);
-		if(mType!=null)addVal(mType, aArmorData);
-	}
-	
-	public void calDef(StatType aType, ArmorData aArmorData){
-		float tArmorDef = 0.0f;
-		if(aArmorData.mStat.containsKey(aType)){
-		tArmorDef = aArmorData.mStat.get(aType);
-		aArmorData.mStat.remove(aType);}
-		float tComponentDef = mStat.get(aType);
-		aArmorData.mStat.put(aType, tArmorDef + ((1.0f -tArmorDef) * tComponentDef));
-	}
-	
-	public void calDefAdd(StatType aType, ArmorData aArmorData){
-		float tArmorDef = 0.0f;
-		if(aArmorData.mStat.containsKey(aType)){
-		tArmorDef = aArmorData.mStat.get(aType);
-		aArmorData.mStat.remove(aType);}
-		float tComponentDef = mStat.get(aType);
-		aArmorData.mStat.put(aType, tArmorDef + tComponentDef);
-	}
-
-}
diff --git a/src/main/java/gregtech/common/items/armor/components/IArmorComponent.java b/src/main/java/gregtech/common/items/armor/components/IArmorComponent.java
deleted file mode 100644
index 340601b354..0000000000
--- a/src/main/java/gregtech/common/items/armor/components/IArmorComponent.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package gregtech.common.items.armor.components;
-
-import gregtech.common.items.armor.ArmorData;
-import net.minecraft.item.ItemStack;
-
-public interface IArmorComponent {
-
-	boolean isArmorComponent(ItemStack aStack);
-	
-	void calculateArmor(ArmorData aArmorData);
-}
diff --git a/src/main/java/gregtech/common/items/armor/components/LoadArmorComponents.java b/src/main/java/gregtech/common/items/armor/components/LoadArmorComponents.java
deleted file mode 100644
index bea0e2b5b4..0000000000
--- a/src/main/java/gregtech/common/items/armor/components/LoadArmorComponents.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package gregtech.common.items.armor.components;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-
-public class LoadArmorComponents {
-	public static void init(){
-		
-		new ArmorPlating("plateRubber", "plateRubber", 					 60, 0.06f, 0.06f, 0.02f, 0.10f, 0.10f, 2f, 0f, .25f, 0f);
-		new ArmorPlating("plateWood", "plateWood", 						 80, 0.08f, 0.09f, 0.02f, 0.08f, 0.08f);
-		new ArmorPlating("plateBrass", "plateBrass", 					140, 0.12f, 0.12f, 0.10f, 0.10f, 0.12f);
-		new ArmorPlating("plateCopper", "plateCopper", 					140, 0.11f, 0.11f, 0.10f, 0.10f, 0.11f);
-		new ArmorPlating("plateLead", "plateLead", 						280, 0.05f, 0.05f, 0.05f, 0.05f, 0.05f, 0, .3f, 0, 0);
-		new ArmorPlating("platePlastic", "platePlastic", 			 	60, 0.10f, 0.10f, 0.02f, 0.02f, 0.10f, 0, 0, .25f, 0);
-		new ArmorPlating("plateAluminium", "plateAluminium",			120, 0.14f, 0.14f, 0.12f, 0.12f, 0.14f);
-		new ArmorPlating("plateAstralSilver", "plateAstralSilver", 		180, 0.10f, 0.10f, 0.10f, 0.18f, 0.10f);
-		new ArmorPlating("plateBismuthBronze", "plateBismuthBronze", 	160, 0.12f, 0.12f, 0.10f, 0.10f, 0.12f);
-		new ArmorPlating("plateBlackBronze", "plateBlackBronze", 		160, 0.13f, 0.13f, 0.10f, 0.10f, 0.13f);
-		new ArmorPlating("plateBlackSteel", "plateBlackSteel", 			200, 0.19f, 0.19f, 0.17f, 0.17f, 0.19f);
-		new ArmorPlating("plateBlueSteel", "plateBlueSteel", 			200, 0.21f, 0.21f, 0.19f, 0.19f, 0.21f);
-		new ArmorPlating("plateBronze", "plateBronze", 					160, 0.13f, 0.13f, 0.12f, 0.12f, 0.13f);
-		new ArmorPlating("plateCobaltBrass", "plateCobaltBrass", 		180, 0.15f, 0.15f, 0.14f, 0.14f, 0.15f);
-		new ArmorPlating("plateDamascusSteel", "plateDamascusSteel", 	200, 0.22f, 0.22f, 0.20f, 0.20f, 0.22f);
-		new ArmorPlating("plateElectrum", "plateElectrum", 				250, 0.11f, 0.11f, 0.10f, 0.10f, 0.11f);
-		new ArmorPlating("plateEmerald", "plateEmerald", 				160, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateGold", "plateGold", 						300, 0.09f, 0.09f, 0.05f, 0.25f, 0.09f);
-		new ArmorPlating("plateGreenSapphire", "plateGreenSapphire", 	160, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateInvar", "plateInvar", 					190, 0.10f, 0.10f, 0.22f, 0.22f, 0.10f);
-		new ArmorPlating("plateIron", "plateIron", 						200, 0.12f, 0.12f, 0.10f, 0.10f, 0.12f);
-		new ArmorPlating("plateIronWood", "plateIronWood", 				150, 0.17f, 0.17f, 0.02f, 0.02f, 0.17f);
-		new ArmorPlating("plateMagnalium", "plateMagnalium", 			120, 0.15f, 0.15f, 0.17f, 0.17f, 0.15f);
-		new ArmorPlating("plateNeodymiumMagnetic","plateNeodymiumMagnetic",220, 0.14f, 0.14f, 0.14f, 0.14f, 0.14f, 0, 0, 0, 0, StatType.MAGNETSINGLE, 2.0f);
-		new ArmorPlating("plateManganese", "plateManganese", 			180, 0.15f, 0.15f, 0.14f, 0.14f, 0.15f);
-		new ArmorPlating("plateMeteoricIron", "plateMeteoricIron", 		200, 0.18f, 0.18f, 0.16f, 0.16f, 0.18f);
-		new ArmorPlating("plateMeteoricSteel", "plateMeteoricSteel", 	200, 0.21f, 0.21f, 0.19f, 0.19f, 0.21f);
-		new ArmorPlating("plateMolybdenum", "plateMolybdenum", 			140, 0.14f, 0.14f, 0.14f, 0.14f, 0.14f);
-		new ArmorPlating("plateNickel", "plateNickel", 					180, 0.12f, 0.12f, 0.15f, 0.15f, 0.12f);
-		new ArmorPlating("plateOlivine", "plateOlivine", 				180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateOpal", "plateOpal", 						180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("platePalladium", "platePalladium", 			280, 0.14f, 0.14f, 0.12f, 0.12f, 0.14f);
-		new ArmorPlating("platePlatinum", "platePlatinum", 				290, 0.15f, 0.15f, 0.13f, 0.13f, 0.15f);
-		new ArmorPlating("plateGarnetRed", "plateGarnetRed", 			180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateRedSteel", "plateRedSteel", 				200, 0.20f, 0.20f, 0.18f, 0.18f, 0.20f);
-		new ArmorPlating("plateRoseGold", "plateRoseGold", 				240, 0.10f, 0.10f, 0.08f, 0.18f, 0.10f);
-		new ArmorPlating("plateRuby", "plateRuby", 						180, 0.10f, 0.10f, 0.20f, 0.20f, 0.10f);
-		new ArmorPlating("plateSapphire", "plateSapphire", 				180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateSilver", "plateSilver", 					220, 0.11f, 0.11f, 0.07f, 0.24f, 0.11f);
-		new ArmorPlating("plateStainlessSteel", "plateStainlessSteel", 	200, 0.16f, 0.16f, 0.21f, 0.21f, 0.16f);
-		new ArmorPlating("plateSteel", "plateSteel", 					200, 0.18f, 0.18f, 0.16f, 0.16f, 0.18f);
-		new ArmorPlating("plateSterlingSilver", "plateSterlingSilver", 	210, 0.15f, 0.15f, 0.13f, 0.13f, 0.15f);
-		new ArmorPlating("plateTanzanite", "plateTanzanite", 			180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateThorium", "plateThorium", 				280, 0.13f, 0.13f, 0.16f, 0.16f, 0.13f);
-		new ArmorPlating("plateWroughtIron", "plateWroughtIron", 		200, 0.14f, 0.14f, 0.12f, 0.12f, 0.14f);
-		new ArmorPlating("plateGarnetYellow", "plateGarnetYellow", 		180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateAlloyCarbon", "plateAlloyCarbon", 		 60, 0.06f, 0.23f, 0.05f, 0.05f, 0.06f);
-		new ArmorPlating("plateInfusedAir", "plateInfusedAir", 			 10, 0.10f, 0.10f, 0.10f, 0.10f, 0.10f);
-		new ArmorPlating("plateAmethyst", "plateAmethyst", 				180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateInfusedWater", "plateInfusedWater", 		150, 0.10f, 0.10f, 0.20f, 0.20f, 0.10f);
-		new ArmorPlating("plateBlueTopaz", "plateBlueTopaz", 			180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateChrome", "plateChrome", 					200, 0.12f, 0.12f, 0.21f, 0.21f, 0.12f);
-		new ArmorPlating("plateCobalt", "plateCobalt", 					220, 0.16f, 0.16f, 0.14f, 0.14f, 0.16f);
-		new ArmorPlating("plateDarkIron", "plateDarkIron", 				200, 0.21f, 0.21f, 0.19f, 0.19f, 0.21f);
-		new ArmorPlating("plateDiamond", "plateDiamond", 				200, 0.20f, 0.20f, 0.22f, 0.22f, 0.20f);
-		new ArmorPlating("plateEnderium", "plateEnderium", 				250, 0.22f, 0.22f, 0.21f, 0.21f, 0.22f);
-		new ArmorPlating("plateElectrumFlux", "plateElectrumFlux", 		180, 0.19f, 0.19f, 0.16f, 0.16f, 0.19f);
-		new ArmorPlating("plateForce", "plateForce", 					180, 0.10f, 0.10f, 0.20f, 0.20f, 0.10f);
-		new ArmorPlating("plateHSLA", "plateHSLA", 						200, 0.21f, 0.21f, 0.17f, 0.17f, 0.21f);
-		new ArmorPlating("plateInfusedFire", "plateInfusedFire", 		150, 0.12f, 0.10f, 0.30f, 0.30f, 0.12f, 0, 0, 0, 0, StatType.THORNSSINGLE, 3.0f);
-		new ArmorPlating("plateInfusedGold", "plateInfusedGold", 		300, 0.15f, 0.15f, 0.05f, 0.05f, 0.15f);
-		new ArmorPlating("plateMithril", "plateMithril", 				200, 0.25f, 0.25f, 0.10f, 0.30f, 0.25f);
-		new ArmorPlating("plateInfusedOrder", "plateInfusedOrder", 		150, 0.18f, 0.22f, 0.22f, 0.25f, 0.22f);
-		new ArmorPlating("plateSteeleaf", "plateSteeleaf", 				120, 0.16f, 0.16f, 0.06f, 0.06f, 0.16f);
-		new ArmorPlating("plateInfusedEarth", "plateInfusedEarth", 		350, 0.30f, 0.30f, 0.30f, 0.30f, 0.30f);
-		new ArmorPlating("plateThaumium", "plateThaumium", 				200, 0.18f, 0.19f, 0.20f, 0.30f, 0.18f);
-		new ArmorPlating("plateTitanium", "plateTitanium", 				140, 0.20f, 0.20f, 0.18f, 0.18f, 0.20f);
-		new ArmorPlating("plateTungsten", "plateTungsten", 				270, 0.27f, 0.26f, 0.23f, 0.26f, 0.26f);
-		new ArmorPlating("plateUltimet", "plateTopaz", 					180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateUltimet", "plateUltimet", 				180, 0.21f, 0.21f, 0.19f, 0.19f, 0.21f);
-		new ArmorPlating("plateUranium", "plateUranium", 				290, 0.27f, 0.23f, 0.20f, 0.15f, 0.21f);
-		new ArmorPlating("plateVinteum", "plateVinteum", 				180, 0.10f, 0.12f, 0.14f, 0.28f, 0.12f);
-		new ArmorPlating("plateDuranium", "plateDuranium", 				140, 0.24f, 0.24f, 0.24f, 0.24f, 0.24f);
-		new ArmorPlating("plateAlloyIridium", "plateAlloyIridium", 		220, 0.24f, 0.24f, 0.22f, 0.22f, 0.24f);
-		new ArmorPlating("plateOsmiridium", "plateOsmiridium", 			240, 0.18f, 0.18f, 0.16f, 0.16f, 0.18f);
-		new ArmorPlating("plateOsmium", "plateOsmium", 					250, 0.12f, 0.12f, 0.10f, 0.10f, 0.12f);
-		new ArmorPlating("plateNaquadah", "plateNaquadah", 				250, 0.27f, 0.27f, 0.25f, 0.25f, 0.27f);
-		new ArmorPlating("plateNetherStar", "plateNetherStar", 			140, 0.22f, 0.22f, 0.24f, 0.24f, 0.22f, 0, 0, 0, .2f);
-		new ArmorPlating("plateInfusedEntropy", "plateInfusedEntropy", 	150, 0.10f, 0.10f, 0.10f, 0.10f, 0.10f, 0, 0, 0, 0, StatType.THORNSSINGLE, 4.0f);
-		new ArmorPlating("plateTritanium", "plateTritanium", 			140, 0.26f, 0.26f, 0.26f, 0.26f, 0.26f);
-		new ArmorPlating("plateTungstenSteel", "plateTungstenSteel", 	270, 0.30f, 0.28f, 0.25f, 0.28f, 0.30f);
-		new ArmorPlating("plateAdamantium", "plateAdamantium", 			200, 0.28f, 0.28f, 0.26f, 0.30f, 0.30f);
-		new ArmorPlating("plateNaquadahAlloy", "plateNaquadahAlloy", 	300, 0.33f, 0.33f, 0.33f, 0.33f, 0.33f);
-		new ArmorPlating("plateNeutronium", "plateNeutronium", 			600, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f);
-		
-		new ArmorComponentFunction("componentnightvision", GT_ModHandler.getIC2Item("nightvisionGoggles", 1), true, 100, StatType.NIGHTVISION, 100);
-		if(GT_ModHandler.getModItem("Thaumcraft", "ItemGoggles", 1)!=null)new ArmorComponentFunction("componentthaumicgoggles", GT_ModHandler.getModItem("Thaumcraft", "ItemGoggles", 1), true, 100, StatType.THAUMICGOGGLES, 100);
-		new ArmorComponentBattery("batteryLVLI", ItemList.Battery_RE_LV_Lithium.get(1, new Object[]{}), true, 100, 100000);
-		new ArmorComponentBattery("batteryMVLI", ItemList.Battery_RE_MV_Lithium.get(1, new Object[]{}), true, 100, 400000);
-		new ArmorComponentBattery("batteryHVLI", ItemList.Battery_RE_HV_Lithium.get(1, new Object[]{}), true, 100, 1600000);
-
-		new ArmorComponentBattery("batteryLVCA", ItemList.Battery_RE_LV_Cadmium.get(1, new Object[]{}), true, 100, 75000);
-		new ArmorComponentBattery("batteryMVCA", ItemList.Battery_RE_MV_Cadmium.get(1, new Object[]{}), true, 100, 300000);
-		new ArmorComponentBattery("batteryHVCA", ItemList.Battery_RE_HV_Cadmium.get(1, new Object[]{}), true, 100, 1200000);
-
-		new ArmorComponentBattery("batteryLVSO", ItemList.Battery_RE_LV_Sodium.get(1, new Object[]{}), true, 100, 50000);
-		new ArmorComponentBattery("batteryMVSO", ItemList.Battery_RE_MV_Sodium.get(1, new Object[]{}), true, 100, 200000);
-		new ArmorComponentBattery("batteryHVSO", ItemList.Battery_RE_HV_Sodium.get(1, new Object[]{}), true, 100, 800000);
-		
-		new ArmorComponentBattery("batterycystal", ItemList.IC2_EnergyCrystal.get(1, new Object[]{}), true, 100, 1000000);
-		new ArmorComponentBattery("batterylapotron", ItemList.IC2_LapotronCrystal.get(1, new Object[]{}), true, 100, 10000000);
-		new ArmorComponentBattery("batterylapoorb", ItemList.Energy_LapotronicOrb.get(1, new Object[]{}), true, 100, 100000000);
-		new ArmorComponentBattery("batteryorbcluster", ItemList.Energy_LapotronicOrb2.get(1, new Object[]{}), true, 100, 1000000000);
-		
-		new ArmorElectricComponent("motorlv", ItemList.Electric_Motor_LV.get(1, new Object[]{}), 20, StatType.MOTPRPOWER, 200f, StatType.MOTOREUUSAGE,  50f, StatType.PROCESSINGPOWERUSED,  10f);
-		new ArmorElectricComponent("motormv", ItemList.Electric_Motor_MV.get(1, new Object[]{}), 40, StatType.MOTPRPOWER, 300f, StatType.MOTOREUUSAGE, 100f, StatType.PROCESSINGPOWERUSED,  20f);
-		new ArmorElectricComponent("motorhv", ItemList.Electric_Motor_HV.get(1, new Object[]{}), 60, StatType.MOTPRPOWER, 400f, StatType.MOTOREUUSAGE, 200f, StatType.PROCESSINGPOWERUSED,  50f);
-		new ArmorElectricComponent("motorev", ItemList.Electric_Motor_EV.get(1, new Object[]{}), 80, StatType.MOTPRPOWER, 500f, StatType.MOTOREUUSAGE, 400f, StatType.PROCESSINGPOWERUSED, 100f);
-		new ArmorElectricComponent("motoriv", ItemList.Electric_Motor_IV.get(1, new Object[]{}),100, StatType.MOTPRPOWER, 600f, StatType.MOTOREUUSAGE, 800f, StatType.PROCESSINGPOWERUSED, 200f);
-
-		new ArmorElectricComponent("pistonlv", ItemList.Electric_Piston_LV.get(1, new Object[]{}), 20, StatType.PISTONJUMPBOOST, 3, StatType.PISTONEUUSAGE, 200f, StatType.PROCESSINGPOWERUSED,  10f);
-		new ArmorElectricComponent("pistonmv", ItemList.Electric_Piston_MV.get(1, new Object[]{}), 40, StatType.PISTONJUMPBOOST, 4, StatType.PISTONEUUSAGE, 300f, StatType.PROCESSINGPOWERUSED,  20f);
-		new ArmorElectricComponent("pistonhv", ItemList.Electric_Piston_HV.get(1, new Object[]{}), 60, StatType.PISTONJUMPBOOST, 5, StatType.PISTONEUUSAGE, 450f, StatType.PROCESSINGPOWERUSED,  50f);
-		new ArmorElectricComponent("pistonev", ItemList.Electric_Piston_EV.get(1, new Object[]{}), 80, StatType.PISTONJUMPBOOST, 6, StatType.PISTONEUUSAGE, 800f, StatType.PROCESSINGPOWERUSED, 100f);
-		new ArmorElectricComponent("pistoniv", ItemList.Electric_Piston_IV.get(1, new Object[]{}),100, StatType.PISTONJUMPBOOST, 7, StatType.PISTONEUUSAGE,1600f, StatType.PROCESSINGPOWERUSED, 200f);
-		
-		new ArmorElectricComponent("electrolyzerlv", ItemList.Machine_LV_Electrolyzer.get(1, new Object[]{}), 20, StatType.ELECTROLYZERPROD, 10, StatType.ELECTROLYZEREUUSAGE, 1, StatType.PROCESSINGPOWERUSED,  50f);
-		new ArmorElectricComponent("electrolyzermv", ItemList.Machine_MV_Electrolyzer.get(1, new Object[]{}), 40, StatType.ELECTROLYZERPROD, 20, StatType.ELECTROLYZEREUUSAGE, 4, StatType.PROCESSINGPOWERUSED,  100f);
-		new ArmorElectricComponent("electrolyzerhv", ItemList.Machine_HV_Electrolyzer.get(1, new Object[]{}), 60, StatType.ELECTROLYZERPROD, 40, StatType.ELECTROLYZEREUUSAGE, 16, StatType.PROCESSINGPOWERUSED,  150f);
-		new ArmorElectricComponent("electrolyzerev", ItemList.Machine_EV_Electrolyzer.get(1, new Object[]{}), 80, StatType.ELECTROLYZERPROD, 80, StatType.ELECTROLYZEREUUSAGE, 64, StatType.PROCESSINGPOWERUSED,  200f);
-		new ArmorElectricComponent("electrolyzeriv", ItemList.Machine_IV_Electrolyzer.get(1, new Object[]{}),100, StatType.ELECTROLYZERPROD,160, StatType.ELECTROLYZEREUUSAGE, 128, StatType.PROCESSINGPOWERUSED,  250f);
-		
-		new ArmorElectricComponent("fieldgenlv", ItemList.Field_Generator_LV.get(1, new Object[]{}), 20, StatType.FIELDGENCAP, 1, StatType.FIELDGENEUUSAGE, 1, StatType.PROCESSINGPOWERUSED,  100f);
-		new ArmorElectricComponent("fieldgenmv", ItemList.Field_Generator_MV.get(1, new Object[]{}), 40, StatType.FIELDGENCAP, 2, StatType.FIELDGENEUUSAGE, 4, StatType.PROCESSINGPOWERUSED,  200f);
-		new ArmorElectricComponent("fieldgenhv", ItemList.Field_Generator_HV.get(1, new Object[]{}), 60, StatType.FIELDGENCAP, 3, StatType.FIELDGENEUUSAGE, 16, StatType.PROCESSINGPOWERUSED,  300f);
-		new ArmorElectricComponent("fieldgenev", ItemList.Field_Generator_EV.get(1, new Object[]{}), 80, StatType.FIELDGENCAP, 4, StatType.FIELDGENEUUSAGE, 64, StatType.PROCESSINGPOWERUSED,  400f);
-		new ArmorElectricComponent("fieldgeniv", ItemList.Field_Generator_IV.get(1, new Object[]{}),100, StatType.FIELDGENCAP, 5, StatType.FIELDGENEUUSAGE, 512, StatType.PROCESSINGPOWERUSED,  500f);
-
-		new ArmorElectricComponent("cell", ItemList.Cell_Empty.get(1, new Object[]{}), 20, StatType.TANKCAP, 8000, null, 1, null,  0);
-		new ArmorElectricComponent("cellsteel", ItemList.Large_Fluid_Cell_Steel.get(1, new Object[]{}), 40, StatType.TANKCAP, 16000, null, 1, null,  0);
-		new ArmorElectricComponent("cellts", ItemList.Large_Fluid_Cell_TungstenSteel.get(1, new Object[]{}), 80, StatType.TANKCAP, 64000, null, 1, null,  0);
-
-		new ArmorElectricComponent("circuitbasic", GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1),   10, StatType.PROCESSINGPOWER, 100, null, 1, null,  1);
-		new ArmorElectricComponent("circuitgood", GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1),    20, StatType.PROCESSINGPOWER, 200, null, 1, null,  1);
-		new ArmorElectricComponent("circuitadv", GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1),30, StatType.PROCESSINGPOWER, 300, null, 1, null,  1);
-		new ArmorElectricComponent("circuitdata", GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1),    40, StatType.PROCESSINGPOWER, 400, null, 1, null,  1);
-		new ArmorElectricComponent("cicuitelite", GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1),   50, StatType.PROCESSINGPOWER, 500, null, 1, null,  1);
-		new ArmorElectricComponent("cicuitmaster", GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1),  60, StatType.PROCESSINGPOWER, 600, null, 1, null,  1);
-		
-//		if (parts[i].getItem().getUnlocalizedName().equals("gte.meta.jetpack")) {// jeptack parts
-//			switch (parts[i].getItem().getDamage(parts[i])) {
-//			case 0:
-//				def[24] += 50; // JetpackFuelPower
-//				def[25] += 1; // FuelUsage
-//				def[31] += 10;
-//				break;
-//			case 1:
-//				def[24] += 75; // JetpackFuelPower
-//				def[25] += 2; // FuelUsage
-//				def[31] += 20;
-//				break;
-//			case 2:
-//				def[24] += 100; // JetpackFuelPower
-//				def[25] += 4; // FuelUsage
-//				def[31] += 30;
-//				break;
-//			case 3:
-//				def[24] += 125; // JetpackFuelPower
-//				def[25] += 8; // FuelUsage
-//				def[31] += 40;
-//				break;
-//			case 4:
-//				def[24] += 150; // JetpackFuelPower
-//				def[25] += 16; // FuelUsage
-//				def[31] += 50;
-//				break;
-//			case 5:
-//				def[26] += 20; // JetpackEUPower
-//				def[27] += 8; // JetpackEU
-//				def[31] += 30;
-//				break;
-//			case 6:
-//				def[26] += 30; // JetpackEUPower
-//				def[27] += 16; // JetpackEU
-//				def[31] += 60;
-//				break;
-//			case 7:
-//				def[26] += 40; // JetpackEUPower
-//				def[27] += 32; // JetpackEU
-//				def[31] += 90;
-//				break;
-//			case 8:
-//				def[26] += 50; // JetpackEUPower
-//				def[27] += 64; // JetpackEU
-//				def[31] += 120;
-//				break;
-//			case 9:
-//				def[26] += 60; // JetpackEUPower
-//				def[27] += 128; // JetpackEU
-//				def[31] += 150;
-//				break;
-//			case 10:
-//				def[28] += 100; // AntiGravPower
-//				def[29] += 32; // AntiGravEU
-//				def[31] += 100;
-//				break;
-//			case 11:
-//				def[28] += 133; // AntiGravPower
-//				def[29] += 64; // AntiGravEU
-//				def[31] += 200;
-//				break;
-//			case 12:
-//				def[28] += 166; // AntiGravPower
-//				def[29] += 128; // AntiGravEU
-//				def[31] += 300;
-//				break;
-//			case 13:
-//				def[28] += 200; // AntiGravPower
-//				def[29] += 256; // AntiGravEU
-//				def[31] += 400;
-//				break;
-//			case 14:
-//				def[28] += 233; // AntiGravPower
-//				def[29] += 512; // AntiGravEU
-//				def[31] += 500;
-//				break;
-//			}
-		
-
-		int tCustomPlatings = GregTech_API.sModularArmor.get("custom", "CustomPlatings", 0);
-		int tCustomElectronicComponent = GregTech_API.sModularArmor.get("custom", "CustomElectronicComponent", 0);
-		int tCustomBattery = GregTech_API.sModularArmor.get("custom", "CustomBattery", 0);
-		int tCustomFunction = GregTech_API.sModularArmor.get("custom", "CustomFunction", 0);
-		for(int i = 0; i<tCustomPlatings; i++)
-		new ArmorPlating("customPlate"+i, "platenull_", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, null, 0);
-		
-		for(int i = 0; i<tCustomElectronicComponent; i++)
-		new ArmorElectricComponent("customElectricComponent"+i,new ItemStack(Blocks.stone),0,null,0, null, 0, null, 0);
-		
-		for(int i = 0; i<tCustomBattery; i++)
-		new ArmorComponentBattery("customBattery"+i, new ItemStack(Blocks.stone),true, 0, 0);
-		
-		for(int i = 0; i<tCustomFunction; i++)
-		new ArmorComponentFunction("customFunction"+i, new ItemStack(Blocks.stone), true, 0, null, 0);
-	}
-}
diff --git a/src/main/java/gregtech/common/items/armor/components/StatType.java b/src/main/java/gregtech/common/items/armor/components/StatType.java
deleted file mode 100644
index aacb997f9b..0000000000
--- a/src/main/java/gregtech/common/items/armor/components/StatType.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package gregtech.common.items.armor.components;
-
-public enum StatType {
-	ELECTRIC,
-	ELECTRIC2,
-	
-	FULLARMOR,
-	FULLRADIATIONARMOR,
-	FULLELECTRICARMOR,
-	
-	FALLDEFENCE,
-	PHYSICALDEFENCE,
-	PROJECTILEDEFENCE,
-	FIREDEFENCE,
-	MAGICDEFENCE,
-	EXPLOSIONDEFENCE,
-	RADIATIONDEFENCE,
-	ELECTRICALDEFENCE,
-	WITHERDEFENCE,
-
-	THORNS,
-	THORNSSINGLE,
-	MAGNET,
-	MAGNETSINGLE,
-	
-	THAUMICGOGGLES,
-	NIGHTVISION,
-	POTIONINJECTOR,
-	AUTOFEEDER,
-	
-	TANKCAP,
-	WEIGHT,
-	PROCESSINGPOWER,
-	PROCESSINGPOWERUSED,
-	PARTPROCESSING,
-	PARTPROCESSINGUSED,
-	
-	MOTPRPOWER,
-	MOTOREUUSAGE,
-	PISTONJUMPBOOST,
-	PISTONEUUSAGE,
-	ELECTROLYZERPROD,
-	ELECTROLYZEREUUSAGE,
-	FIELDGENCAP,
-	FIELDGENEUUSAGE,
-	JETPACKMAXWEIGHT,
-	ANTIGRAVMAXWEIGHT,
-	
-	PARTSCHARGE,
-	BATTERYCAPACITY;
-	
-}
diff --git a/src/main/java/gregtech/common/items/armor/gui/ContainerBasicArmor.java b/src/main/java/gregtech/common/items/armor/gui/ContainerBasicArmor.java
deleted file mode 100644
index a2ee329099..0000000000
--- a/src/main/java/gregtech/common/items/armor/gui/ContainerBasicArmor.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package gregtech.common.items.armor.gui;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class ContainerBasicArmor extends ContainerModularArmor {
-
-	public ContainerBasicArmor(EntityPlayer player, InventoryArmor aInvArmor) {
-		super(player, aInvArmor);
-	}
-	
-	public void addSlots(InventoryPlayer aInventoryPlayer) {
-		addSlotToContainer(new SlotArmor(mInvArmor, 0, 118, 6));
-		addSlotToContainer(new SlotArmor(mInvArmor, 1, 136, 6));
-		addSlotToContainer(new SlotArmor(mInvArmor, 2, 154, 6));
-		addSlotToContainer(new SlotArmor(mInvArmor, 3, 118, 24));
-		addSlotToContainer(new SlotArmor(mInvArmor, 4, 136, 24));
-		addSlotToContainer(new SlotArmor(mInvArmor, 5, 154, 24));
-		addSlotToContainer(new SlotArmor(mInvArmor, 6, 118, 42));
-		addSlotToContainer(new SlotArmor(mInvArmor, 7, 136, 42));
-		addSlotToContainer(new SlotArmor(mInvArmor, 8, 154, 42));
-
-		for (int i = 0; i < 3; i++) {
-			for (int j = 0; j < 9; j++) {
-				addSlotToContainer(new Slot(aInventoryPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
-			}
-		}
-
-		for (int i = 0; i < 9; i++) {
-			ItemStack stackInSlot = aInventoryPlayer.getStackInSlot(i);
-		    if(isIdenticalItem(mInvArmor.parent,stackInSlot)){
-				addSlotToContainer(new SlotLocked(aInventoryPlayer,i,8+i*18,142));
-			}else{
-			addSlotToContainer(new Slot(aInventoryPlayer, i, 8 + i * 18, 142));}
-		}
-	}
-
-	public int getSlotCount() {
-		return 9;
-	}
-
-	public int getShiftClickSlotCount() {
-		return 9;
-	}
-
-}
diff --git a/src/main/java/gregtech/common/items/armor/gui/ContainerElectricArmor1.java b/src/main/java/gregtech/common/items/armor/gui/ContainerElectricArmor1.java
deleted file mode 100644
index 02c8f016bb..0000000000
--- a/src/main/java/gregtech/common/items/armor/gui/ContainerElectricArmor1.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package gregtech.common.items.armor.gui;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class ContainerElectricArmor1 extends ContainerBasicArmor {
-
-	public ContainerElectricArmor1(EntityPlayer player, InventoryArmor aInvArmor) {
-		super(player, aInvArmor);
-	}
-
-	public void addSlots(InventoryPlayer aInventoryPlayer) {
-		addSlotToContainer(new SlotArmor(mInvArmor, 0, 118, 6));
-		addSlotToContainer(new SlotArmor(mInvArmor, 1, 136, 6));
-		addSlotToContainer(new SlotArmor(mInvArmor, 2, 154, 6));
-		addSlotToContainer(new SlotArmor(mInvArmor, 3, 118, 24));
-		addSlotToContainer(new SlotArmor(mInvArmor, 4, 136, 24));
-		addSlotToContainer(new SlotArmor(mInvArmor, 5, 154, 24));
-		addSlotToContainer(new SlotArmor(mInvArmor, 6, 118, 42));
-		addSlotToContainer(new SlotArmor(mInvArmor, 7, 136, 42));
-		addSlotToContainer(new SlotArmor(mInvArmor, 8, 154, 42));
-		addSlotToContainer(new SlotArmor(mInvArmor, 9, 118, 60));
-		addSlotToContainer(new SlotArmor(mInvArmor, 10, 136, 60));
-		addSlotToContainer(new SlotArmor(mInvArmor, 11, 154, 60));
-		
-		addSlotToContainer(new SlotFluid(mInvArmor,12,94,32));
-
-		for (int i = 0; i < 3; i++) {
-			for (int j = 0; j < 9; j++) {
-				addSlotToContainer(new Slot(aInventoryPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
-			}
-		}
-
-		for (int i = 0; i < 9; i++) {
-			ItemStack stackInSlot = aInventoryPlayer.getStackInSlot(i);
-		    if(isIdenticalItem(mInvArmor.parent,stackInSlot)){
-				addSlotToContainer(new SlotLocked(aInventoryPlayer,i,8+i*18,142));
-			}else{
-			addSlotToContainer(new Slot(aInventoryPlayer, i, 8 + i * 18, 142));}
-		}
-	}
-
-	public int getSlotCount() {
-		return 12;
-	}
-
-	public int getShiftClickSlotCount() {
-		return 12;
-	}
-	
-}
diff --git a/src/main/java/gregtech/common/items/armor/gui/ContainerModularArmor.java b/src/main/java/gregtech/common/items/armor/gui/ContainerModularArmor.java
deleted file mode 100644
index 1f63afac5e..0000000000
--- a/src/main/java/gregtech/common/items/armor/gui/ContainerModularArmor.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package gregtech.common.items.armor.gui;
-
-import gregtech.common.items.armor.ArmorData;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-public abstract class ContainerModularArmor extends Container {
-
-	public InventoryArmor mInvArmor;
-
-	public ContainerModularArmor(EntityPlayer player, InventoryArmor aInvArmor) {
-		this.mInvArmor = aInvArmor;
-		addSlots(player.inventory);
-	}
-	
-	public ArmorData getData(EntityPlayer aPlayer){	
-		return null;
-	}
-
-	@Override
-	public boolean canInteractWith(EntityPlayer aPlayer) {
-		return true;
-	}
-
-	public abstract void addSlots(InventoryPlayer aInventoryPlayer);
-
-	public abstract int getSlotCount();
-
-	public abstract int getShiftClickSlotCount();
-
-	public void saveInventory(EntityPlayer entityplayer) {
-		mInvArmor.onGuiSaved(entityplayer);
-	}
-
-	@Override
-	public void onContainerClosed(EntityPlayer player) {
-		super.onContainerClosed(player);
-		if (!player.worldObj.isRemote) {
-			saveInventory(player);
-		}
-	}
-
-	@Override
-	public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) {
-		if (player == null) {
-			return null;
-		}
-
-		ItemStack originalStack = null;
-		Slot slot = (Slot) inventorySlots.get(slotIndex);
-		int numSlots = inventorySlots.size();
-		if (slot != null && slot.getHasStack()) {
-			ItemStack stackInSlot = slot.getStack();
-			originalStack = stackInSlot.copy();
-			if (slotIndex >= numSlots - 9 * 4 && tryShiftItem(stackInSlot, numSlots)) {
-			} else if (slotIndex >= numSlots - 9 * 4 && slotIndex < numSlots - 9) {
-				if (!shiftItemStack(stackInSlot, numSlots - 9, numSlots)) {
-					return null;
-				}
-			} else if (slotIndex >= numSlots - 9 && slotIndex < numSlots) {
-				if (!shiftItemStack(stackInSlot, numSlots - 9 * 4, numSlots - 9)) {
-					return null;
-				}
-			} else if (!shiftItemStack(stackInSlot, numSlots - 9 * 4, numSlots)) {
-				return null;
-			}
-			slot.onSlotChange(stackInSlot, originalStack);
-			if (stackInSlot.stackSize <= 0) {
-				slot.putStack(null);
-			} else {
-				slot.onSlotChanged();
-			}
-			if (stackInSlot.stackSize == originalStack.stackSize) {
-				return null;
-			}
-			slot.onPickupFromSlot(player, stackInSlot);
-		}
-		return originalStack;
-	}
-
-	private boolean tryShiftItem(ItemStack stackToShift, int numSlots) {
-		for (int machineIndex = 0; machineIndex < numSlots - 9 * 4; machineIndex++) {
-			Slot slot = (Slot) inventorySlots.get(machineIndex);
-			if (slot.getHasStack()) {
-				continue;
-			}
-			if(slot instanceof SlotLocked){
-				continue;
-			}
-			if(slot instanceof SlotFluid){
-				continue;
-			}
-
-			if (!slot.isItemValid(stackToShift)) {
-				continue;
-			}
-			if (shiftItemStack(stackToShift, machineIndex, machineIndex + 1)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	protected boolean shiftItemStack(ItemStack stackToShift, int start, int end) {
-		boolean changed = false;
-		if (stackToShift.isStackable()) {
-			for (int slotIndex = start; stackToShift.stackSize > 0 && slotIndex < end; slotIndex++) {
-				Slot slot = (Slot) inventorySlots.get(slotIndex);
-				ItemStack stackInSlot = slot.getStack();
-				if (stackInSlot != null && isIdenticalItem(stackInSlot, stackToShift)) {
-					int resultingStackSize = stackInSlot.stackSize + stackToShift.stackSize;
-					int max = Math.min(stackToShift.getMaxStackSize(), slot.getSlotStackLimit());
-					if (resultingStackSize <= max) {
-						stackToShift.stackSize = 0;
-						stackInSlot.stackSize = resultingStackSize;
-						slot.onSlotChanged();
-						changed = true;
-					} else if (stackInSlot.stackSize < max) {
-						stackToShift.stackSize -= max - stackInSlot.stackSize;
-						stackInSlot.stackSize = max;
-						slot.onSlotChanged();
-						changed = true;
-					}
-				}
-			}
-		}
-		if (stackToShift.stackSize > 0) {
-			for (int slotIndex = start; stackToShift.stackSize > 0 && slotIndex < end; slotIndex++) {
-				Slot slot = (Slot) inventorySlots.get(slotIndex);
-				ItemStack stackInSlot = slot.getStack();
-				if (stackInSlot == null) {
-					int max = Math.min(stackToShift.getMaxStackSize(), slot.getSlotStackLimit());
-					stackInSlot = stackToShift.copy();
-					stackInSlot.stackSize = Math.min(stackToShift.stackSize, max);
-					stackToShift.stackSize -= stackInSlot.stackSize;
-					slot.putStack(stackInSlot);
-					slot.onSlotChanged();
-					changed = true;
-				}
-			}
-		}
-		return changed;
-	}
-
-	public static boolean isIdenticalItem(ItemStack lhs, ItemStack rhs) {
-		if (lhs == null || rhs == null) {
-			return false;
-		}
-
-		if (lhs.getItem() != rhs.getItem()) {
-			return false;
-		}
-
-		if (lhs.getItemDamage() != OreDictionary.WILDCARD_VALUE) {
-			if (lhs.getItemDamage() != rhs.getItemDamage()) {
-				return false;
-			}
-		}
-
-		return ItemStack.areItemStackTagsEqual(lhs, rhs);
-	}
-
-}
diff --git a/src/main/java/gregtech/common/items/armor/gui/FluidSync.java b/src/main/java/gregtech/common/items/armor/gui/FluidSync.java
deleted file mode 100644
index 0e17a82ee8..0000000000
--- a/src/main/java/gregtech/common/items/armor/gui/FluidSync.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package gregtech.common.items.armor.gui;
-
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
-public class FluidSync /**implements IPacket**/ {
-	String playerName;
-	int amount;
-	String fluid;
-
-//	@Override
-	public byte getPacketID() {
-		return 0;
-	}
-
-	public FluidSync(String player, int amount, String fluid) {
-		this.playerName = player;
-		this.amount = amount;
-		this.fluid = fluid.toLowerCase();
-	}
-
-//	@Override
-	public ByteArrayDataOutput encode() {
-		ByteArrayDataOutput rOut = ByteStreams.newDataOutput(4);
-		rOut.writeUTF(playerName + ";" + amount + ";" + fluid);
-		return rOut;
-	}
-
-//	@Override
-//	public IPacket decode(ByteArrayDataInput aData) {
-//		String tmp = aData.readUTF();
-//		String[] tmp2 = tmp.split(";");
-//		return new FluidSync(tmp2[0], Integer.parseInt(tmp2[1]), tmp2[2].toLowerCase());
-//	}
-//
-//	@Override
-//	public void process(IBlockAccess aWorld, INetworkHandler aNetworkHandler) {
-//		WorldServer[] worlds = DimensionManager.getWorlds();
-//		EntityPlayer tmp;
-//		for (int i = 0; i < worlds.length; i++) {
-//			tmp = worlds[i].getPlayerEntityByName(playerName);
-//			if (tmp != null) {
-//				try {
-//					if (fluid.equals("null")) {
-//						tmp.openContainer.getSlot(12).putStack(null);
-//					} else {
-//						tmp.openContainer.getSlot(12).putStack(UT.Fluids.display(new FluidStack(FluidRegistry.getFluid(fluid), amount), true));
-//					}
-//					tmp.openContainer.detectAndSendChanges();
-//				} catch (Exception e) {
-//					e.printStackTrace();
-//				}
-//
-//			}
-//		}
-//	}
-
-}
diff --git a/src/main/java/gregtech/common/items/armor/gui/FluidSync2.java b/src/main/java/gregtech/common/items/armor/gui/FluidSync2.java
deleted file mode 100644
index 6882e67268..0000000000
--- a/src/main/java/gregtech/common/items/armor/gui/FluidSync2.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package gregtech.common.items.armor.gui;
-
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
-public class FluidSync2 /**implements IPacket**/ {
-	String playerName;
-
-//	@Override
-	public byte getPacketID() {
-		return 1;
-	}
-
-	public FluidSync2(String player) {
-		this.playerName = player;
-	}
-
-//	@Override
-	public ByteArrayDataOutput encode() {
-		ByteArrayDataOutput rOut = ByteStreams.newDataOutput(4);
-		rOut.writeUTF(playerName);
-		return rOut;
-	}
-
-//	@Override
-//	public IPacket decode(ByteArrayDataInput aData) {
-//		return new FluidSync2(aData.readUTF());
-//	}
-//
-//	@Override
-//	public void process(IBlockAccess aWorld, INetworkHandler aNetworkHandler) {
-//		WorldServer[] worlds = DimensionManager.getWorlds();
-//		EntityPlayer tmp;
-//		for (int i = 0; i < worlds.length; i++) {
-//			tmp = worlds[i].getPlayerEntityByName(playerName);
-//			if (tmp != null) {
-//				try {
-//						ItemStack tmp2 = tmp.inventory.getItemStack();
-//						ItemStack tmp3 = UT.Fluids.getContainerForFilledItem(tmp2, true);
-//						if (tmp2.stackSize <= 1) {
-//							tmp2 = null;
-//						} else {
-//							tmp2.stackSize--;
-//						}
-//						tmp.inventory.setItemStack(tmp2);
-//						if(tmp3!=null){
-//						tmp3.stackSize=1;	
-//						tmp.inventory.addItemStackToInventory(tmp3);}
-//				} catch (Exception e) {
-//					e.printStackTrace();
-//				}
-//
-//			}
-//		}
-//	}
-
-}
diff --git a/src/main/java/gregtech/common/items/armor/gui/GuiElectricArmor1.java b/src/main/java/gregtech/common/items/armor/gui/GuiElectricArmor1.java
deleted file mode 100644
index b1e08bc708..0000000000
--- a/src/main/java/gregtech/common/items/armor/gui/GuiElectricArmor1.java
+++ /dev/null
@@ -1,330 +0,0 @@
-package gregtech.common.items.armor.gui;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.items.armor.components.StatType;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
-
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-@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);
-	}
-
-	@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);
-	}
-
-	@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;
-		}
-		//Draw active tab
-		switch(tab){
-		case 0:
-			break;
-		case 1:
-			drawTexturedModalRect(xStart + 7, yStart + 14, 2, 167, 104, 54);
-			break;
-		case 2:
-			drawTexturedModalRect(xStart + 7, yStart + 14, 107, 167, 104, 54);
-			break;
-		default:
-			break;
-		}
-		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);
-		}
-		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);
-		}
-		
-		
-	}
-
-	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();}
-			}
-		}
-//		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);
-	}
-	
-	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!");
-		}
-		if(x>=56&&y>=11&&x<=112&&y<=17){
-			list.add("Stored Energy: "+seperateNumber(cont.mInvArmor.data.charge)+" EU");
-		}
-		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(tab==0){
-			if(x>=93&&y>=36&&x<=110&&y<=71){list.add("Tank Capacity: "+cont.mInvArmor.data.mStat.get(StatType.TANKCAP)+"L");
-			}
-			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));
-			}
-		}else if(tab==1){
-			
-		}else{
-					if (x >= 28 && x <= 58) {
-			if (y >= 25 && y <= 32) {
-				list.add(GT_LanguageManager.getTranslation("Physical Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.PHYSICALDEFENCE) * 1000) / 10.0) + "%");
-			} else if (y >= 33 && y <= 41) {
-				list.add(GT_LanguageManager.getTranslation("Projectile Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.PROJECTILEDEFENCE) * 1000) / 10.0) + "%");
-			} else if (y >= 42 && y <= 50) {
-				list.add(GT_LanguageManager.getTranslation("Fire Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.FIREDEFENCE) * 1000) / 10.0) + "%");
-			} else if (y >= 51 && y <= 59) {
-				list.add(GT_LanguageManager.getTranslation("Magical Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.MAGICDEFENCE) * 1000) / 10.0) + "%");
-			} else if (y >= 60 && y <= 68) {
-				list.add(GT_LanguageManager.getTranslation("Explosion Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.EXPLOSIONDEFENCE) * 1000) / 10.0) + "%");
-			}
-		} else if (x >= 59 && x <= 90) {
-			if (y >= 25 && y <= 32) {
-				list.add(GT_LanguageManager.getTranslation("Radiation Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.RADIATIONDEFENCE) * 1000) / 10.0) + "%");
-				if(cont.mInvArmor.data.mBStat.get(StatType.FULLRADIATIONARMOR)){
-				list.add(GT_LanguageManager.getTranslation("Radiation Immunity"));}
-			} else if (y >= 33 && y <= 41) {
-				list.add(GT_LanguageManager.getTranslation("Electrical Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.ELECTRICALDEFENCE) * 1000) / 10.0) + "%");
-				if(cont.mInvArmor.data.mBStat.get(StatType.FULLELECTRICARMOR)){
-					list.add(GT_LanguageManager.getTranslation("Electric Immunity"));}
-			} else if (y >= 42 && y <= 50) {
-				list.add(GT_LanguageManager.getTranslation("Wither Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.WITHERDEFENCE) * 1000) / 10.0) + "%");
-			} else if (y >= 51 && y <= 59) {
-				if(cont.mInvArmor.data.type!=3){
-					list.add(GT_LanguageManager.getTranslation("Fall Damage absorbtion"));
-					list.add(GT_LanguageManager.getTranslation("Only for Boots"));
-				}else{
-				list.add(GT_LanguageManager.getTranslation("Absorbs") + " " + (int) Math.round(cont.mInvArmor.data.mStat.get(StatType.FALLDEFENCE)) + GT_LanguageManager.getTranslation("m of Fall Damage"));}
-			} else if (y >= 60 && y <= 68) {
-				if(x<69){
-				list.add(GT_LanguageManager.getTranslation("Thorns") + ": " + (int) Math.round(cont.mInvArmor.data.mStat.get(StatType.THORNSSINGLE)) + " Dmg");
-				list.add(GT_LanguageManager.getTranslation("Total Thorns") + ": " + (int) Math.round(cont.mInvArmor.data.mStat.get(StatType.THORNS)) + " Dmg");
-				}else{
-				list.add(GT_LanguageManager.getTranslation("Magnet") + ": " + cont.mInvArmor.data.mStat.get(StatType.MAGNETSINGLE) + " m");
-				list.add(GT_LanguageManager.getTranslation("Total Magnet") + ": " + cont.mInvArmor.data.mStat.get(StatType.MAGNET) + " m");}
-			}
-		}
-		}
-		if (!list.isEmpty())
-			drawHoveringText(list, x, y, fontRendererObj);
-	}
-	
-	public void drawBars(int x, int y, float value) {
-
-		int bar = (int) Math.floor(18 * value);
-		int xStart = (width - xSize) / 2;
-		int yStart = (height - ySize) / 2;
-		xStart += 8;
-		yStart += 1;
-		drawTexturedModalRect(xStart + x, yStart + y, 217, 26, bar, 5);
-		drawTexturedModalRect(xStart+ bar + x, yStart + y, 197+bar, 26, 18-bar, 5);
-	}
-
-	protected Slot getSlotAtPosition(int p_146975_1_, int p_146975_2_) {
-		for (int k = 0; k < cont.inventorySlots.size(); ++k) {
-			Slot slot = (Slot) cont.inventorySlots.get(k);
-			if (this.isMouseOverSlot(slot, p_146975_1_, p_146975_2_)) {
-				return slot;
-			}
-		}
-		return null;
-	}
-
-	private boolean isMouseOverSlot(Slot p_146981_1_, int p_146981_2_, int p_146981_3_) {
-		return this.func_146978_c(p_146981_1_.xDisplayPosition, p_146981_1_.yDisplayPosition, 16, 16, p_146981_2_, p_146981_3_);
-	}
-}
diff --git a/src/main/java/gregtech/common/items/armor/gui/GuiModularArmor.java b/src/main/java/gregtech/common/items/armor/gui/GuiModularArmor.java
deleted file mode 100644
index 9d552f4d2c..0000000000
--- a/src/main/java/gregtech/common/items/armor/gui/GuiModularArmor.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package gregtech.common.items.armor.gui;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.items.armor.components.StatType;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@SideOnly(Side.CLIENT)
-public class GuiModularArmor extends GuiContainer {
-	ContainerModularArmor cont;
-	EntityPlayer player;
-
-	public GuiModularArmor(ContainerModularArmor containerModularArmor,EntityPlayer aPlayer) {
-		super(containerModularArmor);
-		cont = containerModularArmor;
-		this.player = aPlayer;
-	}
-
-	@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);
-	}
-
-	protected void drawTooltip(int x, int y) {
-		List<String> list = new ArrayList<String>();
-		if (x >= 10 && x <= 17) {
-			if (y >= 20 && y <= 27) {
-				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!");
-			} else if (y >= 29 && y <= 36) {
-				list.add(GT_LanguageManager.getTranslation("Physical Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.PHYSICALDEFENCE) * 1000) / 10.0) + "%");
-			} else if (y >= 38 && y <= 45) {
-				list.add(GT_LanguageManager.getTranslation("Projectile Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.PROJECTILEDEFENCE) * 1000) / 10.0) + "%");
-			} else if (y >= 47 && y <= 54) {
-				list.add(GT_LanguageManager.getTranslation("Fire Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.FIREDEFENCE) * 1000) / 10.0) + "%");
-			} else if (y >= 56 && y <= 63) {
-				list.add(GT_LanguageManager.getTranslation("Magic Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.MAGICDEFENCE) * 1000) / 10.0) + "%");
-			} else if (y >= 65 && y <= 72) {
-				list.add(GT_LanguageManager.getTranslation("Explosion Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.EXPLOSIONDEFENCE) * 1000) / 10.0) + "%");
-			}
-		} else if (x >= 59 && x <= 66) {
-			if (y >= 20 && y <= 27) {
-				list.add(GT_LanguageManager.getTranslation("Thorns") + ": " + (int) Math.round(cont.mInvArmor.data.mStat.get(StatType.THORNSSINGLE)) + " Dmg");
-				list.add(GT_LanguageManager.getTranslation("Total Thorns") + ": " + (int) Math.round(cont.mInvArmor.data.mStat.get(StatType.THORNS)) + " Dmg");
-			} else if (y >= 29 && y <= 36) {
-				list.add(GT_LanguageManager.getTranslation("Magnet") + ": " + cont.mInvArmor.data.mStat.get(StatType.MAGNETSINGLE) + " m");
-				list.add(GT_LanguageManager.getTranslation("Total Magnet") + ": " + cont.mInvArmor.data.mStat.get(StatType.MAGNET) + " m");
-			} else if (y >= 38 && y <= 45) {
-				list.add(GT_LanguageManager.getTranslation("Radiation Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.RADIATIONDEFENCE) * 1000) / 10.0) + "%");
-				if(cont.mInvArmor.data.mBStat.get(StatType.FULLRADIATIONARMOR)){
-				list.add(GT_LanguageManager.getTranslation("Radiation Immunity"));}
-			} else if (y >= 47 && y <= 54) {
-				list.add(GT_LanguageManager.getTranslation("Electrical Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.ELECTRICALDEFENCE) * 1000) / 10.0) + "%");
-				if(cont.mInvArmor.data.mBStat.get(StatType.FULLELECTRICARMOR)){
-					list.add("Electric Immunity");}
-			} else if (y >= 56 && y <= 63) {
-				list.add(GT_LanguageManager.getTranslation("Wither Defence") + ": " + (Math.round(cont.mInvArmor.data.mStat.get(StatType.WITHERDEFENCE) * 1000) / 10.0) + "%");
-			} else if (y >= 65 && y <= 72) {
-				if(cont.mInvArmor.data.type!=3){
-					list.add(GT_LanguageManager.getTranslation("Fall Damage absorbtion"));
-					list.add(GT_LanguageManager.getTranslation("Only for Boots"));
-				}else{
-				list.add(GT_LanguageManager.getTranslation("Absorbs") + " " + (int) Math.round(cont.mInvArmor.data.mStat.get(StatType.FALLDEFENCE)) + GT_LanguageManager.getTranslation("m of Fall Damage"));}
-			}
-		}
-		if (!list.isEmpty())
-			drawHoveringText(list, x, y, fontRendererObj);
-	}
-
-	@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/armorgui3x3.png"));
-		int xStart = (width - xSize) / 2;
-		int yStart = (height - ySize) / 2;
-		drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize);
-
-		switch (cont.mInvArmor.data.type) {
-		case 0:
-			drawTexturedModalRect(xStart + 124, yStart + 67, 177, 10, 10, 9);
-			break;
-		case 1:
-			drawTexturedModalRect(xStart + 134, yStart + 67, 187, 10, 10, 9);
-			break;
-		case 2:
-			drawTexturedModalRect(xStart + 144, yStart + 67, 197, 10, 10, 9);
-			break;
-		case 3:
-			drawTexturedModalRect(xStart + 154, yStart + 67, 207, 10, 10, 9);
-			break;
-		default:
-			break;
-		}
-		
-		// Weight: 10, 15 =191, 20
-		if(getF(StatType.WEIGHT)>0){
-			drawTexturedModalRect(xStart + 10, yStart + 15, 191, 20, 7, 7);
-		}
-		// Physical Def: 10, 24 =191, 29
-		if(getF(StatType.PHYSICALDEFENCE)>0){
-			drawTexturedModalRect(xStart + 10, yStart + 24, 191, 29, 7, 7);
-		}
-		// Projectile Def: 10, 33 =191, 38
-		if(getF(StatType.PROJECTILEDEFENCE)>0){
-			drawTexturedModalRect(xStart + 10, yStart + 33, 191, 38, 7, 7);
-		}
-		// Fire Def: 10, 42 =191, 47
-		if(getF(StatType.FIREDEFENCE)>0){
-			drawTexturedModalRect(xStart + 10, yStart + 42, 191, 47, 7, 7);
-		}
-		// Magic Def: 10, 51 =191, 56
-		if(getF(StatType.MAGICDEFENCE)>0){
-			drawTexturedModalRect(xStart + 10, yStart + 51, 191, 56, 7, 7);
-		}
-		// Explosive Def: 10, 60 =191, 65
-		if(getF(StatType.EXPLOSIONDEFENCE)>0){
-			drawTexturedModalRect(xStart + 10, yStart + 60, 191, 65, 7, 7);
-		}
-		// Thorns: 59, 15 =198, 20
-		if(getF(StatType.THORNS)>0){
-			drawTexturedModalRect(xStart + 59, yStart + 15, 198, 20, 7, 7);
-		}
-		// Magnet: 59, 24 =198, 29
-		if(getF(StatType.MAGNETSINGLE)>0){
-			drawTexturedModalRect(xStart + 59, yStart + 24, 198, 29, 7, 7);
-		}
-		// Radiation Def: 59, 33 =198, 38
-		if(getF(StatType.RADIATIONDEFENCE)>0){
-			drawTexturedModalRect(xStart + 59, yStart + 33, 198, 38, 7, 7);
-		}
-		// Electric Def: 59, 42 =198, 47
-		if(getF(StatType.ELECTRICALDEFENCE)>0){
-			drawTexturedModalRect(xStart + 59, yStart + 42, 198, 47, 7, 7);
-		}
-		// Wither Def: 59, 51 =198, 56
-		if(getF(StatType.WITHERDEFENCE)>0){
-			drawTexturedModalRect(xStart + 59, yStart + 51, 198, 56, 7, 7);
-		}
-		// Fall Reduction: 59, 60 =198, 65
-		if(getF(StatType.FALLDEFENCE)>0){
-			drawTexturedModalRect(xStart + 59, yStart + 60, 198, 65, 7, 7);
-		}
-
-		drawBars(10, 24, getF(StatType.PHYSICALDEFENCE));
-		drawBars(10, 33, getF(StatType.PROJECTILEDEFENCE));
-		drawBars(10, 42, getF(StatType.FIREDEFENCE));
-		drawBars(10, 51, getF(StatType.MAGICDEFENCE));
-		drawBars(10, 60, getF(StatType.EXPLOSIONDEFENCE));
-		drawBars(59, 33, getF(StatType.RADIATIONDEFENCE));
-		drawBars(59, 42, getF(StatType.ELECTRICALDEFENCE));
-		drawBars(59, 51, getF(StatType.WITHERDEFENCE));
-	}
-	
-	public float getF(StatType aType){
-		if(cont.mInvArmor.data.mStat.containsKey(aType))
-			return cont.mInvArmor.data.mStat.get(aType);
-		return .0f;
-	}
-
-	public void drawBars(int x, int y, float value) {
-
-		int bar = (int) Math.floor(35 * value);
-		int xStart = (width - xSize) / 2;
-		int yStart = (height - ySize) / 2;
-		xStart += 8;
-		yStart += 1;
-		//drawRect(x + xStart, y + yStart, x + bar + xStart, y + 5 + yStart, 0x8000FF00);
-		//drawRect(x + bar + xStart, y + yStart, x + 36 + xStart, y + 5 + yStart, 0x80FF0000);
-		drawTexturedModalRect(xStart + x, yStart + y, 177, 78, bar, 5);
-		drawTexturedModalRect(xStart+ bar + x, yStart + y, 177, 73, 35-bar, 5);
-	}
-	
-	protected void mouseClicked(int mouseX, int mouseY, int mouseBtn) {
-		int xStart = mouseX-((width - xSize) / 2);
-		int yStart = mouseY-((height - ySize) / 2);
-		if(yStart>67&&yStart<77){
-			if(xStart>124&&xStart<163){
-				if(xStart>124&&xStart<133&&cont.mInvArmor.data.helmet!=null){cont.mInvArmor.data.helmet.openGui=true;}
-				if(xStart>134&&xStart<143&&cont.mInvArmor.data.chestplate!=null){cont.mInvArmor.data.chestplate.openGui=true;}
-				if(xStart>144&&xStart<153&&cont.mInvArmor.data.leggings!=null){cont.mInvArmor.data.leggings.openGui=true;}
-				if(xStart>154&&xStart<163&&cont.mInvArmor.data.boots!=null){cont.mInvArmor.data.boots.openGui=true;}
-			}
-		}
-		super.mouseClicked(mouseX, mouseY, mouseBtn);
-	}
-
-}
diff --git a/src/main/java/gregtech/common/items/armor/gui/InventoryArmor.java b/src/main/java/gregtech/common/items/armor/gui/InventoryArmor.java
deleted file mode 100644
index 4615f29de5..0000000000
--- a/src/main/java/gregtech/common/items/armor/gui/InventoryArmor.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package gregtech.common.items.armor.gui;
-
-import gregtech.common.items.armor.ArmorData;
-import gregtech.common.items.armor.ModularArmor_Item;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraftforge.oredict.OreDictionary;
-
-import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
-
-public class InventoryArmor implements IInventory {
-
-	public ItemStack[] parts;
-	public ItemStack parent;
-//	float[] def = new float[32];
-	public int maxCharge;
-	public int charge;
-	public ArmorData data;
-
-	public InventoryArmor(Class<ModularArmor_Item> class1, ItemStack currentEquippedItem) {
-		this.parts = new ItemStack[16];
-		this.parent = currentEquippedItem;
-		setUID(false);
-		readFromNBT(currentEquippedItem.getTagCompound());
-//		for (int i = 0; i < def.length; i++) {
-//			def[i] = 0.0f;
-//		}
-		if(currentEquippedItem.getItem() instanceof ModularArmor_Item){
-			data = ((ModularArmor_Item)currentEquippedItem.getItem()).data;
-		}
-		
-	}
-
-	@Override
-	public int getSizeInventory() {
-		return this.parts.length;
-	}
-
-	@Override
-	public ItemStack getStackInSlot(int i) {
-		return parts[i];
-	}
-
-	@Override
-	public ItemStack decrStackSize(int i, int j) {
-		if (parts[i] == null) {
-			return null;
-		}
-
-		ItemStack product;
-		if (parts[i].stackSize <= j) {
-			product = parts[i];
-			parts[i] = null;
-//			def = ArmorCalculation.calculateArmor(parts);
-			data.calculateArmor(parts);
-			return product;
-		} else {
-			product = parts[i].splitStack(j);
-			if (parts[i].stackSize == 0) {
-				parts[i] = null;
-			}
-//			def = ArmorCalculation.calculateArmor(parts);
-			data.calculateArmor(parts);
-			return product;
-		}
-	}
-
-	@Override
-	public ItemStack getStackInSlotOnClosing(int slot) {
-		if (parts[slot] == null) {
-			return null;
-		}
-		ItemStack toReturn = parts[slot];
-		parts[slot] = null;
-		return toReturn;
-	}
-
-	@Override
-	public void setInventorySlotContents(int i, ItemStack itemstack) {
-		parts[i] = itemstack;
-//		def = ArmorCalculation.calculateArmor(parts);
-		data.calculateArmor(parts);
-	}
-
-	@Override
-	public String getInventoryName() {
-		return "container.armor";
-	}
-
-	@Override
-	public boolean hasCustomInventoryName() {
-		return true;
-	}
-
-	@Override
-	public int getInventoryStackLimit() {
-		return 1;
-	}
-
-	@Override
-	public void markDirty() {
-	}
-
-	@Override
-	public boolean isUseableByPlayer(EntityPlayer p_70300_1_) {
-		return true;
-	}
-
-	@Override
-	public void openInventory() {
-	}
-
-	@Override
-	public void closeInventory() {
-	}
-
-	@Override
-	public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) {
-		return true;
-	}
-
-	public void onGuiSaved(EntityPlayer entityplayer) {
-		parent = findParentInInventory(entityplayer);
-		if (parent != null) {
-			save();
-		}
-	}
-
-	public void save() {
-		NBTTagCompound nbt = parent.getTagCompound();
-		if (nbt == null) {
-			nbt = new NBTTagCompound();
-		}
-		writeToNBT(nbt);
-		ModularArmor_Item tmp = (ModularArmor_Item) parent.getItem();
-		tmp.data.calculateArmor(parts);
-		parent.setTagCompound(nbt);
-	}
-
-	public void writeToNBT(NBTTagCompound nbt) {
-		NBTTagList nbttaglist = new NBTTagList();
-		for (int i = 0; i < parts.length; i++) {
-			if (parts[i] != null) {
-				NBTTagCompound nbttagcompound1 = new NBTTagCompound();
-				nbttagcompound1.setByte("Slot", (byte) i);
-				parts[i].writeToNBT(nbttagcompound1);
-				nbttaglist.appendTag(nbttagcompound1);
-			}
-		}
-		nbt.setTag("Items", nbttaglist);
-	}
-
-	public ItemStack findParentInInventory(EntityPlayer player) {
-		for (int i = 0; i < player.inventory.getSizeInventory(); i++) {
-			ItemStack stack = player.inventory.getStackInSlot(i);
-			if (isIdenticalItem(stack, parent)) {
-				return stack;
-			}
-		}
-		return parent;
-	}
-
-	public static boolean isIdenticalItem(ItemStack lhs, ItemStack rhs) {
-		if (lhs == null || rhs == null) {
-			return false;
-		}
-
-		if (lhs.getItem() != rhs.getItem()) {
-			return false;
-		}
-
-		if (lhs.getItemDamage() != OreDictionary.WILDCARD_VALUE) {
-			if (lhs.getItemDamage() != rhs.getItemDamage()) {
-				return false;
-			}
-		}
-
-		return ItemStack.areItemStackTagsEqual(lhs, rhs);
-	}
-
-	public void readFromNBT(NBTTagCompound nbt) {
-		if (nbt == null) {
-			return;
-		}
-		if (nbt.hasKey("Items")) {
-			NBTTagList nbttaglist = nbt.getTagList("Items", 10);
-			parts = new ItemStack[getSizeInventory()];
-			for (int i = 0; i < nbttaglist.tagCount(); i++) {
-				NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i);
-				byte byte0 = nbttagcompound1.getByte("Slot");
-				if (byte0 >= 0 && byte0 < parts.length) {
-					parts[byte0] = ItemStack.loadItemStackFromNBT(nbttagcompound1);
-					//parts[12]= UT.Fluids.display(UT.Fluids.water(1234), true);
-				}
-			}
-		}
-
-	}
-
-	protected void setUID(boolean override) {
-		if (parent.getTagCompound() == null) {
-			parent.setTagCompound(new NBTTagCompound());
-		}
-		NBTTagCompound nbt = parent.getTagCompound();
-		if (override || !nbt.hasKey("UID")) {
-			nbt.setInteger("UID", XSTR_INSTANCE.nextInt());
-		}
-	}
-
-	public static int getOccupiedSlotCount(ItemStack itemStack) {
-		NBTTagCompound nbt = itemStack.getTagCompound();
-		if (nbt == null) {
-			return 0;
-		}
-
-		int count = 0;
-		if (nbt.hasKey("Items")) {
-			NBTTagList nbttaglist = nbt.getTagList("Items", 10);
-			for (int i = 0; i < nbttaglist.tagCount(); i++) {
-				NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i);
-				ItemStack itemStack1 = ItemStack.loadItemStackFromNBT(nbttagcompound1);
-				if (itemStack1 != null && itemStack1.stackSize > 0) {
-					count++;
-				}
-			}
-		}
-		return count;
-	}
-
-}
diff --git a/src/main/java/gregtech/common/items/armor/gui/SlotArmor.java b/src/main/java/gregtech/common/items/armor/gui/SlotArmor.java
deleted file mode 100644
index 8e6d2d41e8..0000000000
--- a/src/main/java/gregtech/common/items/armor/gui/SlotArmor.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package gregtech.common.items.armor.gui;
-
-import gregtech.common.items.armor.components.ArmorComponent;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class SlotArmor extends Slot{
-
-	public SlotArmor(IInventory par1iInventory, int par2, int par3, int par4) {
-		super(par1iInventory, par2, par3, par4);
-	}
-
-	@Override
-	public boolean isItemValid(ItemStack par1ItemStack) {
-	return ArmorComponent.mStacks.containsKey(par1ItemStack.getUnlocalizedName());
-	}
-}
diff --git a/src/main/java/gregtech/common/items/armor/gui/SlotFluid.java b/src/main/java/gregtech/common/items/armor/gui/SlotFluid.java
deleted file mode 100644
index 63e8873df9..0000000000
--- a/src/main/java/gregtech/common/items/armor/gui/SlotFluid.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package gregtech.common.items.armor.gui;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class SlotFluid extends Slot{
-
-	public SlotFluid(IInventory inventory, int slot_index, int x, int y) {
-		super(inventory, slot_index, x, y);
-	}
-	
-	@Override
-	public boolean canTakeStack(EntityPlayer p_82869_1_)
-    {
-        return false;
-    }
-	
-	@Override
-    public boolean isItemValid(ItemStack p_75214_1_)
-    {
-        return false;
-    }
-	
-}
diff --git a/src/main/java/gregtech/common/items/armor/gui/SlotLocked.java b/src/main/java/gregtech/common/items/armor/gui/SlotLocked.java
deleted file mode 100644
index 14012d7674..0000000000
--- a/src/main/java/gregtech/common/items/armor/gui/SlotLocked.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package gregtech.common.items.armor.gui;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-
-public class SlotLocked extends Slot{
-
-	public SlotLocked(IInventory par1iInventory, int par2, int par3, int par4) {
-		super(par1iInventory, par2, par3, par4);
-		}
-		@Override
-		public void onPickupFromSlot(EntityPlayer player, ItemStack itemStack) {
-		}
-		@Override
-		public boolean isItemValid(ItemStack par1ItemStack) {
-		return false;
-		}
-		@Override
-		public boolean getHasStack() {
-		return false;
-		}
-		@Override
-		public ItemStack decrStackSize(int i) {
-		return null;
-		}
-		
-		@Override
-		public boolean canTakeStack(EntityPlayer stack) {
-		return false;}
-
-}
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
index fd4b622639..cbf80619a6 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
@@ -17,8 +17,6 @@ import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.blocks.*;
 import gregtech.common.items.*;
-import gregtech.common.items.armor.ElectricModularArmor1;
-import gregtech.common.items.armor.ModularArmor_Item;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
@@ -752,19 +750,6 @@ public class GT_Loader_Item_Block_And_Fluid
             GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Void, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 16));
             GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.BloodInfusedIron, GT_ModHandler.getModItem("BloodArsenal", "blood_infused_iron", 1L, 0));
 
-            ItemList.ModularBasicHelmet.set(new ModularArmor_Item(0, 0, "modulararmor_helmet", 0));
-            ItemList.ModularBasicChestplate.set(new ModularArmor_Item(0, 1, "modulararmor_chestplate", 0));
-            ItemList.ModularBasicLeggings.set(new ModularArmor_Item(0, 2, "modulararmor_leggings", 0));
-            ItemList.ModularBasicBoots.set(new ModularArmor_Item(0, 3, "modulararmor_boots", 0));
-            ItemList.ModularElectric1Helmet.set(new ElectricModularArmor1(0, 0, "modularelectric1_helmet", 1));
-            ItemList.ModularElectric1Chestplate.set(new ElectricModularArmor1(0, 1, "modularelectric1_chestplate", 1));
-            ItemList.ModularElectric1Leggings.set(new ElectricModularArmor1(0, 2, "modularelectric1_leggings", 1));
-            ItemList.ModularElectric1Boots.set(new ElectricModularArmor1(0, 3, "modularelectric1_boots", 1));
-            ItemList.ModularElectric2Helmet.set(new ElectricModularArmor1(0, 0, "modularelectric2_helmet", 2));
-            ItemList.ModularElectric2Chestplate.set(new ElectricModularArmor1(0, 1, "modularelectric2_chestplate", 2));
-            ItemList.ModularElectric2Leggings.set(new ElectricModularArmor1(0, 2, "modularelectric2_leggings", 2));
-            ItemList.ModularElectric2Boots.set(new ElectricModularArmor1(0, 3, "modularelectric2_boots", 2));
-
             if (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateIron", true)) {
                 GT_OreDictUnificator.set(OrePrefixes.plate, Materials.Iron, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 0));
             } else {