Lots of new Modifiers

New -
Modifiers
Gauntlets
Metallurgy 5 in the Finishing anvil!
Fixes -
Fixed armor render to render 4x less...

27 files changed, 666 insertions, 266 deletions

diff --git a/src/main/java/lance5057/tDefense/armor/ArmorCore.java b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
index f43cc46..6405da0 100644
--- a/src/main/java/lance5057/tDefense/armor/ArmorCore.java
+++ b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
@@ -1,5 +1,6 @@
 package lance5057.tDefense.armor;
 
+import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.armor.modifiers.ArmorMods;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.Entity;
@@ -21,14 +22,12 @@ public class ArmorCore extends ToolCore implements ISpecialArmor
 	int				slot;
 	public float	reductionPercent	= 0f;
 	protected int	maxReduction		= 100;
-	ArmorMods		amod;
-
+	
 	public ArmorCore(int baseProtection, int slot)
 	{
 		super(baseProtection);
 
 		this.slot = slot;
-		amod = new ArmorMods();
 	}
 
 	@Override
@@ -124,7 +123,7 @@ public class ArmorCore extends ToolCore implements ISpecialArmor
 	public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack)
 	{
 
-		amod.UpdateAll((ToolCore) itemStack.getItem(), itemStack, world, player, itemStack.getTagCompound().getCompoundTag("InfiTool"));
+		TinkersDefense.mods.AMod.UpdateAll((ToolCore) itemStack.getItem(), itemStack, world, player, itemStack.getTagCompound().getCompoundTag("InfiTool"));
 	}
 
 }
diff --git a/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java b/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java
index f98206e..f6ca02c 100644
--- a/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java
+++ b/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java
@@ -84,6 +84,21 @@ public class UnstableBlock extends Block
 	{
 		return 1;
 	}
+	@Override
+	public void breakBlock(World par1World, int par2, int par3, int par4, Block p_149749_5_, int meta)
+	{
+		//int meta = par1World.getBlockMetadata(par2, par3, par4);
+
+		if(meta == 0)
+		{
+			par1World.setBlock(par2, par3, par4, Blocks.water, 0, 3);
+		}
+		if(meta == 1)
+		{
+			par1World.setBlock(par2, par3, par4, Blocks.lava, 0, 3);
+		}
+		par1World.notifyBlockOfNeighborChange(par2, par3, par4, par1World.getBlock(par2, par3, par4));
+	}
 
 	@Override
 	public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random)
diff --git a/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java b/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java
index 9accd4f..99eedbe 100644
--- a/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java
+++ b/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java
@@ -1,5 +1,7 @@
 package lance5057.tDefense.armor.events;
 
+import tconstruct.armor.ArmorProxyClient;
+import tconstruct.armor.player.ArmorExtended;
 import lance5057.tDefense.armor.ArmorCore;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.player.EntityPlayer;
@@ -20,65 +22,73 @@ public class ArmorRenderEvent
 	{
 		if(event.entityPlayer != null)
 		{
-			for(int i = 0; i < 4; i++)
+			ArmorExtended armorEx = ArmorProxyClient.armorExtended;
+
+			ItemStack Armor = event.entityPlayer.inventory.armorItemInSlot(event.slot);
+
+			if(Armor != null)
 			{
-				if(event.entityPlayer.inventory.armorItemInSlot(i) != null)
-				{
-					ItemStack Armor = event.entityPlayer.inventory.armorItemInSlot(i);
-					NBTTagCompound tags = Armor.getTagCompound();
+				ModelBiped armorModel = Armor.getItem().getArmorModel(event.entityLiving, Armor, event.slot);
+
+				TrimArmor(armorModel, event);
+			}
+
+			ItemStack Accessory = armorEx.getStackInSlot(event.slot);
+
+			if(Accessory != null)
+			{
+				ModelBiped accessoryModel = Accessory.getItem().getArmorModel(event.entityLiving, Accessory, event.slot);
+
+				TrimArmor(accessoryModel, event);
+			}
+
+		}
+	}
+
+	private void TrimArmor(ModelBiped armorModel, RenderPlayerEvent.SetArmorModel event)
+	{
+		if(armorModel != null)
+		{
+			armorModel.isSneak = event.entityPlayer.isSneaking();
+			armorModel.isRiding = event.entityPlayer.isRiding();
+			armorModel.isChild = event.entityPlayer.isChild();
 
-					if(Armor.getItem() instanceof ArmorCore)
+			armorModel.onGround = event.entityPlayer.getSwingProgress(event.partialRenderTick);
+
+			if(event.entityPlayer instanceof EntityPlayer)
+			{
+				ItemStack itemstack = event.entityPlayer.inventory.getCurrentItem();
+				armorModel.heldItemRight = 0;
+				armorModel.aimedBow = false;
+				if(itemstack != null)
+				{
+					if(event.entityPlayer.getItemInUseCount() > 0)
 					{
-						ArmorCore AArmor = (ArmorCore) Armor.getItem();
-						ModelBiped armorModel = AArmor.getArmorModel(event.entityLiving, Armor, AArmor.getSlot());
+						EnumAction enumaction = itemstack.getItemUseAction();
 
-						if(armorModel != null)
+						if(enumaction == EnumAction.block)
 						{
-							armorModel.isSneak = event.entityPlayer.isSneaking();
-							armorModel.isRiding = event.entityPlayer.isRiding();
-							armorModel.isChild = event.entityPlayer.isChild();
-
-							armorModel.onGround = event.entityPlayer.getSwingProgress(event.partialRenderTick);
-
-							if(event.entityPlayer instanceof EntityPlayer)
-							{
-								ItemStack itemstack = event.entityPlayer.inventory.getCurrentItem();
-								armorModel.heldItemRight = 0;
-								armorModel.aimedBow = false;
-								if(itemstack != null)
-								{
-									if(event.entityPlayer.getItemInUseCount() > 0)
-									{
-										EnumAction enumaction = itemstack.getItemUseAction();
-
-										if(enumaction == EnumAction.block)
-										{
-											armorModel.heldItemRight = 3;
-										}
-										else if(enumaction == EnumAction.bow)
-										{
-											armorModel.aimedBow = true;
-										}
-									}
-									else
-									{
-										armorModel.heldItemRight = event.entityPlayer.getHeldItem() != null ? 1 : 0;
-									}
-								}
-							}
+							armorModel.heldItemRight = 3;
 						}
-
-						float yaw = event.entityPlayer.prevRotationYawHead + (event.entityPlayer.rotationYawHead - event.entityPlayer.prevRotationYawHead) * event.partialRenderTick;
-						float yawOffset = event.entityPlayer.prevRenderYawOffset + (event.entityPlayer.renderYawOffset - event.entityPlayer.prevRenderYawOffset) * event.partialRenderTick;
-						float limbs = event.entityPlayer.prevLimbSwingAmount + (event.entityPlayer.limbSwingAmount - event.entityPlayer.prevLimbSwingAmount) * event.partialRenderTick;
-						float limbSwing = event.entityPlayer.limbSwing - event.entityPlayer.limbSwingAmount * (1.0F - event.partialRenderTick);
-
-						armorModel.setRotationAngles(limbSwing, limbs, event.entityPlayer.ticksExisted, yaw - yawOffset, event.entityPlayer.rotationPitch, 0.1f, event.entityPlayer);
-						armorModel.render(event.entityPlayer, limbSwing, limbs, event.entityPlayer.ticksExisted, yaw - yawOffset, event.entityPlayer.rotationPitch, 0.1f);
+						else if(enumaction == EnumAction.bow)
+						{
+							armorModel.aimedBow = true;
+						}
+					}
+					else
+					{
+						armorModel.heldItemRight = event.entityPlayer.getHeldItem() != null ? 1 : 0;
 					}
 				}
 			}
+
+			float yaw = event.entityPlayer.prevRotationYawHead + (event.entityPlayer.rotationYawHead - event.entityPlayer.prevRotationYawHead) * event.partialRenderTick;
+			float yawOffset = event.entityPlayer.prevRenderYawOffset + (event.entityPlayer.renderYawOffset - event.entityPlayer.prevRenderYawOffset) * event.partialRenderTick;
+			float limbs = event.entityPlayer.prevLimbSwingAmount + (event.entityPlayer.limbSwingAmount - event.entityPlayer.prevLimbSwingAmount) * event.partialRenderTick;
+			float limbSwing = event.entityPlayer.limbSwing - event.entityPlayer.limbSwingAmount * (1.0F - event.partialRenderTick);
+
+			armorModel.setRotationAngles(limbSwing, limbs, event.entityPlayer.ticksExisted, yaw - yawOffset, event.entityPlayer.rotationPitch, 0.1f, event.entityPlayer);
+			armorModel.render(event.entityPlayer, limbSwing, limbs, event.entityPlayer.ticksExisted, yaw - yawOffset, event.entityPlayer.rotationPitch, 0.1f);
 		}
 	}
-
 }
