Removed Gimp Files folder and all xcf files. Wasn't supposed to be uploading those. Also added some stuff for a hidden feature.

26 files changed, 185 insertions, 186 deletions

diff --git a/src/main/java/lance5057/tDefense/armor/ArmorCore.java b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
index 3cc3732..e56535a 100644
--- a/src/main/java/lance5057/tDefense/armor/ArmorCore.java
+++ b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
@@ -186,9 +186,9 @@ public class ArmorCore extends ToolCore implements ISpecialArmor, IRunicArmor
 		switch(pass)
 		{
 			case 0:
-				return this.getIconSuffix(0);
-			case 1:
 				return this.getIconSuffix(2);
+			case 1:
+				return this.getIconSuffix(0);
 			case 2:
 				return this.getIconSuffix(3);
 			case 3:
diff --git a/src/main/java/lance5057/tDefense/armor/items/Sheath.java b/src/main/java/lance5057/tDefense/armor/items/Sheath.java
index 1dc87ea..e9db2db 100644
--- a/src/main/java/lance5057/tDefense/armor/items/Sheath.java
+++ b/src/main/java/lance5057/tDefense/armor/items/Sheath.java
@@ -1,29 +1,25 @@
 package lance5057.tDefense.armor.items;
 
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.parts.ClothMaterial;
-import lance5057.tDefense.armor.renderers.ModelSheath;
 import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.client.model.ModelBiped;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
 import tconstruct.library.TConstructRegistry;
 import tconstruct.library.accessory.IAccessory;
-import tconstruct.library.accessory.IAccessoryModel;
-import tconstruct.library.tools.ToolCore;
 import tconstruct.tools.TinkerTools;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class Sheath extends ToolCore implements IAccessory
+public class Sheath extends ArmorCore implements IAccessory
 {
 
 	public Sheath()
 	{
-		super(0);
+		super(0,-1);
 	}
 
 	@Override
@@ -45,9 +41,9 @@ public class Sheath extends ToolCore implements IAccessory
 		
 		color[3] = Integer.toHexString(TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class).color);
 
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(4), this.getIconSuffix(3)};
+		//String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(4), this.getIconSuffix(3)};
 
-		ClientProxy.sheath.SetColors(color, this.getDefaultFolder(), textures);
+		ClientProxy.sheath.SetColors(color, this.getDefaultFolder(), itemStack);
 		return ClientProxy.sheath;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
index 61e5224..aba5909 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
@@ -134,7 +134,7 @@ public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, IVisD
 	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot)
 	{
 		String[] color = new String[10];
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
+		//String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
 
 		for(int j = 0; j < 10; j++)
 			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
@@ -148,7 +148,7 @@ public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, IVisD
 		newColor = TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class);
 		color[0] = Integer.toHexString(newColor.color);
 
-		ClientProxy.hood.SetColors(color, this.getDefaultFolder(), textures);
+		ClientProxy.hood.SetColors(color, this.getDefaultFolder(), itemStack);
 		return ClientProxy.hood;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java
index 741c554..311d971 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java
@@ -123,7 +123,7 @@ public class TinkersRobe extends ArmorCore implements IVisDiscountGear
 	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot)
 	{
 		String[] color = new String[10];
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
+		//String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
 
 		for(int j = 0; j < 10; j++)
 			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
@@ -137,7 +137,7 @@ public class TinkersRobe extends ArmorCore implements IVisDiscountGear
 		newColor = TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class);
 		color[0] = Integer.toHexString(newColor.color);
 
-		ClientProxy.robe.SetColors(color, this.getDefaultFolder(), textures);
+		ClientProxy.robe.SetColors(color, this.getDefaultFolder(), itemStack);
 		return ClientProxy.robe;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java
index c483537..4fa23d0 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java
@@ -133,7 +133,7 @@ public class TinkersShawl extends ArmorCore implements IVisDiscountGear
 	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot)
 	{
 		String[] color = new String[10];
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
+		//String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
 
 		for(int j = 0; j < 10; j++)
 			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
@@ -147,7 +147,7 @@ public class TinkersShawl extends ArmorCore implements IVisDiscountGear
 		newColor = TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class);
 		color[0] = Integer.toHexString(newColor.color);
 
