Modular Armor configs

8 files changed, 235 insertions, 167 deletions

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index e36d897820..77e9cfaaa0 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -125,6 +125,7 @@ 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");

diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index 691e83e8e6..9633eb3950 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -171,7 +171,7 @@ public class GregTech_API {
     /**
      * The Configuration Objects
      */
-    public static GT_Config sRecipeFile = null, sMachineFile = null, sWorldgenFile = null, sMaterialProperties = null, sMaterialComponents = null, sUnification = null, sSpecialFile = null, sClientDataFile, sOPStuff = null;
+    public static GT_Config sRecipeFile = null, sMachineFile = null, sWorldgenFile = null, sModularArmor = null, sMaterialProperties = null, sMaterialComponents = null, sUnification = null, sSpecialFile = null, sClientDataFile, sOPStuff = null;
     public static int TICKS_FOR_LAG_AVERAGING = 25, MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = 100;
     /**
      * Initialized by the Block creation.
diff --git a/src/main/java/gregtech/common/items/armor/components/ArmorComponent.java b/src/main/java/gregtech/common/items/armor/components/ArmorComponent.java
index caf33a3783..1d65f973ed 100644
--- a/src/main/java/gregtech/common/items/armor/components/ArmorComponent.java
+++ b/src/main/java/gregtech/common/items/armor/components/ArmorComponent.java
@@ -5,6 +5,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
+import gregtech.api.GregTech_API;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
@@ -15,24 +18,32 @@ import net.minecraftforge.oredict.OreDictionary;
 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 aOreDict, boolean aElectric, float aWeight){
-		mOreDict = aOreDict;
+	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, aWeight);
+		mStat.put(StatType.WEIGHT, (float) GregTech_API.sModularArmor.get( mConfigName, "Weight", aWeight));
 	}
 	
-	public ArmorComponent(ItemStack aStack, boolean aElectric, float 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, aWeight);
+		mStat.put(StatType.WEIGHT, (float) GregTech_API.sModularArmor.get( mConfigName, "Weight", aWeight));
 	}
 
 	@Override
diff --git a/src/main/java/gregtech/common/items/armor/components/ArmorComponentBattery.java b/src/main/java/gregtech/common/items/armor/components/ArmorComponentBattery.java
index 52ec405e98..15946863fb 100644
--- a/src/main/java/gregtech/common/items/armor/components/ArmorComponentBattery.java
+++ b/src/main/java/gregtech/common/items/armor/components/ArmorComponentBattery.java
@@ -1,18 +1,17 @@
 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(ItemStack aStack, boolean aElectric, float aWeight, float aBatteryCapacity) {
-		super(aStack, aElectric, aWeight);
-		mStat.put(StatType.WEIGHT, aWeight);
-		mStat.put(StatType.BATTERYCAPACITY, aBatteryCapacity);
+	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.WEIGHT, 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
index 99960d78f4..dcdc59d19c 100644
--- a/src/main/java/gregtech/common/items/armor/components/ArmorComponentFunction.java
+++ b/src/main/java/gregtech/common/items/armor/components/ArmorComponentFunction.java
@@ -1,20 +1,19 @@
 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(ItemStack aStack, boolean aElectric, float aWeight, StatType aType, float aProcessingUsed) {
-		super(aStack, aElectric, aWeight);
-		mType = aType;
-		mStat.put(StatType.WEIGHT, aWeight);
-		mStat.put(StatType.PROCESSINGPOWERUSED, aProcessingUsed);
+	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.WEIGHT, 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
index a6cfb68f5b..3e9e22ee28 100644
--- a/src/main/java/gregtech/common/items/armor/components/ArmorElectricComponent.java
+++ b/src/main/java/gregtech/common/items/armor/components/ArmorElectricComponent.java
@@ -1,5 +1,6 @@
 package gregtech.common.items.armor.components;
 
+import gregtech.api.GregTech_API;
 import gregtech.common.items.armor.ArmorData;
 import net.minecraft.item.ItemStack;
 
@@ -8,15 +9,16 @@ public class ArmorElectricComponent extends ArmorComponent{
 	StatType mType2;
 	StatType mType3;
 	
-	public ArmorElectricComponent(ItemStack aStack, float aWeight, StatType aType1, float aValue1, StatType aType2, float aValue2, StatType aType3, float aValue3) {
-		super(aStack, true, aWeight);
-		mType1 = aType1;
-		mType2 = aType2;
-		mType3 = aType3;
-		mStat.put(StatType.WEIGHT, aWeight);
-		mStat.put(aType1, aValue1);
-		if(mType2!=null)mStat.put(mType2, aValue2);
-		if(mType3!=null)mStat.put(mType3, aValue3);
+	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
@@ -24,7 +26,6 @@ public class ArmorElectricComponent extends ArmorComponent{
 		addVal(mType1, aArmorData);	
 		if(mType2!=null)addVal(mType2, aArmorData);	
 		if(mType3!=null)addVal(mType3, aArmorData);
-		addVal(StatType.WEIGHT, 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
index 6ee8095ce5..9f87678e05 100644
--- a/src/main/java/gregtech/common/items/armor/components/ArmorPlating.java
+++ b/src/main/java/gregtech/common/items/armor/components/ArmorPlating.java
@@ -1,30 +1,67 @@
 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(ItemStack aStack, float aWeight, float aPhysicalDef, float aProjectileDef, float aFireDef, float aMagicDef, float aExplosionDef, float aFallDef, float aRadiationDef, float aElectricDef, float aWitherDef) {
-		super(aStack, false, aWeight);
+	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 aOreDict, float aWeight, float aPhysicalDef, float aProjectileDef, float aFireDef, float aMagicDef, float aExplosionDef, float aFallDef, float aRadiationDef, float aElectricDef, float aWitherDef) {
-		super(aOreDict, false, aWeight);
+	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 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(aOreDict, false, aWeight);
+	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 = aType;
-		mStat.put(mType, aSpecial);
+		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 aOreDict,float aWeight, float aPhysicalDef, float aProjectileDef, float aFireDef, float aMagicDef, float aExplosionDef) {
-		super(aOreDict, false, aWeight);
-		addStats(aPhysicalDef, aProjectileDef, aFireDef, aMagicDef, aExplosionDef, 0, 0, 0, 0);
+	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){
@@ -61,7 +98,6 @@ public class ArmorPlating extends ArmorComponent{
 		aArmorData.mStat.remove(aType);}
 		float tComponentDef = mStat.get(aType);
 		aArmorData.mStat.put(aType, tArmorDef + ((1.0f -tArmorDef) * tComponentDef));
-//		System.out.println("calDef: "+aType.name()+" "+tArmorDef+" "+(tArmorDef + ((1.0f -tArmorDef) * tComponentDef)));
 	}
 
 }
diff --git a/src/main/java/gregtech/common/items/armor/components/LoadArmorComponents.java b/src/main/java/gregtech/common/items/armor/components/LoadArmorComponents.java
index f394caa23b..d6d37fd935 100644
--- a/src/main/java/gregtech/common/items/armor/components/LoadArmorComponents.java
+++ b/src/main/java/gregtech/common/items/armor/components/LoadArmorComponents.java
@@ -1,152 +1,156 @@
 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 ic2.core.Ic2Items;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
 
 public class LoadArmorComponents {
 	public static void init(){
-		new ArmorPlating("plateRubber", 			 60, 0.06f, 0.06f, 0.02f, 0.10f, 0.10f, 2f, 0f, .25f, 0f);
-		new ArmorPlating("plateWood", 				 80, 0.08f, 0.09f, 0.02f, 0.08f, 0.08f);
-		new ArmorPlating("plateBrass", 				140, 0.12f, 0.12f, 0.10f, 0.10f, 0.12f);
-		new ArmorPlating("plateCopper", 			140, 0.11f, 0.11f, 0.10f, 0.10f, 0.11f);
-		new ArmorPlating("plateLead", 				280, 0.05f, 0.05f, 0.05f, 0.05f, 0.05f, 0, .3f, 0, 0);
-		new ArmorPlating("platePlastic", 			 60, 0.10f, 0.10f, 0.02f, 0.02f, 0.10f, 0, 0, .25f, 0);
-		new ArmorPlating("plateAluminium",			120, 0.14f, 0.14f, 0.12f, 0.12f, 0.14f);
-		new ArmorPlating("plateAstralSilver", 		180, 0.10f, 0.10f, 0.10f, 0.18f, 0.10f);
-		new ArmorPlating("plateBismuthBronze", 		160, 0.12f, 0.12f, 0.10f, 0.10f, 0.12f);
-		new ArmorPlating("plateBlackBronze", 		160, 0.13f, 0.13f, 0.10f, 0.10f, 0.13f);
-		new ArmorPlating("plateBlackSteel", 		200, 0.19f, 0.19f, 0.17f, 0.17f, 0.19f);
-		new ArmorPlating("plateBlueSteel", 			200, 0.21f, 0.21f, 0.19f, 0.19f, 0.21f);
-		new ArmorPlating("plateBronze", 			160, 0.13f, 0.13f, 0.12f, 0.12f, 0.13f);
-		new ArmorPlating("plateCobaltBrass", 		180, 0.15f, 0.15f, 0.14f, 0.14f, 0.15f);
-		new ArmorPlating("plateDamascusSteel", 		200, 0.22f, 0.22f, 0.20f, 0.20f, 0.22f);
-		new ArmorPlating("plateElectrum", 			250, 0.11f, 0.11f, 0.10f, 0.10f, 0.11f);
-		new ArmorPlating("plateEmerald", 			160, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateGold", 				300, 0.09f, 0.09f, 0.05f, 0.25f, 0.09f);
-		new ArmorPlating("plateGreenSapphire", 		160, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateInvar", 				190, 0.10f, 0.10f, 0.22f, 0.22f, 0.10f);
-		new ArmorPlating("plateIron", 				200, 0.12f, 0.12f, 0.10f, 0.10f, 0.12f);
-		new ArmorPlating("plateIronWood", 			150, 0.17f, 0.17f, 0.02f, 0.02f, 0.17f);
-		new ArmorPlating("plateMagnalium", 			120, 0.15f, 0.15f, 0.17f, 0.17f, 0.15f);
-		new ArmorPlating("plateNeodymiumMagnetic", 	220, 0.14f, 0.14f, 0.14f, 0.14f, 0.14f, 0, 0, 0, 0, StatType.MAGNETSINGLE, 2.0f);
-		new ArmorPlating("plateManganese", 			180, 0.15f, 0.15f, 0.14f, 0.14f, 0.15f);
-		new ArmorPlating("plateMeteoricIron", 		200, 0.18f, 0.18f, 0.16f, 0.16f, 0.18f);
-		new ArmorPlating("plateMeteoricSteel", 		200, 0.21f, 0.21f, 0.19f, 0.19f, 0.21f);
-		new ArmorPlating("plateMolybdenum", 		140, 0.14f, 0.14f, 0.14f, 0.14f, 0.14f);
-		new ArmorPlating("plateNickel", 			180, 0.12f, 0.12f, 0.15f, 0.15f, 0.12f);
-		new ArmorPlating("plateOlivine", 			180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateOpal", 				180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("platePalladium", 			280, 0.14f, 0.14f, 0.12f, 0.12f, 0.14f);
-		new ArmorPlating("platePlatinum", 			290, 0.15f, 0.15f, 0.13f, 0.13f, 0.15f);
-		new ArmorPlating("plateGarnetRed", 			180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateRedSteel", 			200, 0.20f, 0.20f, 0.18f, 0.18f, 0.20f);
-		new ArmorPlating("plateRoseGold", 			240, 0.10f, 0.10f, 0.08f, 0.18f, 0.10f);
-		new ArmorPlating("plateRuby", 				180, 0.10f, 0.10f, 0.20f, 0.20f, 0.10f);
-		new ArmorPlating("plateSapphire", 			180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateSilver", 			220, 0.11f, 0.11f, 0.07f, 0.24f, 0.11f);
-		new ArmorPlating("plateStainlessSteel", 	200, 0.16f, 0.16f, 0.21f, 0.21f, 0.16f);
-		new ArmorPlating("plateSteel", 				200, 0.18f, 0.18f, 0.16f, 0.16f, 0.18f);
-		new ArmorPlating("plateSterlingSilver", 	210, 0.15f, 0.15f, 0.13f, 0.13f, 0.15f);
-		new ArmorPlating("plateTanzanite", 			180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateThorium", 			280, 0.13f, 0.13f, 0.16f, 0.16f, 0.13f);
-		new ArmorPlating("plateWroughtIron", 		200, 0.14f, 0.14f, 0.12f, 0.12f, 0.14f);
-		new ArmorPlating("plateGarnetYellow", 		180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateAlloyCarbon", 		 60, 0.06f, 0.23f, 0.05f, 0.05f, 0.06f);
-		new ArmorPlating("plateInfusedAir", 		 10, 0.10f, 0.10f, 0.10f, 0.10f, 0.10f);
-		new ArmorPlating("plateAmethyst", 			180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateInfusedWater", 		150, 0.10f, 0.10f, 0.20f, 0.20f, 0.10f);
-		new ArmorPlating("plateBlueTopaz", 			180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateChrome", 			200, 0.12f, 0.12f, 0.21f, 0.21f, 0.12f);
-		new ArmorPlating("plateCobalt", 			220, 0.16f, 0.16f, 0.14f, 0.14f, 0.16f);
-		new ArmorPlating("plateDarkIron", 			200, 0.21f, 0.21f, 0.19f, 0.19f, 0.21f);
-		new ArmorPlating("plateDiamond", 			200, 0.20f, 0.20f, 0.22f, 0.22f, 0.20f);
-		new ArmorPlating("plateEnderium", 			250, 0.22f, 0.22f, 0.21f, 0.21f, 0.22f);
-		new ArmorPlating("plateElectrumFlux", 		180, 0.19f, 0.19f, 0.16f, 0.16f, 0.19f);
-		new ArmorPlating("plateForce", 				180, 0.10f, 0.10f, 0.20f, 0.20f, 0.10f);
-		new ArmorPlating("plateHSLA", 				200, 0.21f, 0.21f, 0.17f, 0.17f, 0.21f);
-		new ArmorPlating("plateInfusedFire", 		150, 0.12f, 0.10f, 0.30f, 0.30f, 0.12f, 0, 0, 0, 0, StatType.THORNSSINGLE, 3.0f);
-		new ArmorPlating("plateInfusedGold", 		300, 0.15f, 0.15f, 0.05f, 0.05f, 0.15f);
-		new ArmorPlating("plateMithril", 			200, 0.25f, 0.25f, 0.10f, 0.30f, 0.25f);
-		new ArmorPlating("plateInfusedOrder", 		150, 0.18f, 0.22f, 0.22f, 0.25f, 0.22f);
-		new ArmorPlating("plateSteeleaf", 			120, 0.16f, 0.16f, 0.06f, 0.06f, 0.16f);
-		new ArmorPlating("plateInfusedEarth", 		350, 0.30f, 0.30f, 0.30f, 0.30f, 0.30f);
-		new ArmorPlating("plateThaumium", 			200, 0.18f, 0.19f, 0.20f, 0.30f, 0.18f);
-		new ArmorPlating("plateTitanium", 			140, 0.20f, 0.20f, 0.18f, 0.18f, 0.20f);
-		new ArmorPlating("plateTungsten", 			270, 0.27f, 0.26f, 0.23f, 0.26f, 0.26f);
-		new ArmorPlating("plateTopaz", 				180, 0.10f, 0.10f, 0.14f, 0.14f, 0.10f);
-		new ArmorPlating("plateUltimet", 			180, 0.21f, 0.21f, 0.19f, 0.19f, 0.21f);
-		new ArmorPlating("plateUranium", 			290, 0.27f, 0.23f, 0.20f, 0.15f, 0.21f);
-		new ArmorPlating("plateVinteum", 			180, 0.10f, 0.12f, 0.14f, 0.28f, 0.12f);
-		new ArmorPlating("plateDuranium", 			140, 0.24f, 0.24f, 0.24f, 0.24f, 0.24f);
-		new ArmorPlating("plateAlloyIridium", 		220, 0.24f, 0.24f, 0.22f, 0.22f, 0.24f);
-		new ArmorPlating("plateOsmiridium", 		240, 0.18f, 0.18f, 0.16f, 0.16f, 0.18f);
-		new ArmorPlating("plateOsmium", 			250, 0.12f, 0.12f, 0.10f, 0.10f, 0.12f);
-		new ArmorPlating("plateNaquadah", 			250, 0.27f, 0.27f, 0.25f, 0.25f, 0.27f);
-		new ArmorPlating("plateNetherStar", 		140, 0.22f, 0.22f, 0.24f, 0.24f, 0.22f, 0, 0, 0, .2f);
-		new ArmorPlating("plateInfusedEntropy", 	150, 0.10f, 0.10f, 0.10f, 0.10f, 0.10f, 0, 0, 0, 0, StatType.THORNSSINGLE, 4.0f);
-		new ArmorPlating("plateTritanium", 			140, 0.26f, 0.26f, 0.26f, 0.26f, 0.26f);
-		new ArmorPlating("plateTungstenSteel", 		270, 0.30f, 0.28f, 0.25f, 0.28f, 0.30f);
-		new ArmorPlating("plateAdamantium", 		200, 0.28f, 0.28f, 0.26f, 0.30f, 0.30f);
-		new ArmorPlating("plateNaquadahAlloy", 		300, 0.33f, 0.33f, 0.33f, 0.33f, 0.33f);
-		new ArmorPlating("plateNeutronium", 		600, 0.50f, 0.50f, 0.50f, 0.50f, 0.50f);
 		
-		new ArmorComponentFunction(GT_ModHandler.getIC2Item("nightvisionGoggles", 1), true, 100, StatType.NIGHTVISION, 100);
-		if(GT_ModHandler.getModItem("Thaumcraft", "ItemGoggles", 1)!=null)new ArmorComponentFunction(GT_ModHandler.getModItem("Thaumcraft", "ItemGoggles", 1), true, 100, StatType.THAUMICGOGGLES, 100);
-		new ArmorComponentBattery(ItemList.Battery_RE_LV_Lithium.get(1, new Object[]{}), true, 100, 100000);
-		new ArmorComponentBattery(ItemList.Battery_RE_MV_Lithium.get(1, new Object[]{}), true, 100, 400000);
-		new ArmorComponentBattery(ItemList.Battery_RE_HV_Lithium.get(1, new Object[]{}), true, 100, 1600000);
+		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(ItemList.Battery_RE_LV_Cadmium.get(1, new Object[]{}), true, 100, 75000);
-		new ArmorComponentBattery(ItemList.Battery_RE_MV_Cadmium.get(1, new Object[]{}), true, 100, 300000);
-		new ArmorComponentBattery(ItemList.Battery_RE_HV_Cadmium.get(1, new Object[]{}), true, 100, 1200000);
+		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(ItemList.Battery_RE_LV_Sodium.get(1, new Object[]{}), true, 100, 50000);
-		new ArmorComponentBattery(ItemList.Battery_RE_MV_Sodium.get(1, new Object[]{}), true, 100, 200000);
-		new ArmorComponentBattery(ItemList.Battery_RE_HV_Sodium.get(1, new Object[]{}), true, 100, 800000);
+		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(ItemList.IC2_EnergyCrystal.get(1, new Object[]{}), true, 100, 1000000);
-		new ArmorComponentBattery(ItemList.IC2_LapotronCrystal.get(1, new Object[]{}), true, 100, 10000000);
-		new ArmorComponentBattery(ItemList.Energy_LapotronicOrb.get(1, new Object[]{}), true, 100, 100000000);
-		new ArmorComponentBattery(ItemList.Energy_LapotronicOrb2.get(1, new Object[]{}), true, 100, 1000000000);
+		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(ItemList.Electric_Motor_LV.get(1, new Object[]{}), 20, StatType.MOTPRPOWER, 200f, StatType.MOTOREUUSAGE,  50f, StatType.PROCESSINGPOWERUSED,  10f);
-		new ArmorElectricComponent(ItemList.Electric_Motor_MV.get(1, new Object[]{}), 40, StatType.MOTPRPOWER, 300f, StatType.MOTOREUUSAGE, 100f, StatType.PROCESSINGPOWERUSED,  20f);
-		new ArmorElectricComponent(ItemList.Electric_Motor_HV.get(1, new Object[]{}), 60, StatType.MOTPRPOWER, 400f, StatType.MOTOREUUSAGE, 200f, StatType.PROCESSINGPOWERUSED,  50f);
-		new ArmorElectricComponent(ItemList.Electric_Motor_EV.get(1, new Object[]{}), 80, StatType.MOTPRPOWER, 500f, StatType.MOTOREUUSAGE, 400f, StatType.PROCESSINGPOWERUSED, 100f);
-		new ArmorElectricComponent(ItemList.Electric_Motor_IV.get(1, new Object[]{}),100, StatType.MOTPRPOWER, 600f, StatType.MOTOREUUSAGE, 800f, StatType.PROCESSINGPOWERUSED, 200f);
+		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(ItemList.Electric_Piston_LV.get(1, new Object[]{}), 20, StatType.PISTONJUMPBOOST, 3, StatType.PISTONEUUSAGE, 200f, StatType.PROCESSINGPOWERUSED,  10f);
-		new ArmorElectricComponent(ItemList.Electric_Piston_MV.get(1, new Object[]{}), 40, StatType.PISTONJUMPBOOST, 4, StatType.PISTONEUUSAGE, 300f, StatType.PROCESSINGPOWERUSED,  20f);
-		new ArmorElectricComponent(ItemList.Electric_Piston_HV.get(1, new Object[]{}), 60, StatType.PISTONJUMPBOOST, 5, StatType.PISTONEUUSAGE, 450f, StatType.PROCESSINGPOWERUSED,  50f);
-		new ArmorElectricComponent(ItemList.Electric_Piston_EV.get(1, new Object[]{}), 80, StatType.PISTONJUMPBOOST, 6, StatType.PISTONEUUSAGE, 800f, StatType.PROCESSINGPOWERUSED, 100f);
-		new ArmorElectricComponent(ItemList.Electric_Piston_IV.get(1, new Object[]{}),100, StatType.PISTONJUMPBOOST, 7, StatType.PISTONEUUSAGE,1600f, 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(ItemList.Machine_LV_Electrolyzer.get(1, new Object[]{}), 20, StatType.ELECTROLYZERPROD, 10, StatType.ELECTROLYZEREUUSAGE, 1, StatType.PROCESSINGPOWERUSED,  50f);
-		new ArmorElectricComponent(ItemList.Machine_MV_Electrolyzer.get(1, new Object[]{}), 40, StatType.ELECTROLYZERPROD, 20, StatType.ELECTROLYZEREUUSAGE, 4, StatType.PROCESSINGPOWERUSED,  100f);
-		new ArmorElectricComponent(ItemList.Machine_HV_Electrolyzer.get(1, new Object[]{}), 60, StatType.ELECTROLYZERPROD, 40, StatType.ELECTROLYZEREUUSAGE, 16, StatType.PROCESSINGPOWERUSED,  150f);
-		new ArmorElectricComponent(ItemList.Machine_EV_Electrolyzer.get(1, new Object[]{}), 80, StatType.ELECTROLYZERPROD, 80, StatType.ELECTROLYZEREUUSAGE, 64, StatType.PROCESSINGPOWERUSED,  200f);
-		new ArmorElectricComponent(ItemList.Machine_IV_Electrolyzer.get(1, new Object[]{}),100, StatType.ELECTROLYZERPROD,160, StatType.ELECTROLYZEREUUSAGE, 128, StatType.PROCESSINGPOWERUSED,  250f);
+		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(ItemList.Field_Generator_LV.get(1, new Object[]{}), 20, StatType.FIELDGENCAP, 1, StatType.FIELDGENEUUSAGE, 1, StatType.PROCESSINGPOWERUSED,  100f);
-		new ArmorElectricComponent(ItemList.Field_Generator_MV.get(1, new Object[]{}), 40, StatType.FIELDGENCAP, 2, StatType.FIELDGENEUUSAGE, 4, StatType.PROCESSINGPOWERUSED,  200f);
-		new ArmorElectricComponent(ItemList.Field_Generator_HV.get(1, new Object[]{}), 60, StatType.FIELDGENCAP, 3, StatType.FIELDGENEUUSAGE, 16, StatType.PROCESSINGPOWERUSED,  300f);
-		new ArmorElectricComponent(ItemList.Field_Generator_EV.get(1, new Object[]{}), 80, StatType.FIELDGENCAP, 4, StatType.FIELDGENEUUSAGE, 64, StatType.PROCESSINGPOWERUSED,  400f);
-		new ArmorElectricComponent(ItemList.Field_Generator_IV.get(1, new Object[]{}),100, StatType.FIELDGENCAP, 5, StatType.FIELDGENEUUSAGE, 512, StatType.PROCESSINGPOWERUSED,  500f);
+		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(ItemList.Cell_Empty.get(1, new Object[]{}), 20, StatType.TANKCAP, 8000, null, 1, null,  0);
-		new ArmorElectricComponent(ItemList.Large_Fluid_Cell_Steel.get(1, new Object[]{}), 40, StatType.TANKCAP, 16000, null, 1, null,  0);
-		new ArmorElectricComponent(ItemList.Large_Fluid_Cell_TungstenSteel.get(1, new Object[]{}), 80, StatType.TANKCAP, 64000, null, 1, null,  0);
+		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(GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1),   10, StatType.PROCESSINGPOWER, 100, null, 1, null,  1);
-		new ArmorElectricComponent(GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1),    20, StatType.PROCESSINGPOWER, 200, null, 1, null,  1);
-		new ArmorElectricComponent(GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1),30, StatType.PROCESSINGPOWER, 300, null, 1, null,  1);
-		new ArmorElectricComponent(GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1),    40, StatType.PROCESSINGPOWER, 400, null, 1, null,  1);
-		new ArmorElectricComponent(GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1),   50, StatType.PROCESSINGPOWER, 500, null, 1, null,  1);
-		new ArmorElectricComponent(GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1),  60, StatType.PROCESSINGPOWER, 600, null, 1, null,  1);
+		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])) {
@@ -226,5 +230,22 @@ public class LoadArmorComponents {
 //				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);
 	}
 }