diff --git a/src/main/java/lance5057/tDefense/armor/items/Sheath.java b/src/main/java/lance5057/tDefense/armor/items/Sheath.java
index b631d1b..1dc87ea 100644
--- a/src/main/java/lance5057/tDefense/armor/items/Sheath.java
+++ b/src/main/java/lance5057/tDefense/armor/items/Sheath.java
@@ -1,19 +1,24 @@
 package lance5057.tDefense.armor.items;
 
+import lance5057.tDefense.TinkersDefense;
+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 IAccessoryModel, IAccessory
+public class Sheath extends ToolCore implements IAccessory
 {
 
 	public Sheath()
@@ -31,34 +36,43 @@ public class Sheath extends ToolCore implements IAccessoryModel, IAccessory
 	@SideOnly(Side.CLIENT)
 	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot)
 	{
-		String color[] = new String[10];
+		String[] color = new String[10];
 
-		for(int i = 0; i < 10; i++)
-			color[i] = Integer.toHexString(this.getColorFromItemStack(itemStack, i));
+		for(int j = 0; j < 10; j++)
+			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
+		
+		int HandleID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderExtra");
+		
+		color[3] = Integer.toHexString(TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class).color);
 
-		return new ModelSheath(color);
+		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(4), this.getIconSuffix(3)};
+
+		ClientProxy.sheath.SetColors(color, this.getDefaultFolder(), textures);
+		return ClientProxy.sheath;
 	}
 
 	@Override
-	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
+	public Item getHeadItem()
 	{
-		return "tinkersdefense:textures/armor/Sheath/_sheath_base.png";
+		return TinkersDefense.partArmorplate;
 	}
 
-	ResourceLocation	texture	= new ResourceLocation("tinkersdefense", "textures/armor/Sheath/_sheath_base.png");
-
 	@Override
-	@SideOnly(Side.CLIENT)
-	public ResourceLocation getWearbleTexture(Entity entity, ItemStack stack, int slot)
+	public Item getHandleItem()
 	{
-		return texture;
+		return TinkerTools.toolRod;
 	}
 
 	@Override
 	public Item getAccessoryItem()
 	{
-		// TODO Auto-generated method stub
-		return null;
+		return TinkersDefense.partClasp;
+	}
+
+	@Override
+	public Item getExtraItem()
+	{
+		return TinkersDefense.partCloth;
 	}
 
 	@Override
@@ -74,13 +88,6 @@ public class Sheath extends ToolCore implements IAccessoryModel, IAccessory
 		return "_sheath_effect";
 	}
 
-	@Override
-	public Item getHeadItem()
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
 	@SideOnly(Side.CLIENT)
 	@Override
 	public int getPartAmount()
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 98a17bb..361bf54 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
@@ -6,6 +6,7 @@ import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.parts.ClothMaterial;
 import lance5057.tDefense.armor.renderers.cloth.ModelTinkersHood;
+import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -120,17 +121,21 @@ public class TinkersHood extends ArmorCore
 	@Override
 	public String[] getTraits()
 	{
-		return new String[] {"armor", "helmet", "hood", "cloth"};
+		return new String[] {"armor", "head", "hood", "cloth"};
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ModelBiped getModel(String[] color, NBTTagCompound tags)
+	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)};
 
-		int HeadID = tags.getCompoundTag("InfiTool").getInteger("RenderHead");
-		int HandleID = tags.getCompoundTag("InfiTool").getInteger("RenderHandle");
+		for(int j = 0; j < 10; j++)
+			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
+
+		int HeadID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderHead");
+		int HandleID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderHandle");
 
 		CustomMaterial newColor = TConstructRegistry.getCustomMaterial(HeadID, ClothMaterial.class);
 		color[1] = Integer.toHexString(newColor.color);
@@ -138,7 +143,8 @@ public class TinkersHood extends ArmorCore
 		newColor = TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class);
 		color[0] = Integer.toHexString(newColor.color);
 
-		return new ModelTinkersHood(color, this.getDefaultFolder(), textures);
+		ClientProxy.hood.SetColors(color, this.getDefaultFolder(), textures);
+		return ClientProxy.hood;
 	}
 
 	@Override
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 d963c1d..394267c 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java
@@ -8,8 +8,10 @@ import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.parts.ClothMaterial;
 import lance5057.tDefense.armor.renderers.cloth.ModelTinkersRobe;
+import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -114,12 +116,16 @@ public class TinkersRobe extends ArmorCore
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ModelBiped getModel(String[] color, NBTTagCompound tags)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot)
 	{
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0)};
+		String[] color = new String[10];
+		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
 
-		int HeadID = tags.getCompoundTag("InfiTool").getInteger("RenderHead");
-		int HandleID = tags.getCompoundTag("InfiTool").getInteger("RenderHandle");
+		for(int j = 0; j < 10; j++)
+			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
+
+		int HeadID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderHead");
+		int HandleID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderHandle");
 
 		CustomMaterial newColor = TConstructRegistry.getCustomMaterial(HeadID, ClothMaterial.class);
 		color[1] = Integer.toHexString(newColor.color);
@@ -127,7 +133,8 @@ public class TinkersRobe extends ArmorCore
 		newColor = TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class);
 		color[0] = Integer.toHexString(newColor.color);
 
-		return new ModelTinkersRobe(color, this.getDefaultFolder(), textures);
+		ClientProxy.robe.SetColors(color, this.getDefaultFolder(), textures);
+		return ClientProxy.robe;
 	}
 
 	@Override
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 76b5ae9..9afc5f1 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java
@@ -7,8 +7,10 @@ import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.parts.ClothMaterial;
 import lance5057.tDefense.armor.renderers.cloth.ModelTinkersShawl;
 import lance5057.tDefense.armor.renderers.heavy.ModelTinkersHelm;
+import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -124,12 +126,16 @@ public class TinkersShawl extends ArmorCore
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ModelBiped getModel(String[] color, NBTTagCompound tags)
+	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)};
 
-		int HeadID = tags.getCompoundTag("InfiTool").getInteger("RenderHead");
-		int HandleID = tags.getCompoundTag("InfiTool").getInteger("RenderHandle");
+		for(int j = 0; j < 10; j++)
+			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
+
+		int HeadID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderHead");
+		int HandleID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderHandle");
 
 		CustomMaterial newColor = TConstructRegistry.getCustomMaterial(HeadID, ClothMaterial.class);
 		color[1] = Integer.toHexString(newColor.color);
@@ -137,7 +143,8 @@ public class TinkersShawl extends ArmorCore
 		newColor = TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class);
 		color[0] = Integer.toHexString(newColor.color);
 
-		return new ModelTinkersShawl(color, this.getDefaultFolder(), textures);
+		ClientProxy.shawl.SetColors(color, this.getDefaultFolder(), textures);
+		return ClientProxy.shawl;
 	}
 
 	@Override
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 0ab18d1..1b481be 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java
@@ -6,8 +6,10 @@ import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.parts.ClothMaterial;
 import lance5057.tDefense.armor.renderers.light.ModelTinkersBoots;
+import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -122,16 +124,21 @@ public class TinkersShoes extends ArmorCore
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ModelBiped getModel(String[] color, NBTTagCompound tags)
+	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)};
 
-		int HeadID = tags.getCompoundTag("InfiTool").getInteger("RenderHead");
+		for(int j = 0; j < 10; j++)
+			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
+
+		int HeadID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderHead");
 
 		CustomMaterial newColor = TConstructRegistry.getCustomMaterial(HeadID, ClothMaterial.class);
 		color[1] = Integer.toHexString(newColor.color);
 