-		ClientProxy.shawl.SetColors(color, this.getDefaultFolder(), textures);
+		ClientProxy.shawl.SetColors(color, this.getDefaultFolder(), itemStack);
 		return ClientProxy.shawl;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java
index 3c2feb0..95e6840 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java
@@ -131,7 +131,7 @@ public class TinkersShoes extends ArmorCore implements IVisDiscountGear
 	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot)
 	{
 		String[] color = new String[10];
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
+		//String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
 
 		for(int j = 0; j < 10; j++)
 			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
@@ -141,7 +141,7 @@ public class TinkersShoes extends ArmorCore implements IVisDiscountGear
 		CustomMaterial newColor = TConstructRegistry.getCustomMaterial(HeadID, ClothMaterial.class);
 		color[1] = Integer.toHexString(newColor.color);
 
-		ClientProxy.shoes.SetColors(color, this.getDefaultFolder(), textures);
+		ClientProxy.shoes.SetColors(color, this.getDefaultFolder(), itemStack);
 		return ClientProxy.shoes;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGauntlets.java
index 4a94f9e..312d200 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGauntlets.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGauntlets.java
@@ -19,11 +19,11 @@ import tconstruct.tools.TinkerTools;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class TinkersGauntlets extends ToolCore implements IAccessory
+public class TinkersGauntlets extends ArmorCore implements IAccessory
 {
 	public TinkersGauntlets()
 	{
-		super(2);
+		super(0,-1);
 		this.setUnlocalizedName("tinkersgauntlets");
 	}
 
@@ -72,7 +72,7 @@ public class TinkersGauntlets extends ToolCore implements IAccessory
 	@Override
 	public float getDamageModifier()
 	{
-		return 1.4f;
+		return 0f;
 	}
 
 	@Override
@@ -140,9 +140,9 @@ public class TinkersGauntlets extends ToolCore implements IAccessory
 		for(int j = 0; j < 10; j++)
 			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
 
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
+		//String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
 		
-		ClientProxy.gauntlets.SetColors(color, this.getDefaultFolder(), textures);
+		ClientProxy.gauntlets.SetColors(color, this.getDefaultFolder(), itemStack);
 		return ClientProxy.gauntlets;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java
index b0913a1..6bfb8d1 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java
@@ -142,8 +142,8 @@ public class TinkersGrieves extends ArmorCore
 		for(int j = 0; j < 10; j++)
 			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
 
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)};
-		ClientProxy.grieves.SetColors(color, this.getDefaultFolder(), textures);
+		//String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)};
+		ClientProxy.grieves.SetColors(color, this.getDefaultFolder(), itemStack);
 		return ClientProxy.grieves;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
index aa1998f..135e948 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
@@ -132,8 +132,8 @@ public class TinkersHelm extends ArmorCore implements IRevealer, IGoggles
 		for(int j = 0; j < 10; j++)
 			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
 
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)};
-		ClientProxy.helm.SetColors(color, this.getDefaultFolder(), textures);
+		//String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)};
+		ClientProxy.helm.SetColors(color, this.getDefaultFolder(), itemStack);
 		return ClientProxy.helm;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java
index 48845ce..64447b2 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java
@@ -145,8 +145,13 @@ public class TinkersSabatons extends ArmorCore
 		for(int j = 0; j < 10; j++)
 			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
 
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)};
-		ClientProxy.sabatons.SetColors(color, this.getDefaultFolder(), textures);
+		int ExtraID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderExtra");
+
+		CustomMaterial newColor = TConstructRegistry.getCustomMaterial(ExtraID, ClothMaterial.class);
+		color[3] = Integer.toHexString(newColor.color);
+		
+		//String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)};
+		ClientProxy.sabatons.SetColors(color, this.getDefaultFolder(), itemStack);
 		return ClientProxy.sabatons;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java
index acce2b6..ce81f83 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java
@@ -141,8 +141,8 @@ public class TinkersBoots extends ArmorCore
 		CustomMaterial newColor = TConstructRegistry.getCustomMaterial(AccessoryID, ClothMaterial.class);
 		color[0] = Integer.toHexString(newColor.color);
 
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
-		ClientProxy.boots.SetColors(color, this.getDefaultFolder(), textures);
+		//String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
+		ClientProxy.boots.SetColors(color, this.getDefaultFolder(), itemStack);
 		return ClientProxy.boots;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java
index 8624bff..852f95f 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java
@@ -127,8 +127,8 @@ public class TinkersChausses extends ArmorCore
 		for(int j = 0; j < 10; j++)
 			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
 
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0)};
-		ClientProxy.chausses.SetColors(color, this.getDefaultFolder(), textures);
+		//String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0)};
+		ClientProxy.chausses.SetColors(color, this.getDefaultFolder(), itemStack);
 		return ClientProxy.chausses;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
index 2547a56..ba0db3d 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
@@ -142,8 +142,8 @@ public class TinkersCoif extends ArmorCore implements IRevealer, IGoggles
 		CustomMaterial newColor = TConstructRegistry.getCustomMaterial(AccessoryID, ClothMaterial.class);
 		color[0] = Integer.toHexString(newColor.color);
 
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
-		ClientProxy.coif.SetColors(color, this.getDefaultFolder(), textures);
+		//String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
+		ClientProxy.coif.SetColors(color, this.getDefaultFolder(), itemStack);
 		return ClientProxy.coif;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java
index 061f7fe..9e071a7 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java
@@ -128,8 +128,8 @@ public class TinkersHauberk extends ArmorCore
 		for(int j = 0; j < 10; j++)
 			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
 
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
-		ClientProxy.hauberk.SetColors(color, this.getDefaultFolder(), textures);
+		//String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
+		ClientProxy.hauberk.SetColors(color, this.getDefaultFolder(), itemStack);
 		return ClientProxy.hauberk;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