-		return (ModelBiped) new ModelTinkersBoots(color, this.getDefaultFolder(), textures);
+		ClientProxy.shoes.SetColors(color, this.getDefaultFolder(), textures);
+		return ClientProxy.shoes;
 	}
 
 	@Override
diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGauntlets.java
new file mode 100644
index 0000000..4a94f9e
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGauntlets.java
@@ -0,0 +1,148 @@
+package lance5057.tDefense.armor.items.heavy;
+
+import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.armor.ArmorCore;
+import lance5057.tDefense.proxy.ClientProxy;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+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 TinkersGauntlets extends ToolCore implements IAccessory
+{
+	public TinkersGauntlets()
+	{
+		super(2);
+		this.setUnlocalizedName("tinkersgauntlets");
+	}
+
+	@Override
+	public boolean canEquipAccessory(ItemStack item, int slot)
+	{
+		return slot == 1;
+	}
+
+	@Override
+	public Item getHeadItem()
+	{
+		return TinkersDefense.partArmorplate;
+	}
+
+	@Override
+	public Item getHandleItem()
+	{
+		return TinkerTools.toughRod;
+	}
+
+	@Override
+	public Item getAccessoryItem()
+	{
+		return TinkersDefense.partRivet;
+	}
+
+	@Override
+	public int durabilityTypeAccessory()
+	{
+		return 2;
+	}
+
+	@Override
+	public float getRepairCost()
+	{
+		return 1.0f;
+	}
+
+	@Override
+	public float getDurabilityModifier()
+	{
+		return 2.5f;
+	}
+
+	@Override
+	public float getDamageModifier()
+	{
+		return 1.4f;
+	}
+
+	@Override
+	public int getPartAmount()
+	{
+		return 3;
+	}
+
+	@Override
+	public String getIconSuffix(int partType)
+	{
+		switch(partType)
+		{
+			case 0:
+				return "_gauntlet_plate";
+			case 1:
+				return "_gauntlet_plate_broken";
+			case 2:
+				return "_gauntlet_trim";
+			case 3:
+				return "_gauntlet_rivet";
+			default:
+				return "";
+		}
+	}
+
+	@Override
+	public String getEffectSuffix()
+	{
+		return "_gauntlet_effect";
+	}
+
+	@Override
+	public String getDefaultFolder()
+	{
+		return "armor/gauntlets";
+	}
+
+	// @Override
+	// public void onUpdate(ItemStack stack, World world, Entity entity, int
+	// par4,
+	// boolean par5) {
+	// super.onUpdate(stack, world, entity, par4, par5);
+	//
+	// }
+
+	@Override
+	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
+	{
+		return "tinkersdefense:textures/armor/Tinkersgauntlet.png";
+	}
+
+	@Override
+	public String[] getTraits()
+	{
+		return new String[] {"hands", "gauntlet"};
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot)
+	{
+		String[] color = new String[10];
+
+		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.gauntlets.SetColors(color, this.getDefaultFolder(), textures);
+		return ClientProxy.gauntlets;
+	}
+}
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 5bd30f2..23287b9 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
@@ -121,7 +121,7 @@ public class TinkersHelm extends ArmorCore
 	@Override
 	public String[] getTraits()
 	{
-		return new String[] {"armor", "helmet", "helm", "heavyarmor"};
+		return new String[] {"armor", "head", "helm", "heavyarmor"};
 	}
 
 	@Override
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 ce972ea..acce2b6 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java
@@ -7,6 +7,7 @@ import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.parts.ClothMaterial;
 import lance5057.tDefense.armor.renderers.cloth.ModelTinkersHood;
 import lance5057.tDefense.armor.renderers.light.ModelTinkersBoots;
+import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -128,16 +129,21 @@ public class TinkersBoots extends ArmorCore
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ModelBiped getModel(String[] color, NBTTagCompound tags)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot)
 	{
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
+		String[] color = new String[10];
 
-		int HandleID = tags.getCompoundTag("InfiTool").getInteger("RenderHandle");
+		for(int j = 0; j < 10; j++)
+			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
+		
+		int AccessoryID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderHandle");
 
-		CustomMaterial newColor = TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class);
+		CustomMaterial newColor = TConstructRegistry.getCustomMaterial(AccessoryID, ClothMaterial.class);
 		color[0] = Integer.toHexString(newColor.color);
 
-		return new ModelTinkersBoots(color, this.getDefaultFolder(), textures);
+		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
+		ClientProxy.boots.SetColors(color, this.getDefaultFolder(), textures);
+		return ClientProxy.boots;
 	}
 
 	@Override
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 c552584..40fc7f0 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java
@@ -6,6 +6,7 @@ import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.parts.ClothMaterial;
 import lance5057.tDefense.armor.renderers.light.ModelTinkersChausses;
+import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -119,11 +120,16 @@ public class TinkersChausses extends ArmorCore
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ModelBiped getModel(String[] color, NBTTagCompound tags)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot)
 	{
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0)};
+		String[] color = new String[10];
+
+		for(int j = 0; j < 10; j++)
+			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
 
-		return new ModelTinkersChausses(color, this.getDefaultFolder(), textures);
+		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0)};
+		ClientProxy.chausses.SetColors(color, this.getDefaultFolder(), textures);
+		return ClientProxy.chausses;
 	}
 
 	@Override
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 98a77c6..4e1b538 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
@@ -7,6 +7,7 @@ import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.parts.ClothMaterial;
 import lance5057.tDefense.armor.renderers.cloth.ModelTinkersHood;
 import lance5057.tDefense.armor.renderers.light.ModelTinkersCoif;
+import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -129,16 +130,21 @@ public class TinkersCoif extends ArmorCore
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public ModelBiped getModel(String[] color, NBTTagCompound tags)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot)
 	{
-		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
+		String[] color = new String[10];
 
-		int HandleID = tags.getCompoundTag("InfiTool").getInteger("RenderHandle");
+		for(int j = 0; j < 10; j++)
+			color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
+		
+		int AccessoryID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderHandle");
 
-		CustomMaterial newColor = TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class);
+		CustomMaterial newColor = TConstructRegistry.getCustomMaterial(AccessoryID, ClothMaterial.class);
 		color[0] = Integer.toHexString(newColor.color);
 
-		return new ModelTinkersCoif(color, this.getDefaultFolder(), textures);
+		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
+		ClientProxy.coif.SetColors(color, this.getDefaultFolder(), textures);
+		return ClientProxy.coif;
 	}
 
 	@Override
diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersHalberd.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersHalberd.java
index b71d719..3c7ca44 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersHalberd.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersHalberd.java
@@ -137,9 +137,9 @@ public class TinkersHalberd 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.breastplate.SetColors(color, this.getDefaultFolder(), textures);
-		return ClientProxy.breastplate;
+		String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)};
+		ClientProxy.halberd.SetColors(color, this.getDefaultFolder(), textures);
+		return ClientProxy.halberd;
 	}
 
 	@Override
diff --git a/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java b/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java
index b59f789..9bc1766 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java
@@ -1,12 +1,15 @@
 package lance5057.tDefense.armor.modifiers;
 
+import lance5057.tDefense.Reference;
 import lance5057.tDefense.TinkersDefense;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLiquid;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
@@ -14,49 +17,97 @@ import tconstruct.library.TConstructRegistry;
 import tconstruct.library.client.TConstructClientRegistry;
 import tconstruct.library.crafting.ModifyBuilder;
 import tconstruct.library.tools.ToolCore;