index 2fdc674..9841c80 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
@@ -1,6 +1,7 @@
 package lance5057.tDefense.armor.renderers;
 
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.armor.ArmorCore;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
@@ -46,24 +47,22 @@ public class ModelSheath extends ArmorRenderer
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
 	{
 		GL11.glPushMatrix();
-		for(int i = 0; i < 4; i++)
-		{
-			GL11.glPushMatrix();
-
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
 
-			float size = 1.6f;
-			GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
-			GL11.glTranslatef(0.0F, -0.0F, 0.0F);
+		for(int i = 0; i < 10; i++)
+		{
+			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			if(texture != "")
+			{
 
-			int[] intColors = TinkersDefense.hexToRGB(colors[i]);
-			GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
+				GL11.glPushMatrix();
 
-			//setLivingAnimations((EntityLivingBase) entity, f,f1, f5);
-			super.render(entity, f, f1, f2, f3, f4, f5);
+				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				super.render(entity, f, f1, f2, f3, f4, f5);
 
-			GL11.glPopMatrix();
+				GL11.glPopMatrix();
+			}
 		}
+
 		GL11.glPopMatrix();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
index 59b058c..629d2c4 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
@@ -1,6 +1,7 @@
 package lance5057.tDefense.armor.renderers.cloth;
 
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
@@ -44,23 +45,22 @@ public class ModelTinkersHood extends ArmorRenderer
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
 	{
 		GL11.glPushMatrix();
-		for(int i = 0; i < 3; i++)
-		{
-			GL11.glPushMatrix();
 
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
+		for(int i = 0; i < 10; i++)
+		{
+			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			if(texture != "")
+			{
 
-			float size = 2.25f;
-			GL11.glScalef(1.5F / size, 1.5F / size, 1.5F / size);
-			GL11.glTranslatef(0.0F, 0F * f5, 0.0F);
+				GL11.glPushMatrix();
 
-			int[] intColors = TinkersDefense.hexToRGB(colors[i]);
-			GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
+				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				super.render(entity, f, f1, f2, f3, f4, f5);
 
-			super.render(entity, f, f1, f2, f3, f4, f5);
-			//setRotationAngles(f, f1, f2, f3, f4, f5, entity);
-			GL11.glPopMatrix();
+				GL11.glPopMatrix();
+			}
 		}
+
 		GL11.glPopMatrix();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java
index a981f8f..80c32a8 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java
@@ -1,6 +1,7 @@
 package lance5057.tDefense.armor.renderers.cloth;
 
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
@@ -89,23 +90,22 @@ public class ModelTinkersRobe extends ArmorRenderer
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
 	{
 		GL11.glPushMatrix();
-		for(int i = 0; i < 2; i++)
-		{
-			GL11.glPushMatrix();
 
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
+		for(int i = 0; i < 10; i++)
+		{
+			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			if(texture != "")
+			{
 
-			float size = 1.6f;
-			GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
-			GL11.glTranslatef(0F, -0F * f5, -0F);
+				GL11.glPushMatrix();
 
-			int[] intColors = TinkersDefense.hexToRGB(colors[i]);
-			GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
+				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				super.render(entity, f, f1, f2, f3, f4, f5);
 
-			super.render(entity, f, f1, f2, f3, f4, f5);
-			setRotationAngles(f, f1, f2, f3, f4, f5, entity);
-			GL11.glPopMatrix();
+				GL11.glPopMatrix();
+			}
 		}
+
 		GL11.glPopMatrix();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java
index f9c6ad1..387463e 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java
@@ -1,6 +1,7 @@
 package lance5057.tDefense.armor.renderers.cloth;
 
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
@@ -102,23 +103,22 @@ public class ModelTinkersShawl extends ArmorRenderer
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
 	{
 		GL11.glPushMatrix();
-		for(int i = 0; i < 3; i++)
-		{
-			GL11.glPushMatrix();
 
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
+		for(int i = 0; i < 10; i++)
+		{
+			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			if(texture != "")
+			{
 
-			float size = 1.6f;
-			GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
-			GL11.glTranslatef(0F, -0F * f5, -0F);
+				GL11.glPushMatrix();
 
-			int[] intColors = TinkersDefense.hexToRGB(colors[i]);
-			GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
+				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				super.render(entity, f, f1, f2, f3, f4, f5);
 
-			super.render(entity, f, f1, f2, f3, f4, f5);
-			setRotationAngles(f, f1, f2, f3, f4, f5, entity);
-			GL11.glPopMatrix();
+				GL11.glPopMatrix();
+			}
 		}
+
 		GL11.glPopMatrix();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGauntlets.java
index e007127..a63b402 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGauntlets.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGauntlets.java
@@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
 
 import cpw.mods.fml.client.FMLClientHandler;
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
@@ -72,24 +73,22 @@ public class ModelTinkersGauntlets extends ArmorRenderer
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
 	{
 		GL11.glPushMatrix();
-		for(int i = 0; i < 3; i++)
-		{
-			GL11.glPushMatrix();
-
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
 
-			float size = 1.6f;
-			GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
-			GL11.glTranslatef(0.0F, -0.0F, 0.0F);
+		for(int i = 0; i < 10; i++)
+		{
+			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			if(texture != "")
+			{
 
-			int[] intColors = TinkersDefense.hexToRGB(colors[i]);
-			GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
+				GL11.glPushMatrix();
 
-			//setLivingAnimations((EntityLivingBase) entity, f,f1, f5);
-			super.render(entity, f, f1, f2, f3, f4, f5);
+				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				super.render(entity, f, f1, f2, f3, f4, f5);
 
-			GL11.glPopMatrix();
+				GL11.glPopMatrix();
+			}
 		}
+
 		GL11.glPopMatrix();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
index c5f59ff..58cd8cf 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
@@ -1,6 +1,7 @@
 package lance5057.tDefense.armor.renderers.heavy;
 
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
@@ -84,23 +85,22 @@ public class ModelTinkersGrieves extends ArmorRenderer
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
 	{
 		GL11.glPushMatrix();
-		for(int i = 0; i < 4; i++)
-		{
-			GL11.glPushMatrix();
 
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
+		for(int i = 0; i < 10; i++)
+		{
+			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			if(texture != "")
+			{
 
-			float size = 1.6f;
-			GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
-			GL11.glTranslatef(0F, -0F * f5, -0F);
+				GL11.glPushMatrix();
 
-			int[] intColors = TinkersDefense.hexToRGB(colors[i]);
-			GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
+				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				super.render(entity, f, f1, f2, f3, f4, f5);
 
-			super.render(entity, f, f1, f2, f3, f4, f5);
-			setRotationAngles(f, f1, f2, f3, f4, f5, entity);
-			GL11.glPopMatrix();
+				GL11.glPopMatrix();
+			}
 		}
+
 		GL11.glPopMatrix();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java
index 78a0c83..005b182 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java
@@ -1,6 +1,7 @@
 package lance5057.tDefense.armor.renderers.heavy;
 
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
@@ -53,22 +54,22 @@ public class ModelTinkersHelm extends ArmorRenderer
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
 	{
 		GL11.glPushMatrix();
-		for(int i = 0; i < 3; i++)
+
+		for(int i = 0; i < 10; i++)
 		{
-			GL11.glPushMatrix();
+			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			if(texture != "")
+			{
 
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
+				GL11.glPushMatrix();
 
-			float size = 2.5f;
-			GL11.glScalef(1.5F / size, 1.5F / size, 1.5F / size);
-			GL11.glTranslatef(0.0F, -0F * f5, 0.0F);
-			int[] intColors = TinkersDefense.hexToRGB(colors[i]);
-			GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
+				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				super.render(entity, f, f1, f2, f3, f4, f5);
 
-			super.render(entity, f, f1, f2, f3, f4, f5);
-			setRotationAngles(f, f1, f2, f3, f4, f5, entity);
-			GL11.glPopMatrix();
+				GL11.glPopMatrix();
+			}
 		}
+
 		GL11.glPopMatrix();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java
index 1a948aa..ca24d32 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java
@@ -1,6 +1,7 @@
 package lance5057.tDefense.armor.renderers.heavy;
 
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
@@ -114,25 +115,21 @@ public class ModelTinkersSabatons extends ArmorRenderer
 	{
 		GL11.glPushMatrix();
 
-		for(int i = 0; i < 4; i++)
+		for(int i = 0; i < 10; i++)
 		{
-			//TConstructRegistry.getCustomMaterial(arg0, arg1)
-			GL11.glPushMatrix();
-			ResourceLocation texture = new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png");
-			//Boolean exists = new File(texture.getResourceDomain() + ":" + texture.getResourcePath()).exists();
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(texture);
-
-			float size = 1.6f;
-			GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
-			GL11.glTranslatef(0.0F, -0F * f5, 0.0F);
-
-			int[] intColors = TinkersDefense.hexToRGB(colors[i]);
-			GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
-
-			super.render(entity, f, f1, f2, f3, f4, f5);
-			setRotationAngles(f, f1, f2, f3, f4, f5, entity);
-			GL11.glPopMatrix();
+			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			if(texture != "")
+			{
+
+				GL11.glPushMatrix();
+
+				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				super.render(entity, f, f1, f2, f3, f4, f5);
+
+				GL11.glPopMatrix();
+			}
 		}
+
 		GL11.glPopMatrix();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
index a55c825..41dff40 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
@@ -1,6 +1,7 @@
 package lance5057.tDefense.armor.renderers.light;
 
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
@@ -53,23 +54,22 @@ public class ModelTinkersBoots extends ArmorRenderer
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
 	{
 		GL11.glPushMatrix();
-		for(int i = 0; i < 3; i++)
-		{
-			GL11.glPushMatrix();
 
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
+		for(int i = 0; i < 10; i++)
+		{
+			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			if(texture != "")
+			{
 
-			float size = 1.6f;
-			GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
-			GL11.glTranslatef(0.0F, -0F * f5, 0.0F);
+				GL11.glPushMatrix();
 
-			int[] intColors = TinkersDefense.hexToRGB(colors[i]);
-			GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
+				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				super.render(entity, f, f1, f2, f3, f4, f5);
 
-			super.render(entity, f, f1, f2, f3, f4, f5);
-			setRotationAngles(f, f1, f2, f3, f4, f5, entity);
-			GL11.glPopMatrix();
+				GL11.glPopMatrix();
+			}
 		}
+
 		GL11.glPopMatrix();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
index 00f0d64..010e06b 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
@@ -1,6 +1,7 @@
 package lance5057.tDefense.armor.renderers.light;
 
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
@@ -86,22 +87,22 @@ public class ModelTinkersChausses extends ArmorRenderer
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
 	{
 		GL11.glPushMatrix();
-		for(int i = 0; i < 2; i++)
-		{
-			GL11.glPushMatrix();
 
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
+		for(int i = 0; i < 10; i++)
+		{
+			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			if(texture != "")
+			{
 
-			float size = 1.6f;
-			GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
-			GL11.glTranslatef(0F, 0F * f5, -0F);
+				GL11.glPushMatrix();
 
-			int[] intColors = TinkersDefense.hexToRGB(colors[i]);
-			GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
+				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				super.render(entity, f, f1, f2, f3, f4, f5);
 
-			super.render(entity, f, f1, f2, f3, f4, f5);
-			GL11.glPopMatrix();
+				GL11.glPopMatrix();
+			}
 		}
+
 		GL11.glPopMatrix();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
index d59bcc2..da3f80b 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
@@ -1,6 +1,7 @@
 package lance5057.tDefense.armor.renderers.light;
 
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
@@ -41,23 +42,22 @@ public class ModelTinkersCoif extends ArmorRenderer
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
 	{
 		GL11.glPushMatrix();
-		for(int i = 0; i < 3; i++)
-		{
-			GL11.glPushMatrix();
 
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
+		for(int i = 0; i < 10; i++)
+		{
+			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			if(texture != "")
+			{
 
-			float size = 1.6f;
-			GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
-			GL11.glTranslatef(0.0F, 0F * f5, 0.0F);
+				GL11.glPushMatrix();
 
-			int[] intColors = TinkersDefense.hexToRGB(colors[i]);
-			GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
+				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				super.render(entity, f, f1, f2, f3, f4, f5);
 
-			super.render(entity, f, f1, f2, f3, f4, f5);
-			setRotationAngles(f, f1, f2, f3, f4, f5, entity);
-			GL11.glPopMatrix();
+				GL11.glPopMatrix();
+			}
 		}
+
 		GL11.glPopMatrix();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java
index 455ac3b..9e3f192 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java
@@ -1,6 +1,7 @@
 package lance5057.tDefense.armor.renderers.light;
 
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
@@ -93,22 +94,22 @@ public class ModelTinkersHauberk extends ArmorRenderer
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
 	{
 		GL11.glPushMatrix();
-		for(int i = 0; i < 3; i++)
-		{
-			GL11.glPushMatrix();
 
-			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
+		for(int i = 0; i < 10; i++)
+		{
+			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			if(texture != "")
+			{
 
-			float size = 1.6f;
-			GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
-			GL11.glTranslatef(0.0F, 0F * f5, 0.0F);
+				GL11.glPushMatrix();
 
-			int[] intColors = TinkersDefense.hexToRGB(colors[i]);
-			GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
+				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				super.render(entity, f, f1, f2, f3, f4, f5);
 
-			super.render(entity, f, f1, f2, f3, f4, f5);
-			GL11.glPopMatrix();
+				GL11.glPopMatrix();
+			}
 		}
+
 		GL11.glPopMatrix();
 	}