+import tconstruct.tools.TinkerTools;
+import cpw.mods.fml.common.registry.GameRegistry;
 
 public class ArmorMods
 {
 
-	public ArmorMods()
-	{
-		LoadItems();
-		RegisterRecipes();
-		RegisterModifiers();
-	}
+	//	public ArmorMods()
+	//	{
+	//		
+	//	}
+	Item	item_Canister;
+	Item	item_Emptycanister;
+	Item	item_Rebreather;
+
+	Item	item_Glowsole;
+	Item	item_Firesole;
+	Item	item_Icesole;
+	Item	item_Feathersole;
+	Item	item_Flippers;
 
 	public void LoadItems()
 	{
-		// protKit = new Item()
-		// .setUnlocalizedName("protectionkit")
-		// .setCreativeTab(TinkersDefense.tabName)
-		// .setTextureName("tinkersdefense:protectionkit");
-		//
-		// GameRegistry.registerItem(protKit, "protectionkit");
+		item_Canister = new Item().setCreativeTab(TinkersDefense.tabName).setMaxStackSize(10).setUnlocalizedName("FilledCart").setTextureName(Reference.MOD_ID + ":FilledCart");
+		item_Emptycanister = new Item().setCreativeTab(TinkersDefense.tabName).setMaxStackSize(10).setUnlocalizedName("EmptyCart").setTextureName(Reference.MOD_ID + ":EmptyCart");
+		item_Rebreather = new Item().setCreativeTab(TinkersDefense.tabName).setMaxStackSize(1).setUnlocalizedName("Rebreather").setTextureName(Reference.MOD_ID + ":Rebreather");
+
+		item_Feathersole = new Item().setCreativeTab(TinkersDefense.tabName).setMaxStackSize(1).setUnlocalizedName("FeatherSole").setTextureName(Reference.MOD_ID + ":FeatherSole");
+		item_Firesole = new Item().setCreativeTab(TinkersDefense.tabName).setMaxStackSize(1).setUnlocalizedName("FireSole").setTextureName(Reference.MOD_ID + ":FireSole");
+		item_Icesole = new Item().setCreativeTab(TinkersDefense.tabName).setMaxStackSize(1).setUnlocalizedName("IceSole").setTextureName(Reference.MOD_ID + ":IceSole");
+		item_Glowsole = new Item().setCreativeTab(TinkersDefense.tabName).setMaxStackSize(1).setUnlocalizedName("GlowSole").setTextureName(Reference.MOD_ID + ":GlowSole");
+		item_Flippers = new Item().setCreativeTab(TinkersDefense.tabName).setMaxStackSize(1).setUnlocalizedName("Flippers").setTextureName(Reference.MOD_ID + ":Flippers");
+
+		GameRegistry.registerItem(item_Canister, "FilledCart");
+		GameRegistry.registerItem(item_Emptycanister, "EmptyCart");
+		GameRegistry.registerItem(item_Rebreather, "Rebreather");
+		
+		GameRegistry.registerItem(item_Feathersole, "FeatherSole");
+		GameRegistry.registerItem(item_Firesole, "FireSole");
+		GameRegistry.registerItem(item_Icesole, "IceSole");
+		GameRegistry.registerItem(item_Glowsole, "GlowSole");
+		GameRegistry.registerItem(item_Flippers, "Flippers");
 	}
 
 	public void RegisterRecipes()
 	{
-		// GameRegistry.addShapelessRecipe(new ItemStack(protKit,1), new
-		// ItemStack(TinkersDefense.partArmorplate,1,2),
-		// TinkerArmor.heartCanister, Items.iron_ingot);
+		GameRegistry.addShapedRecipe(new ItemStack(item_Canister), new Object[] {"-c-", "ses", "-s-", 'c', new ItemStack(Items.coal, 1, 1), 's', new ItemStack(Blocks.sapling, 1), 'e', new ItemStack(item_Emptycanister, 1, 0)});
+		GameRegistry.addShapedRecipe(new ItemStack(item_Emptycanister), new Object[] {"gsg", "lil", "gig", 'g', new ItemStack(Items.gold_nugget, 1, 0), 's', new ItemStack(Items.slime_ball, 1, 0), 'l', new ItemStack(Items.dye, 1, 4), 'i', new ItemStack(Items.iron_ingot, 1, 0)});
+		GameRegistry.addShapedRecipe(new ItemStack(item_Rebreather), new Object[] {"-s-", "eie", "-d-", 's', new ItemStack(Items.slime_ball, 1, 0), 'e', new ItemStack(item_Emptycanister, 1, 0), 'i', new ItemStack(TinkersDefense.partArmorplate,1,2), 'd', new ItemStack(Items.dye, 1, 0)});
+
+		GameRegistry.addShapedRecipe(new ItemStack(item_Glowsole), new Object[] {"ggg", "ala", "ggg", 'g', new ItemStack(Blocks.glowstone, 1, 0), 'a', new ItemStack(Items.glowstone_dust, 1, 0), 'l', TConstructRegistry.getItemStack("lavaCrystal")});
+		GameRegistry.addShapedRecipe(new ItemStack(item_Glowsole), new Object[] {"gag", "glg", "gag", 'g', new ItemStack(Blocks.glowstone, 1, 0), 'a', new ItemStack(Items.glowstone_dust, 1, 0), 'l', TConstructRegistry.getItemStack("lavaCrystal")});
+		GameRegistry.addShapedRecipe(new ItemStack(item_Feathersole), new Object[] {"fgf", 'g', new ItemStack(Items.gold_nugget, 1, 0), 'f', new ItemStack(Items.feather, 1, 0)});
+		GameRegistry.addShapedRecipe(new ItemStack(item_Firesole), new Object[] {"lol", "oao", "lol", 'o', new ItemStack(Blocks.obsidian, 1, 0), 'a', TConstructRegistry.getItemStack("ingotArdite"), 'l', TConstructRegistry.getItemStack("lavaCrystal")});
+		GameRegistry.addShapedRecipe(new ItemStack(item_Icesole), new Object[] {"ili", "lcl", "ili", 'l', new ItemStack(Blocks.lapis_block, 1, 0), 'i', new ItemStack(Blocks.ice, 1, 0), 'c', TConstructRegistry.getItemStack("ingotCobalt")});
+		GameRegistry.addShapedRecipe(new ItemStack(item_Flippers), new Object[] {"-b-", "rlr", "-s-", 'b', new ItemStack(Items.leather_boots, 1, 0), 'l', new ItemStack(Items.leather, 1, 0), 'r', new ItemStack(TinkerTools.toolRod,1,2), 's', new ItemStack(Items.slime_ball, 1, 0)});
+
 	}
 
 	public void RegisterModifiers()
 	{
+		//Head only
+		ModifyBuilder.registerModifier(new modifierBoolExclusive(new ItemStack[] {new ItemStack(item_Rebreather, 1, 0)}, TinkersDefense.config.ArmorRebreatherID, "Rebreather", "\u00A76", "Rebreather", new String[] {"head"}));
+		
+		//Excluding Cloth
 		ModifyBuilder.registerModifier(new modifierProtection(new ItemStack[] {new ItemStack(TinkersDefense.partArmorplate, 1, 2)}, TinkersDefense.config.ArmorProtectionID, 1, "\u00A77", "Protection"));
 		ModifyBuilder.registerModifier(new modifierProtection(new ItemStack[] {new ItemStack(Items.magma_cream, 1)}, TinkersDefense.config.ArmorFireProtectionID, 1, "\u00A7c", "Fire Protection"));
 		ModifyBuilder.registerModifier(new modifierProtection(new ItemStack[] {new ItemStack(Blocks.wool, 1)}, TinkersDefense.config.ArmorBlastProtectionID, 1, "\u00A72", "Blast Protection"));
 		ModifyBuilder.registerModifier(new modifierProtection(new ItemStack[] {new ItemStack(TinkersDefense.partRivet, 1, 2)}, TinkersDefense.config.ArmorProjectileProtectionID, 1, "\u00A7f", "Projectile Protection"));
-		ModifyBuilder.registerModifier(new modifierProtection(new ItemStack[] {new ItemStack(Blocks.hay_block)}, TinkersDefense.config.FeatherfallID, 1, "\u00A7f", "Featherfall"));
+		ModifyBuilder.registerModifier(new modifierProtection(new ItemStack[] {new ItemStack(item_Feathersole, 1, 0)}, TinkersDefense.config.ArmorFeatherfallID, 1, "\u00A7f", "Featherfall"));
+		
+		//Feet only
+		ModifyBuilder.registerModifier(new modifierBoolExclusive(new ItemStack[] {new ItemStack(item_Glowsole, 1, 0)}, TinkersDefense.config.ArmorGlowstepID, "GlowStep", "\u00A76", "GlowStep", new String[] {"feet"}));
+		ModifyBuilder.registerModifier(new modifierBoolExclusive(new ItemStack[] {new ItemStack(item_Firesole, 1, 0)}, TinkersDefense.config.ArmorFirewalkerID, "Firewalker", "\u00A74", "Firewalker", new String[] {"feet"}));
+		ModifyBuilder.registerModifier(new modifierBoolExclusive(new ItemStack[] {new ItemStack(item_Icesole, 1, 0)}, TinkersDefense.config.ArmorFrostwalkerID, "Frostwalker", "\u00A7b", "Frostwalker", new String[] {"feet"}));
+		ModifyBuilder.registerModifier(new modifierBoolExclusive(new ItemStack[] {new ItemStack(item_Flippers, 1, 0)}, TinkersDefense.config.ArmorDepthstriderID, "Depthstrider", "\u00A71", "Depthstrider", new String[] {"feet"}));
 
 		for(ToolCore tool : TConstructRegistry.getToolMapping())
 		{
+			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorRebreatherID, "tinker", "rebreather", true);
+
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorProtectionID, "tinker", "protection", true);
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorFireProtectionID, "tinker", "fireprotection", true);
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorBlastProtectionID, "tinker", "blastprotection", true);
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorProjectileProtectionID, "tinker", "projprotection", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.FeatherfallID, "tinker", "featherfall", true);
+			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorFeatherfallID, "tinker", "featherfall", true);
+			
+			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorGlowstepID, "tinker", "glowstep", true);
+			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorFirewalkerID, "tinker", "firewalk", true);
+			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorFrostwalkerID, "tinker", "frostwalk", true);
+			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorDepthstriderID, "tinker", "depthstrider", true);
+
 		}
 	}
 
@@ -64,9 +115,19 @@ public class ArmorMods
 	{
 		if(!world.isRemote)
 		{
-			UpdateWalker(tool, stack, world, entity, Material.water, TinkersDefense.block_Unstable, 0);
-			UpdateWalker(tool, stack, world, entity, Material.lava, TinkersDefense.block_Unstable, 1);
-			UpdateGlowstep(tool, stack, world, entity);
+			if(tags.hasKey("Frostwalker"))
+				UpdateWalker(tool, stack, world, entity, Material.water, TinkersDefense.block_Unstable, 0);
+			if(tags.hasKey("Firewalker"))
+				UpdateWalker(tool, stack, world, entity, Material.lava, TinkersDefense.block_Unstable, 1);
+			if(tags.hasKey("GlowStep"))
+				UpdateGlowstep(tool, stack, world, entity);
+			if(tags.hasKey("Rebreather"))
+				UpdateRebreather(tool, stack, world, entity);
+		}
+		else
+		{
+			if(tags.hasKey("Depthstrider"))
+				UpdateFlippers(tool, stack, world, entity);
 		}
 	}
 
@@ -120,4 +181,34 @@ public class ArmorMods
 		prevX = x;
 		prevZ = z;
 	}
+	
+	public void UpdateFlippers(ToolCore tool, ItemStack stack, World world, Entity entity)
+	{
+		if(entity.isInWater())
+		{
+			entity.motionX *= 1.2;
+			entity.motionY *= 1.2;
+			entity.motionZ *= 1.2;
+		}
+	}
+	
+	public void UpdateRebreather(ToolCore tool, ItemStack stack, World world, Entity entity)
+	{
+		EntityPlayer player = (EntityPlayer) entity;
+		if(player.getAir() <= 0)
+		{
+			if(player.inventory.hasItem(item_Canister))
+			{
+				player.inventory.consumeInventoryItem(item_Canister);
+				player.inventory.addItemStackToInventory(new ItemStack(item_Emptycanister, 1, 0));
+				player.setAir(150);
+			}
+			if(player.inventory.hasItem(item_Canister))
+			{
+				player.inventory.consumeInventoryItem(item_Canister);
+				player.inventory.addItemStackToInventory(new ItemStack(item_Emptycanister, 1, 0));
+				player.setAir(300);
+			}
+		}
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/modifiers/modifierBoolExclusive.java b/src/main/java/lance5057/tDefense/armor/modifiers/modifierBoolExclusive.java
new file mode 100644
index 0000000..f573ada
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/modifierBoolExclusive.java
@@ -0,0 +1,36 @@
+package lance5057.tDefense.armor.modifiers;
+
+import java.util.Arrays;
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import tconstruct.library.tools.ToolCore;
+import tconstruct.modifiers.tools.ModBoolean;
+
+public class modifierBoolExclusive extends ModBoolean
+{
+	String[] exclusive;
+	public modifierBoolExclusive(ItemStack[] items, int effect, String tag, String c, String tip, String[] exclusive)
+	{
+		super(items, effect, tag, c, tip);
+		this.exclusive = exclusive;
+	}
+
+	@Override
+	protected boolean canModify(ItemStack tool, ItemStack[] input)
+	{
+		List list = Arrays.asList(((ToolCore) tool.getItem()).getTraits());
+		NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+		
+		for(int i = 0; i < exclusive.length; i++)
+		{
+			if(list.contains(exclusive[i]))
+			{
+				return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key);
+			}
+		}
+		
+		return false;
+	}
+}
diff --git a/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java b/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java
index f691adf..986c03e 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java
@@ -25,6 +25,7 @@ public class modifierProtection extends ModInteger
 		super(items, effect, t, increase, c, t);
 		color = c;
 		type = t;
+		initialIncrease = secondaryIncrease = increase;
 	}
 
 	@Override
@@ -90,35 +91,4 @@ public class modifierProtection extends ModInteger
 
 		addToolTip(tool, color + tooltipName, color + key);
 	}
-
-	protected int addToolTip(ItemStack tool, String tooltip, String modifierTip)
-	{
-		NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
-		int tipNum = 0;
-		while(true)
-		{
-			tipNum++;
-			String tip = "Tooltip" + tipNum;
-			if(!tags.hasKey(tip))
-			{
-				tags.setString(tip, "");
-				String modTip = "ModifierTip" + tipNum;
-				String tag = tags.getString(modTip);
-				tags.setString(modTip, getProperName(modifierTip, tag));
-				return tipNum;
-			}
-			else
-			{
-				String modTip = "ModifierTip" + tipNum;
-				String tag = tags.getString(modTip);
-				if(tag.contains(modifierTip))
-				{
-					tags.setString(tip, "");
-					tag = tags.getString(modTip);
-					tags.setString(modTip, getProperName(modifierTip, tag));
-					return tipNum;
-				}
-			}
-		}
-	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
index 609908d..2fdc674 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
@@ -14,7 +14,7 @@ import cpw.mods.fml.client.FMLClientHandler;
  * ModelBiped - Either Mojang or a mod author
  * Created using Tabula 4.1.1
  */
-public class ModelSheath extends ModelBiped
+public class ModelSheath extends ArmorRenderer
 {
 	public ModelRenderer	sheath;
 	public ModelRenderer	belt;
@@ -22,78 +22,48 @@ public class ModelSheath extends ModelBiped
 	String					Color[];
 	int						rgbColors[];
 
-	public ModelSheath(String color[] /*4*/)
+	public ModelSheath()
 	{
-		this.textureWidth = 32;
-		this.textureHeight = 32;
-		this.belt = new ModelRenderer(this, 16, 0);
+		super(0.5f, 0, 64, 64);
+
+		this.textureWidth = 64;
+		this.textureHeight = 64;
+
+		this.belt = new ModelRenderer(this, 16, 32);
 		this.belt.setRotationPoint(-4.5F, 0.0F, 0.5F);
 		this.belt.addBox(0.0F, 0.0F, -3.0F, 1, 12, 5, 0.0F);
 		this.setRotateAngle(belt, 0.0F, 0.0F, -0.7853981633974483F);
-		this.sheath = new ModelRenderer(this, 0, 0);
-		this.sheath.setRotationPoint(-0.3F, 3.5F, 2.0F);
-		this.sheath.addBox(-3.0F, 0.0F, 0.0F, 6, 24, 2, 0.0F);
-		this.setRotateAngle(sheath, 0.0F, 0.0F, -0.45F);
+		this.bipedBody.addChild(belt);
 
-		Color = color;
+		this.sheath = new ModelRenderer(this, 0, 32);
+		this.sheath.setRotationPoint(0f, 0f, 0f);
+		this.sheath.addBox(-5.0F, 0.0F, 2.0F, 5, 16, 2, -0.4F);
+		this.setRotateAngle(sheath, 0.0F, 0.0F, -0.45F);
+		this.bipedBody.addChild(sheath);
 	}
 
 	@Override
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
 	{
-
-		GL11.glPushMatrix();
-
-		//Sheath Base
-		GL11.glPushMatrix();
-		rgbColors = TinkersDefense.hexToRGB(Color[1]);
-		GL11.glColor3d((float) rgbColors[0] / 255, (float) rgbColors[1] / 255, (float) rgbColors[2] / 255);
-
-		GL11.glTranslatef(this.sheath.offsetX, this.sheath.offsetY, this.sheath.offsetZ);
-		GL11.glTranslatef(this.sheath.rotationPointX * f5, this.sheath.rotationPointY * f5, this.sheath.rotationPointZ * f5);
-		GL11.glScaled(0.65D, 0.65D, 0.5D);
-		GL11.glTranslatef(-this.sheath.offsetX, -this.sheath.offsetY, -this.sheath.offsetZ);
-		GL11.glTranslatef(-this.sheath.rotationPointX * f5, -this.sheath.rotationPointY * f5, -this.sheath.rotationPointZ * f5);
-
-		this.sheath.render(f5);
-		GL11.glPopMatrix();
-
-		//Belt
 		GL11.glPushMatrix();
-		FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/armor/Sheath/_sheath_belt.png"));
-
-		rgbColors = TinkersDefense.hexToRGB(Color[2]);
-		GL11.glColor3d((float) rgbColors[0] / 255, (float) rgbColors[1] / 255, (float) rgbColors[2] / 255);
-
-		this.belt.render(f5);
-		GL11.glPopMatrix();
+		for(int i = 0; i < 4; i++)
+		{
+			GL11.glPushMatrix();
 
-		//Buckle
-		GL11.glPushMatrix();
-		FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/armor/Sheath/_sheath_clasp.png"));
+			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
 
-		rgbColors = TinkersDefense.hexToRGB(Color[3]);
-		GL11.glColor3d((float) rgbColors[0] / 255, (float) rgbColors[1] / 255, (float) rgbColors[2] / 255);
+			float size = 1.6f;
+			GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
+			GL11.glTranslatef(0.0F, -0.0F, 0.0F);
 
-		this.belt.render(f5);
-		GL11.glPopMatrix();
+			int[] intColors = TinkersDefense.hexToRGB(colors[i]);
+			GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
 
-		//Filigree
-		GL11.glPushMatrix();
-		FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/armor/Sheath/_sheath_filigree.png"));
-
-		rgbColors = TinkersDefense.hexToRGB(Color[0]);
-		GL11.glColor3d((float) rgbColors[0] / 255, (float) rgbColors[1] / 255, (float) rgbColors[2] / 255);
-
-		GL11.glTranslatef(this.sheath.offsetX, this.sheath.offsetY, this.sheath.offsetZ);
-		GL11.glTranslatef(this.sheath.rotationPointX * f5, this.sheath.rotationPointY * f5, this.sheath.rotationPointZ * f5);
-		GL11.glScaled(0.65D, 0.65D, 0.5D);
-		GL11.glTranslatef(-this.sheath.offsetX, -this.sheath.offsetY, -this.sheath.offsetZ);
-		GL11.glTranslatef(-this.sheath.rotationPointX * f5, -this.sheath.rotationPointY * f5, -this.sheath.rotationPointZ * f5);
-
-		this.sheath.render(f5);
-		GL11.glPopMatrix();
+			//setLivingAnimations((EntityLivingBase) entity, f,f1, f5);
+			super.render(entity, f, f1, f2, f3, f4, f5);
 
+			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 077b6ca..59b058c 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
@@ -19,9 +19,9 @@ public class ModelTinkersHood extends ArmorRenderer
 	public ModelRenderer	Hood;
 	public ModelRenderer	Flop;
 
-	public ModelTinkersHood(String[] colors, String defaultFolder, String[] textures)
+	public ModelTinkersHood()
 	{
-		super(1.1f, 0, 64, 64);
+		super(1.0f, 0, 64, 64);
 
 		this.textureWidth = 64;
 		this.textureHeight = 64;
@@ -58,7 +58,7 @@ public class ModelTinkersHood extends ArmorRenderer
 			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);
+			//setRotationAngles(f, f1, f2, f3, f4, f5, entity);
 			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 024738d..a981f8f 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java
@@ -24,7 +24,7 @@ public class ModelTinkersRobe extends ArmorRenderer
 	public ModelRenderer	Belt;
 	public ModelRenderer	LeftBack;
 
-	public ModelTinkersRobe(String[] colors, String defaultFolder, String[] textures)
+	public ModelTinkersRobe()
 	{
 		super(1f, 0, 64, 64);
 
@@ -53,7 +53,7 @@ public class ModelTinkersRobe extends ArmorRenderer
 
 		this.Belt = new ModelRenderer(this, 0, 32);
 		this.Belt.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.Belt.addBox(-6.8F, 10.0F, -3.0F, 10, 3, 6, 0.0F);
+		this.Belt.addBox(-6.5F, 9.0F, -3.0F, 10, 3, 6, -0.1F);
 		this.setRotateAngle(Belt, 0.0F, 0.0F, -0.13962634015954636F);
 		this.bipedBody.addChild(this.Belt);
 
@@ -95,9 +95,9 @@ public class ModelTinkersRobe extends ArmorRenderer
 
 			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
 
-			float size = 1.45f;
+			float size = 1.6f;
 			GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
-			GL11.glTranslatef(0F, -1.5F * f5, -0F);
+			GL11.glTranslatef(0F, -0F * f5, -0F);
 
 			int[] intColors = TinkersDefense.hexToRGB(colors[i]);
 			GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
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 37519b2..f9c6ad1 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java
@@ -27,7 +27,7 @@ public class ModelTinkersShawl extends ArmorRenderer
 	public ModelRenderer	ArmRight;
 	public ModelRenderer	Chest;
 
-	public ModelTinkersShawl(String[] colors, String defaultFolder, String[] textures)
+	public ModelTinkersShawl()
 	{
 		super(1f, 0, 64, 64);
 
@@ -37,17 +37,17 @@ public class ModelTinkersShawl extends ArmorRenderer
 		this.ArmLeft = new ModelRenderer(this, 48, 48);
 		this.ArmLeft.mirror = true;
 		this.ArmLeft.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.ArmLeft.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, 0.0F);
+		this.ArmLeft.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, 0.02F);
 		this.bipedLeftArm.addChild(this.ArmLeft);
 
 		this.ArmRight = new ModelRenderer(this, 48, 48);
 		this.ArmRight.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.ArmRight.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, 0.0F);
+		this.ArmRight.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, 0.02F);
 		this.bipedRightArm.addChild(this.ArmRight);
 
 		this.Chest = new ModelRenderer(this, 40, 32);
 		this.Chest.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.Chest.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, 0.0F);
+		this.Chest.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, 0.02F);
 		this.bipedBody.addChild(this.Chest);
 
 		this.TopRight = new ModelRenderer(this, 0, 52);
@@ -108,7 +108,7 @@ public class ModelTinkersShawl extends ArmorRenderer
 
 			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
 
-			float size = 1.5f;
+			float size = 1.6f;
 			GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
 			GL11.glTranslatef(0F, -0F * f5, -0F);
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersBreastplate.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersBreastplate.java
index fa4ee35..f1d777c 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersBreastplate.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersBreastplate.java
@@ -47,7 +47,7 @@ public class ModelTinkersBreastplate extends ArmorRenderer
 
 		this.Plackart = new ModelRenderer(this, 0, 42);
 		this.Plackart.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.Plackart.addBox(-4.0F, 5.0F, -3.0F, 8, 7, 6, 0.0F);
+		this.Plackart.addBox(-4.0F, 5.0F, -3.0F, 8, 7, 6, 0.01F);
 		this.bipedBody.addChild(this.Plackart);
 
 		this.ArmGuardR = new ModelRenderer(this, 28, 44);
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGauntlets.java
new file mode 100644
index 0000000..e007127
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGauntlets.java
@@ -0,0 +1,105 @@
+package lance5057.tDefense.armor.renderers.heavy;
+
+import org.lwjgl.opengl.GL11;
+
+import cpw.mods.fml.client.FMLClientHandler;
+import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.armor.renderers.ArmorRenderer;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+
+/**
+ * TinkersGauntlets - Either Mojang or a mod author
+ * Created using Tabula 4.1.1
+ */
+public class ModelTinkersGauntlets extends ArmorRenderer
+{
+	public ModelRenderer	BracerL;
+	public ModelRenderer	RivetL;
+	public ModelRenderer	MittL;
+	public ModelRenderer	BracerR;
+	public ModelRenderer	RivetR;
+	public ModelRenderer	MittR;
+
+	public ModelTinkersGauntlets()
+	{
+		super(0.15f, 0, 64, 64);
+
+		this.textureWidth = 64;
+		this.textureHeight = 64;
+
+		this.BracerR = new ModelRenderer(this, 0, 56);
+		this.BracerR.mirror = true;
+		this.BracerR.setRotationPoint(0.0F, 0.0F, 0.0F);
+		this.BracerR.addBox(-3.3F, 4.0F, -2.0F, 3, 4, 4, 0.2F);
+		this.setRotateAngle(BracerR, 0.0F, 0.0F, -0.03490658503988659F);
+		this.bipedRightArm.addChild(BracerR);
+
+		this.RivetL = new ModelRenderer(this, 0, 47);
+		this.RivetL.setRotationPoint(0.0F, 0.0F, 0.0F);
+		this.RivetL.addBox(0.0F, 7.0F, -3.0F, 2, 2, 6, -0.5F);
+		this.bipedLeftArm.addChild(RivetL);
+
+		this.BracerL = new ModelRenderer(this, 0, 56);
+		this.BracerL.setRotationPoint(0.0F, 0.0F, 0.0F);
+		this.BracerL.addBox(0.3F, 4.0F, -2.0F, 3, 4, 4, 0.2F);
+		this.setRotateAngle(BracerL, 0.0F, 0.0F, 0.03490658503988659F);
+		this.bipedLeftArm.addChild(BracerL);
+
+		this.MittL = new ModelRenderer(this, 0, 41);
+		this.MittL.setRotationPoint(0.0F, 0.0F, 0.0F);
+		this.MittL.addBox(1.4F, 7.9F, -2.0F, 2, 2, 4, 0.3F);
+		this.setRotateAngle(MittL, 0.0F, 0.0F, 0.03490658503988659F);
+		this.bipedLeftArm.addChild(MittL);
+
+		this.RivetR = new ModelRenderer(this, 0, 47);
+		this.RivetR.mirror = true;
+		this.RivetR.setRotationPoint(0.0F, 0.0F, 0.0F);
+		this.RivetR.addBox(-2.0F, 7.0F, -3.0F, 2, 2, 6, -0.5F);
+		this.bipedRightArm.addChild(RivetR);
+
+		this.MittR = new ModelRenderer(this, 0, 41);
+		this.MittR.mirror = true;
+		this.MittR.setRotationPoint(0.0F, 0.0F, 0.0F);
+		this.MittR.addBox(-3.4F, 7.9F, -2.0F, 2, 2, 4, 0.3F);
+		this.setRotateAngle(MittR, 0.0F, 0.0F, -0.03490658503988659F);
+		this.bipedRightArm.addChild(MittR);
+	}
+
+	@Override
+	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);
+
+			int[] intColors = TinkersDefense.hexToRGB(colors[i]);
+			GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
+
+			//setLivingAnimations((EntityLivingBase) entity, f,f1, f5);
+			super.render(entity, f, f1, f2, f3, f4, f5);
+
+			GL11.glPopMatrix();
+		}
+		GL11.glPopMatrix();
+	}
+
+	/**
+	 * This is a helper function from Tabula to set the rotation of model parts
+	 */
+	public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z)
+	{
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
+	}
+}
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 d10ea48..a55c825 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
@@ -21,7 +21,7 @@ public class ModelTinkersBoots extends ArmorRenderer
 	public ModelRenderer	FootL;
 	public ModelRenderer	FootR;
 
-	public ModelTinkersBoots(String[] colors, String defaultFolder, String[] textures)
+	public ModelTinkersBoots()
 	{
 		super(1.1f, 0, 64, 64);
 
@@ -30,22 +30,22 @@ public class ModelTinkersBoots extends ArmorRenderer
 
 		this.FootL = new ModelRenderer(this, 0, 43);
 		this.FootL.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.FootL.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.0F);
+		this.FootL.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.01F);
 		this.bipedLeftLeg.addChild(this.FootL);
 
 		this.LegL = new ModelRenderer(this, 0, 48);
 		this.LegL.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.LegL.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.0F);
+		this.LegL.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.01F);
 		this.bipedLeftLeg.addChild(this.LegL);
 
 		this.FootR = new ModelRenderer(this, 0, 43);
 		this.FootR.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.FootR.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.0F);
+		this.FootR.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.01F);
 		this.bipedRightLeg.addChild(this.FootR);
 
 		this.LegR = new ModelRenderer(this, 0, 48);
 		this.LegR.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.LegR.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.0F);
+		this.LegR.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.01F);
 		this.bipedRightLeg.addChild(this.LegR);
 	}
 
@@ -59,9 +59,9 @@ public class ModelTinkersBoots extends ArmorRenderer
 
 			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
 
-			float size = 1.45f;
+			float size = 1.6f;
 			GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
-			GL11.glTranslatef(0.0F, -1F * f5, 0.0F);
+			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);
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 6936d01..00f0d64 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
@@ -24,54 +24,60 @@ public class ModelTinkersChausses extends ArmorRenderer
 	public ModelRenderer	BackL;
 	public ModelRenderer	FrontR;
 	public ModelRenderer	BackR;
+	public ModelRenderer	Belt;
 
-	public ModelTinkersChausses(String[] colors, String defaultFolder, String[] textures)
+	public ModelTinkersChausses()
 	{
 		super(1.1f, 0, 64, 64);
 
 		this.textureWidth = 64;
 		this.textureHeight = 64;
 
+		this.Belt = new ModelRenderer(this, 16, 54);
+		this.Belt.setRotationPoint(0.0F, 0.0F, 0.0F);
+		this.Belt.addBox(-4.5F, 10.0F, -3F, 9, 2, 6, 0.1F);
+		this.bipedBody.addChild(this.Belt);
+
 		this.HipGuardR = new ModelRenderer(this, 10, 37);
 		this.HipGuardR.setRotationPoint(0F, 0F, 0F);
-		this.HipGuardR.addBox(-2.5F, 0.0F, -2.5F, 4, 6, 5, 0.0F);
+		this.HipGuardR.addBox(-2.5F, 0.0F, -2.5F, 4, 6, 5, 0.01F);
 		this.setRotateAngle(HipGuardR, 0.0F, 0.0F, 0.17453292519943295F);
 		this.bipedRightLeg.addChild(this.HipGuardR);
 
 		this.LegL = new ModelRenderer(this, 0, 48);
 		this.LegL.setRotationPoint(0F, 0F, 0F);
-		this.LegL.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.0F);
+		this.LegL.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.01F);
 		this.bipedLeftLeg.addChild(this.LegL);
 
 		this.BackR = new ModelRenderer(this, 0, 40);
 		this.BackR.setRotationPoint(0F, 0F, 0F);
-		this.BackR.addBox(-0.1F, 0.0F, 1.7F, 4, 7, 1, 0.01F);
+		this.BackR.addBox(-0.1F, 0.0F, 1.7F, 4, 7, 1, 0.02F);
 		this.bipedRightLeg.addChild(this.BackR);
 
 		this.FrontL = new ModelRenderer(this, 0, 40);
 		this.FrontL.setRotationPoint(0F, 0F, 0F);
-		this.FrontL.addBox(-4.0F, 0.0F, -2.7F, 4, 7, 1, 0.0F);
+		this.FrontL.addBox(-4.0F, 0.0F, -2.7F, 4, 7, 1, 0.01F);
 		this.bipedLeftLeg.addChild(this.FrontL);
 
 		this.LegR = new ModelRenderer(this, 0, 48);
 		this.LegR.setRotationPoint(0F, 0F, 0F);
-		this.LegR.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.0F);
+		this.LegR.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.01F);
 		this.bipedRightLeg.addChild(this.LegR);
 
 		this.BackL = new ModelRenderer(this, 0, 40);
 		this.BackL.setRotationPoint(0F, 0F, 0F);
-		this.BackL.addBox(-4.0F, 0.0F, 1.7F, 4, 7, 1, 0.0F);
+		this.BackL.addBox(-4.0F, 0.0F, 1.7F, 4, 7, 1, 0.01F);
 		this.bipedLeftLeg.addChild(this.BackL);
 
 		this.FrontR = new ModelRenderer(this, 0, 40);
 		this.FrontR.setRotationPoint(0F, 0F, 0F);
-		this.FrontR.addBox(-0.1F, 0.0F, -2.7F, 4, 7, 1, 0.01F);
+		this.FrontR.addBox(-0.1F, 0.0F, -2.7F, 4, 7, 1, 0.02F);
 		this.bipedRightLeg.addChild(this.FrontR);
 
 		this.HipGuardL = new ModelRenderer(this, 10, 37);
 		this.HipGuardL.mirror = true;
 		this.HipGuardL.setRotationPoint(0F, 0F, 0F);
-		this.HipGuardL.addBox(-1.5F, 0.0F, -2.5F, 4, 6, 5, 0.0F);
+		this.HipGuardL.addBox(-1.5F, 0.0F, -2.5F, 4, 6, 5, 0.01F);
 		this.setRotateAngle(HipGuardL, 0.0F, 0.0F, -0.17453292519943295F);
 		this.bipedLeftLeg.addChild(this.HipGuardL);
 	}
@@ -86,15 +92,14 @@ public class ModelTinkersChausses extends ArmorRenderer
 
 			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
 
-			float size = 1.5f;
+			float size = 1.6f;
 			GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
-			GL11.glTranslatef(0F, -1F * f5, -0F);
+			GL11.glTranslatef(0F, 0F * f5, -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();
 		}
 		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 d631c08..d59bcc2 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
@@ -19,7 +19,7 @@ public class ModelTinkersCoif extends ArmorRenderer
 	public ModelRenderer	Coif;
 	public ModelRenderer	Head;
 
-	public ModelTinkersCoif(String[] colors, String defaultFolder, String[] textures)
+	public ModelTinkersCoif()
 	{
 		super(1.1f, 0, 64, 64);
 
@@ -28,12 +28,12 @@ public class ModelTinkersCoif extends ArmorRenderer
 
 		this.Head = new ModelRenderer(this, 32, 48);
 		this.Head.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.Head.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, 0.0F);
+		this.Head.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, 0.01F);
 		this.bipedHead.addChild(this.Head);
 
 		this.Coif = new ModelRenderer(this, 0, 46);
 		this.Coif.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.Coif.addBox(-4.0F, -8.0F, -4.0F, 8, 10, 8, 0.5F);
+		this.Coif.addBox(-4.0F, -8.0F, -4.0F, 8, 10, 8, 0.51F);
 		this.bipedHead.addChild(this.Coif);
 	}
 
@@ -47,8 +47,8 @@ public class ModelTinkersCoif extends ArmorRenderer
 
 			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
 
-			float size = 2.25f;
-			GL11.glScalef(1.5F / size, 1.5F / size, 1.5F / size);
+			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]);
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHalberd.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHalberd.java
index 7de3ccd..0eff717 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHalberd.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHalberd.java
@@ -35,57 +35,57 @@ public class ModelTinkersHalberd extends ArmorRenderer
 
 		this.Pauldron2_1 = new ModelRenderer(this, 0, 32);
 		this.Pauldron2_1.mirror = true;
-		this.Pauldron2_1.setRotationPoint(0.0F, 0.0F, 0.0F);
+		this.Pauldron2_1.setRotationPoint(0.0F, 0.0F, 0.01F);
 		this.Pauldron2_1.addBox(-0.7F, -2.7F, -2.0F, 3, 3, 4, 0.1F);
 		this.setRotateAngle(Pauldron2_1, 0.0F, 0.0F, 0.2617993877991494F);
 		this.bipedLeftArm.addChild(this.Pauldron2_1);
 
 		this.Body = new ModelRenderer(this, 16, 48);
 		this.Body.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.Body.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, 0.0F);
+		this.Body.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, 0.01F);
 		this.bipedBody.addChild(this.Body);
 
 		this.Pauldron1_1 = new ModelRenderer(this, 30, 32);
 		this.Pauldron1_1.mirror = true;
 		this.Pauldron1_1.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.Pauldron1_1.addBox(0.5F, -1.9F, -2.5F, 3, 4, 5, 0.0F);
+		this.Pauldron1_1.addBox(0.5F, -1.9F, -2.5F, 3, 4, 5, 0.01F);
 		this.setRotateAngle(Pauldron1_1, 0.0F, 0.0F, -0.2617993877991494F);
 		this.bipedLeftArm.addChild(this.Pauldron1_1);
 
 		this.Pauldron3 = new ModelRenderer(this, 16, 32);
 		this.Pauldron3.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.Pauldron3.addBox(-1.2F, -1.5F, -2.5F, 2, 2, 5, 0.1F);
+		this.Pauldron3.addBox(-1.2F, -1.5F, -2.5F, 2, 2, 5, 0.11F);
 		this.setRotateAngle(Pauldron3, 0.0F, 0.0F, -0.2617993877991494F);
 		this.bipedRightArm.addChild(this.Pauldron3);
 
 		this.ArmL = new ModelRenderer(this, 0, 48);
 		this.ArmL.mirror = true;
 		this.ArmL.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.ArmL.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, 0.0F);
+		this.ArmL.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, 0.02F);
 		this.bipedLeftArm.addChild(this.ArmL);
 
 		this.Pauldron1 = new ModelRenderer(this, 30, 32);
 		this.Pauldron1.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.Pauldron1.addBox(-3.5F, -1.9F, -2.5F, 3, 4, 5, 0.0F);
+		this.Pauldron1.addBox(-3.5F, -1.9F, -2.5F, 3, 4, 5, 0.01F);
 		this.setRotateAngle(Pauldron1, 0.0F, 0.0F, 0.2617993877991494F);
 		this.bipedRightArm.addChild(this.Pauldron1);
 
 		this.Pauldron3_1 = new ModelRenderer(this, 16, 32);
 		this.Pauldron3_1.mirror = true;
 		this.Pauldron3_1.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.Pauldron3_1.addBox(-0.8F, -1.5F, -2.5F, 2, 2, 5, 0.1F);
+		this.Pauldron3_1.addBox(-0.8F, -1.5F, -2.5F, 2, 2, 5, 0.11F);
 		this.setRotateAngle(Pauldron3_1, 0.0F, 0.0F, 0.2617993877991494F);
 		this.bipedLeftArm.addChild(this.Pauldron3_1);
 
 		this.Pauldron2 = new ModelRenderer(this, 0, 32);
 		this.Pauldron2.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.Pauldron2.addBox(-2.3F, -2.7F, -2.0F, 3, 3, 4, 0.1F);
+		this.Pauldron2.addBox(-2.3F, -2.7F, -2.0F, 3, 3, 4, 0.11F);
 		this.setRotateAngle(Pauldron2, 0.0F, 0.0F, -0.2617993877991494F);
 		this.bipedRightArm.addChild(this.Pauldron2);
 
 		this.ArmR = new ModelRenderer(this, 0, 48);
 		this.ArmR.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.ArmR.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, 0.0F);
+		this.ArmR.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, 0.02F);
 		this.bipedRightArm.addChild(this.ArmR);
 	}
 
@@ -99,15 +99,14 @@ public class ModelTinkersHalberd extends ArmorRenderer
 
 			FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"));
 
-			float size = 2.25f;
-			GL11.glScalef(1.5F / size, 1.5F / size, 1.5F / size);
+			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();
 		}
 		GL11.glPopMatrix();