Sabatons fixed, Chain armor started on

21 files changed, 429 insertions, 692 deletions

diff --git a/src/main/java/lance5057/tDefense/core/tools/TDTools.java b/src/main/java/lance5057/tDefense/core/tools/TDTools.java
index 7aeec67..89476f2 100644
--- a/src/main/java/lance5057/tDefense/core/tools/TDTools.java
+++ b/src/main/java/lance5057/tDefense/core/tools/TDTools.java
@@ -14,6 +14,7 @@ import lance5057.tDefense.core.tools.armor.heavy.TinkersBreastplate;
 import lance5057.tDefense.core.tools.armor.heavy.TinkersGrieves;
 import lance5057.tDefense.core.tools.armor.heavy.TinkersHelm;
 import lance5057.tDefense.core.tools.armor.heavy.TinkersSabatons;
+import lance5057.tDefense.core.tools.armor.light.TinkersBoots;
 import lance5057.tDefense.core.tools.armor.straps.ItemStraps;
 import lance5057.tDefense.core.tools.basic.FishingRod;
 import lance5057.tDefense.core.tools.basic.HeaterShield;
@@ -124,6 +125,11 @@ public class TDTools {
 		robe = new TinkersRobe();
 		shoes = new TinkersShoes();
 		
+//		coif = new TinkersCoif();
+//		hauberk = new TinkersHauberk();
+//		chausses = new TinkersChausses();
+		boots = new TinkersBoots();
+		
 		helm = new TinkersHelm();
 		breastplate = new TinkersBreastplate();
 		grieves = new TinkersGrieves();
@@ -145,6 +151,8 @@ public class TDTools {
 		regTool(robe, "robe", event);
 		regTool(shoes, "shoes", event);
 		
+		regTool(boots, "boots", event);
+		
 		regTool(helm, "helm", event);
 		regTool(breastplate, "breastplate", event);
 		regTool(grieves, "grieves", event);
@@ -202,6 +210,8 @@ public class TDTools {
 		TinkerRegistry.registerToolCrafting(robe);
 		TinkerRegistry.registerToolCrafting(shoes);
 		
+		TinkerRegistry.registerToolCrafting(boots);
+		
 		TinkerRegistry.registerToolCrafting(helm);
 		TinkerRegistry.registerToolCrafting(breastplate);
 		TinkerRegistry.registerToolCrafting(grieves);
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/light/TinkersBoots.java b/src/main/java/lance5057/tDefense/core/tools/armor/light/TinkersBoots.java
index 9bc9a4f..5a433ab 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/light/TinkersBoots.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/light/TinkersBoots.java
@@ -1,130 +1,44 @@
-//package lance5057.tDefense.armor.items.light;
-//
-//import lance5057.tDefense.TinkersDefense;
-//import lance5057.tDefense.armor.ArmorCore;
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import lance5057.tDefense.proxy.ClientProxy;
-//import net.minecraft.entity.Entity;
-//import net.minecraft.entity.player.EntityPlayer;
-//import net.minecraft.item.Item;
-//import net.minecraft.item.ItemStack;
-//
-//public class TinkersBoots extends ArmorCore
-//{
-//	public TinkersBoots()
-//	{
-//		super(1, 3);
-//		setUnlocalizedName("tinkersboots");
-//		maxReduction = 100;
-//		reductionPercent = 0.08f;
-//	}
-//
-//	@Override
-//	public Item getHeadItem()
-//	{
-//		return TinkersDefense.partChainmaille;
-//	}
-//
-//	@Override
-//	public Item getHandleItem()
-//	{
-//		return TinkersDefense.partCloth;
-//	}
-//
-//	@Override
-//	public Item getAccessoryItem()
-//	{
-//		return TinkersDefense.partRivet;
-//	}
-//
-//	@Override
-//	public int durabilityTypeAccessory()
-//	{
-//		return 1;
-//	}
-//
-//	@Override
-//	public float getRepairCost()
-//	{
-//		return 1.0f;
-//	}
-//
-//	@Override
-//	public float getDurabilityModifier()
-//	{
-//		return 1f;
-//	}
-//
-//	@Override
-//	public float getDamageModifier()
-//	{
-//		return 1f;
-//	}
-//
-//	@Override
-//	public int getPartAmount()
-//	{
-//		return 3;
-//	}
-//
-//	@Override
-//	public String getIconSuffix(int partType)
-//	{
-//		switch(partType)
-//		{
-//			case 0:
-//				return "_boots_chain";
-//			case 1:
-//				return "_boots_chain_broken";
-//			case 2:
-//				return "_boots_cloth";
-//			case 3:
-//				return "_boots_rivet";
-//			default:
-//				return "";
-//		}
-//	}
-//
-//	@Override
-//	public String getEffectSuffix()
-//	{
-//		return "_boots_effect";
-//	}
-//
-//	@Override
-//	public String getDefaultFolder()
-//	{
-//		return "armor/boots";
-//	}
-//
-//	//	@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/TinkersBoots.png";
-//	}
-//
-//	@Override
-//	public String[] getTraits()
-//	{
-//		return new String[] {"armor", "feet", "boots", "lightarmor"};
-//	}
-//
-//	@Override
-//	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
-//	{
-//		return 2;
-//	}
-//
-//	@Override
-//	public ArmorRenderer getRenderer()
-//	{
-//		return ClientProxy.boots;
-//	}
-//}
+package lance5057.tDefense.core.tools.armor.light;
+
+import lance5057.tDefense.core.materials.BootsMaterialStats;
+import lance5057.tDefense.core.materials.ClothMaterialStats;
+import lance5057.tDefense.core.parts.TDParts;
+import lance5057.tDefense.core.tools.armor.renderers.light.ModelTinkersBoots;
+import lance5057.tDefense.core.tools.bases.ArmorCore;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+
+public class TinkersBoots extends ArmorCore
+{
+	public TinkersBoots()
+	{
+		super(new PartMaterialType(TDParts.chainmail, BootsMaterialStats.TYPE), 
+			new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE), 
+			PartMaterialType.handle(TDParts.rivets));
+		setUnlocalizedName("tinkersboots");
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public String getArmorTexture(ItemStack stack, int layer)
+	{
+		String s = "";
+		switch(layer)
+		{
+			case 0: s = "textures/armor/boots/_boots_chain.png"; break;
+			case 1: s = "textures/armor/boots/_boots_cloth.png"; break;
+			case 2: s = "textures/armor/boots/_boots_rivet.png"; break;
+		}
+		return s;
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public ModelBiped getArmorModel(ItemStack stack)
+	{
+		return new ModelTinkersBoots(stack);
+	}
+}
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersBreastplate.java b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersBreastplate.java
index b185419..b59a189 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersBreastplate.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersBreastplate.java
@@ -25,10 +25,10 @@ public class ModelTinkersBreastplate extends ArmorRenderer {
         this.textureWidth = 128;
         this.textureHeight = 64;
 
-        this.ArmL = new ModelRenderer(this, 92, 12);
-        this.ArmL.setRotationPoint(0.0F, 0.0F, 0.0F);
-        this.ArmL.addBox(-1.0F, -2.3F, -3.0F, 5, 6, 6, 0.0F);
-        this.bipedLeftArm.addChild(ArmL);
+//        this.ArmL = new ModelRenderer(this, 92, 12);
+//        this.ArmL.setRotationPoint(0.0F, 0.0F, 0.0F);
+//        this.ArmL.addBox(-1.0F, -2.3F, -3.0F, 5, 6, 6, 0.0F);
+//        this.bipedLeftArm.addChild(ArmL);
 
         this.PauldronR = new ModelRenderer(this, 88, 0);
         this.PauldronR.mirror = true;
@@ -42,11 +42,11 @@ public class ModelTinkersBreastplate extends ArmorRenderer {
         this.Plackart.addBox(-4.0F, 5.0F, -3.0F, 8, 7, 6, 0.3F);
         this.bipedBody.addChild(Plackart);
         
-        this.ArmR = new ModelRenderer(this, 92, 12);
-        this.ArmR.mirror = true;
-        this.ArmR.setRotationPoint(0.0F, 0.0F, 0.0F);
-        this.ArmR.addBox(-4.0F, -2.3F, -3.0F, 5, 6, 6, 0.0F);
-        this.bipedRightArm.addChild(ArmR);
+//        this.ArmR = new ModelRenderer(this, 92, 12);
+//        this.ArmR.mirror = true;
+//        this.ArmR.setRotationPoint(0.0F, 0.0F, 0.0F);
+//        this.ArmR.addBox(-4.0F, -2.3F, -3.0F, 5, 6, 6, 0.0F); 
+//        this.bipedRightArm.addChild(ArmR);
         
         this.BackPlate = new ModelRenderer(this, 64, 24);
         this.BackPlate.setRotationPoint(0.0F, 0.0F, 0.0F);
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersSabatons.java b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersSabatons.java
index d754285..87092a8 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersSabatons.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersSabatons.java
@@ -24,10 +24,17 @@ public class ModelTinkersSabatons extends ArmorRenderer {
     public ModelRenderer KneeGuardL;
 
     public ModelTinkersSabatons(ItemStack stack) {
-    	super(10.25f, 0, 96, 64, stack);
+    	super(0.25f, 0, 96, 64, stack);
         this.textureWidth = 96;
         this.textureHeight = 64;
 
+//        this.ShinGuardL = new ModelRenderer(this, 64, 48);
+//        this.ShinGuardL.mirror = true;
+//        this.ShinGuardL.setRotationPoint(0.0F, 0.0F, 0.0F);
+//        this.ShinGuardL.addBox(-2.0F, 4.0F, -2.5F, 40, 50, 30, 10.26F);
+//        this.setRotateAngle(ShinGuardL, 0.05759586531581287F, 0.0F, 0.0F);
+//        this.bipedLeftLeg.addChild(ShinGuardL);
+        
         this.ShinGuardL = new ModelRenderer(this, 64, 48);
         this.ShinGuardL.mirror = true;
         this.ShinGuardL.setRotationPoint(0.0F, 0.0F, 0.0F);
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/light/ModelTinkersBoots.java b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/light/ModelTinkersBoots.java
index bc5dae3..5b292f2 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/light/ModelTinkersBoots.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/light/ModelTinkersBoots.java
@@ -1,111 +1,94 @@
-//package lance5057.tDefense.armor.renderers.light;
-//
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import net.minecraft.client.model.ModelRenderer;
-//
-///**
-// * ModelTinkersBoots - Either Mojang or a mod author
-// * Created using Tabula 4.1.1
-// */
-//public class ModelTinkersBoots extends ArmorRenderer
-//{
-//	public ModelRenderer	BootTopR;
-//	public ModelRenderer	BootTopL;
-//	public ModelRenderer	FootL;
-//	public ModelRenderer	FootR;
-//	public ModelRenderer	LegGuardL;
-//	public ModelRenderer	LegGuardR;
-//	public ModelRenderer	FootTipL;
-//	public ModelRenderer	FootTipR;
-//
-//	public ModelTinkersBoots()
-//	{
-//		super(0.1f, 0, 64, 64);
-//
-//		textureWidth = 64;
-//		textureHeight = 64;
-//
-//		bipedRightLeg = new ModelRenderer(this, "Right Leg");
-//		bipedRightLeg.setTextureOffset(0, 16);
-//		bipedRightLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.05f);
-//		bipedRightLeg.setRotationPoint(-1.9F, 12.0F + 0, 0.0F);
-//
-//		bipedLeftLeg = new ModelRenderer(this, "Left Leg");
-//		bipedLeftLeg.setTextureOffset(0, 16);
-//		bipedLeftLeg.mirror = true;
-//		bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.05f);
-//		bipedLeftLeg.setRotationPoint(1.9F, 12.0F + 0, 0.0F);
-//
-//		FootR = new ModelRenderer(this, "FootR");
-//		FootR.setTextureOffset(0, 41);
-//		FootR.setRotationPoint(0f, 0f, 0f);
-//		FootR.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.1F);
-//		bipedRightLeg.addChild(FootR);
-//
-//		BootTopR = new ModelRenderer(this, "BootTopR");
-//		BootTopR.setTextureOffset(0, 32);
-//		BootTopR.setRotationPoint(0f, 0f, 0f);
-//		BootTopR.addBox(-2.5F, 3.5F, -2.5F, 5, 4, 5, -0.2F);
-//		bipedRightLeg.addChild(BootTopR);
-//
-//		BootTopL = new ModelRenderer(this, "BootTopL");
-//		BootTopL.setTextureOffset(0, 32);
-//		BootTopL.setRotationPoint(0f, 0f, 0f);
-//		BootTopL.addBox(-2.5F, 3.5F, -2.5F, 5, 4, 5, -0.2F);
-//		bipedLeftLeg.addChild(BootTopL);
-//
-//		LegGuardR = new ModelRenderer(this, "LegGuardR");
-//		LegGuardR.setTextureOffset(0, 44);
-//		LegGuardR.setRotationPoint(0f, 0f, 0f);
-//		LegGuardR.addBox(-2.0F, 5.5F, -3.8F, 4, 4, 2, 0.2F);
-//		setRotateAngle(LegGuardR, 0.17453292519943295F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(LegGuardR);
-//
-//		FootTipR = new ModelRenderer(this, "FootTipR");
-//		FootTipR.setTextureOffset(10, 41);
-//		FootTipR.setRotationPoint(0f, 0f, 0f);
-//		FootTipR.addBox(-1.5F, 9.5F, -5.6F, 3, 2, 2, -0.2F);
-//		setRotateAngle(FootTipR, 0.17453292519943295F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(FootTipR);
-//
-//		FootL = new ModelRenderer(this, "FootL");
-//		FootL.setTextureOffset(0, 41);
-//		FootL.mirror = true;
-//		FootL.setRotationPoint(0f, 0f, 0f);
-//		FootL.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.1F);
-//		bipedLeftLeg.addChild(FootL);
-//
-//		LegGuardL = new ModelRenderer(this, "LegGuardL");
-//		LegGuardL.setTextureOffset(0, 44);
-//		LegGuardL.setRotationPoint(0f, 0f, 0f);
-//		LegGuardL.addBox(-2.0F, 5.5F, -3.8F, 4, 4, 2, 0.2F);
-//		setRotateAngle(LegGuardL, 0.17453292519943295F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(LegGuardL);
-//
-//		FootTipL = new ModelRenderer(this, "FootTipL");
-//		FootTipL.setTextureOffset(10, 41);
-//		FootTipL.setRotationPoint(0f, 0f, 0f);
-//		FootTipL.addBox(-1.5F, 9.5F, -5.6F, 3, 2, 2, -0.2F);
-//		setRotateAngle(FootTipL, 0.17453292519943295F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(FootTipL);
-//
-//		BootTopL.isHidden = true;
-//		BootTopR.isHidden = true;
-//		FootTipL.isHidden = true;
-//		FootTipR.isHidden = true;
-//		LegGuardL.isHidden = true;
-//		LegGuardR.isHidden = true;
-//
-//		init();
-//	}
-//
-//	/**
-//	 * 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;
-//	}
-//}
+package lance5057.tDefense.core.tools.armor.renderers.light;
+
+import lance5057.tDefense.core.tools.armor.renderers.ArmorRenderer;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.item.ItemStack;
+
+/**
+ * ModelTinkersBoots - Either Mojang or a mod author
+ * Created using Tabula 7.0.0
+ */
+public class ModelTinkersBoots extends ArmorRenderer {
+    public ModelRenderer BootTopR;
+    public ModelRenderer BootTopL;
+    public ModelRenderer FootL;
+    public ModelRenderer FootR;
+    public ModelRenderer LegGuardL;
+    public ModelRenderer LegGuardR;
+    public ModelRenderer FootTipL;
+    public ModelRenderer FootTipR;
+
+    public ModelTinkersBoots(ItemStack stack) {
+    	super(0.25f, 0, 96, 64, stack);
+        this.textureWidth = 96;
+        this.textureHeight = 64;
+        
+        this.FootTipR = new ModelRenderer(this, 74, 9);
+        this.FootTipR.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.FootTipR.addBox(-1.5F, 9.5F, -5.6F, 3, 2, 2, -0.2F);
+        this.setRotateAngle(FootTipR, 0.17453292519943295F, 0.0F, 0.0F);
+        this.bipedRightLeg.addChild(FootTipR);
+        
+        this.BootTopL = new ModelRenderer(this, 64, 0);
+        this.BootTopL.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.BootTopL.addBox(-2.5F, 3.5F, -2.5F, 5, 4, 5, -0.2F);
+        this.bipedLeftLeg.addChild(BootTopL);
+        
+        this.FootL = new ModelRenderer(this, 64, 9);
+        this.FootL.mirror = true;
+        this.FootL.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.FootL.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.0F);
+        this.bipedLeftLeg.addChild(FootL);
+        
+        this.LegGuardL = new ModelRenderer(this, 64, 12);
+        this.LegGuardL.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.LegGuardL.addBox(-2.0F, 5.5F, -3.8F, 4, 4, 2, 0.1F);
+        this.setRotateAngle(LegGuardL, 0.17453292519943295F, 0.0F, 0.0F);
+        this.bipedLeftLeg.addChild(LegGuardL);
+        
+        this.LegGuardR = new ModelRenderer(this, 64, 12);
+        this.LegGuardR.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.LegGuardR.addBox(-2.0F, 5.5F, -3.8F, 4, 4, 2, 0.1F);
+        this.setRotateAngle(LegGuardR, 0.17453292519943295F, 0.0F, 0.0F);
+        this.bipedRightLeg.addChild(LegGuardR);
+        
+        this.FootR = new ModelRenderer(this, 64, 9);
+        this.FootR.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.FootR.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.0F);
+        this.bipedRightLeg.addChild(FootR);
+        
+        this.BootTopR = new ModelRenderer(this, 64, 0);
+        this.BootTopR.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.BootTopR.addBox(-2.5F, 3.5F, -2.5F, 5, 4, 5, -0.2F);
+        this.bipedRightLeg.addChild(BootTopR);
+        
+        this.FootTipL = new ModelRenderer(this, 74, 9);
+        this.FootTipL.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.FootTipL.addBox(-1.5F, 9.5F, -5.6F, 3, 2, 2, -0.2F);
+        this.setRotateAngle(FootTipL, 0.17453292519943295F, 0.0F, 0.0F);
+        this.bipedLeftLeg.addChild(FootTipL);
+    }
+
+    @Override
+    public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { 
+        this.FootTipR.render(f5);
+        this.BootTopL.render(f5);
+        this.FootL.render(f5);
+        this.LegGuardL.render(f5);
+        this.LegGuardR.render(f5);
+        this.FootR.render(f5);
+        this.BootTopR.render(f5);
+        this.FootTipL.render(f5);
+    }
+
+    /**
+     * 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/core/tools/armor/renderers/light/ModelTinkersChausses.java b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/light/ModelTinkersChausses.java
index 7381d4e..fcf8d82 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/light/ModelTinkersChausses.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/light/ModelTinkersChausses.java
@@ -1,138 +1,101 @@
-//package lance5057.tDefense.armor.renderers.light;
-//
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import net.minecraft.client.model.ModelRenderer;
-//
-///**
-// * ModelTinkersChausses - Either Mojang or a mod author
-// * Created using Tabula 4.1.1
-// */
-//public class ModelTinkersChausses extends ArmorRenderer
-//{
-//	public ModelRenderer	FrontL;
-//	public ModelRenderer	FrontR;
-//	public ModelRenderer	HipGuardL;
-//	public ModelRenderer	HipGuardR;
-//	public ModelRenderer	BackL;
-//	public ModelRenderer	BackR;
-//	public ModelRenderer	HipGuardL_1;
-//	public ModelRenderer	HipGuardR_1;
-//	public ModelRenderer	Belt;
-//	public ModelRenderer	BeltR;
-//	public ModelRenderer	BeltL;
-//
-//	public ModelTinkersChausses()
-//	{
-//		super(0.1f, 0, 64, 64);
-//
-//		textureWidth = 64;
-//		textureHeight = 64;
-//
-//		bipedRightLeg = new ModelRenderer(this, "Right Leg");
-//		bipedRightLeg.setTextureOffset(0, 16);
-//		bipedRightLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.1f);
-//		bipedRightLeg.setRotationPoint(-1.9F, 12.0F + 0, 0.0F);
-//
-//		bipedLeftLeg = new ModelRenderer(this, "Left Leg");
-//		bipedLeftLeg.setTextureOffset(0, 16);
-//		bipedLeftLeg.mirror = true;
-//		bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.1f);
-//		bipedLeftLeg.setRotationPoint(1.9F, 12.0F + 0, 0.0F);
-//
-//		HipGuardR = new ModelRenderer(this, "Hip Guard Right");
-//		HipGuardR.setTextureOffset(10, 37);
-//		HipGuardR.setRotationPoint(0f, 0f, 0f);
-//		HipGuardR.addBox(-2.5F, 0.0F, -2.6F, 4, 6, 5, 0.1F);
-//		setRotateAngle(HipGuardR, 0.0F, 0.0F, 0.17453292519943295F);
-//		bipedRightLeg.addChild(HipGuardR);
-//
-//		Belt = new ModelRenderer(this, "Belt");
-//		Belt.setTextureOffset(18, 48);
-//		Belt.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Belt.addBox(-5.0F, 10.5F, -3.0F, 10, 2, 6, -0.19F);
-//		bipedBody.addChild(Belt);
-//
-//		FrontR = new ModelRenderer(this, "Front Right");
-//		FrontR.setTextureOffset(0, 40);
-//		FrontR.setRotationPoint(1.9f, 0f, -0.1f);
-//		FrontR.addBox(-2.0F, 0.0F, -2.6F, 4, 7, 1, 0.0F);
-//		setRotateAngle(FrontR, -0.1F, 0.0F, 0.0f);
-//		bipedRightLeg.addChild(FrontR);
-//
-//		FrontL = new ModelRenderer(this, "Front Left");
-//		FrontL.setTextureOffset(0, 40);
-//		FrontL.setRotationPoint(-1.9f, 0f, -0.1f);
-//		FrontL.addBox(-2.0F, 0.0F, -2.6F, 4, 7, 1, 0.0F);
-//		setRotateAngle(FrontL, -0.1F, 0.0F, 0.0f);
-//		bipedLeftLeg.addChild(FrontL);
-//
-//		HipGuardL_1 = new ModelRenderer(this, "Hip Guard Left 2");
-//		HipGuardL_1.setTextureOffset(0, 49);
-//		HipGuardL_1.mirror = true;
-//		HipGuardL_1.setRotationPoint(0f, 0f, 0f);
-//		HipGuardL_1.addBox(-1.5F, 0.0F, -2.6F, 4, 10, 5, 0.0F);
-//		setRotateAngle(HipGuardL_1, 0.0F, 0.0F, -0.08726646259971647F);
-//		bipedLeftLeg.addChild(HipGuardL_1);
-//
-//		BeltR = new ModelRenderer(this, "Belt Right");
-//		BeltR.setTextureOffset(18, 56);
-//		BeltR.mirror = true;
-//		BeltR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BeltR.addBox(-6F, 1.0F, -3.1F, 12, 2, 6, -0.2F);
-//		setRotateAngle(BeltR, 0.0F, 0.0F, -0.4363323129985824F);
-//		bipedRightLeg.addChild(BeltR);
-//
-//		BeltL = new ModelRenderer(this, "Belt Left");
-//		BeltL.setTextureOffset(18, 56);
-//		BeltL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BeltL.addBox(-6F, 1.0F, -3.1F, 12, 2, 6, -0.21F);
-//		setRotateAngle(BeltL, 0.0F, 0.0F, 0.4363323129985824F);
-//		bipedLeftLeg.addChild(BeltL);
-//
-//		HipGuardR_1 = new ModelRenderer(this, "Hip Guard Right 2");
-//		HipGuardR_1.setTextureOffset(0, 49);
-//		HipGuardR_1.setRotationPoint(0f, 0f, 0f);
-//		HipGuardR_1.addBox(-2.5F, 0.0F, -2.6F, 4, 10, 5, 0.0F);
-//		setRotateAngle(HipGuardR_1, 0.0F, 0.0F, 0.08726646259971647F);
-//		bipedRightLeg.addChild(HipGuardR_1);
-//
-//		BackR = new ModelRenderer(this, "Back Right");
-//		BackR.setTextureOffset(0, 40);
-//		BackR.setRotationPoint(1.9f, 0f, 0f);
-//		BackR.addBox(-2.0F, 0.0F, 1.5F, 4, 7, 1, 0.0F);
-//		setRotateAngle(BackR, 0.1F, 0.0F, 0.0f);
-//		bipedRightLeg.addChild(BackR);
-//
-//		BackL = new ModelRenderer(this, "Back Light");
-//		BackL.setTextureOffset(0, 40);
-//		BackL.setRotationPoint(-1.9f, 0f, 0f);
-//		BackL.addBox(-2.0F, 0.0F, 1.5F, 4, 7, 1, 0.0F);
-//		setRotateAngle(BackL, 0.1F, 0.0F, 0.0f);
-//		bipedLeftLeg.addChild(BackL);
-//
-//		HipGuardL = new ModelRenderer(this, "Hip Guard Left");
-//		HipGuardL.setTextureOffset(10, 37);
-//		HipGuardL.mirror = true;
-//		HipGuardL.setRotationPoint(0f, 0f, 0f);
-//		HipGuardL.addBox(-1.5F, 0.0F, -2.6F, 4, 6, 5, 0.1F);
-//		setRotateAngle(HipGuardL, 0.0F, 0.0F, -0.17453292519943295F);
-//		bipedLeftLeg.addChild(HipGuardL);
-//
-//		BeltL.isHidden = true;
-//		BeltR.isHidden = true;
-//		HipGuardL_1.isHidden = true;
-//		HipGuardR_1.isHidden = true;
-//
-//		init();
-//	}
-//
-//	/**
-//	 * 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;
-//	}
-//}
+package lance5057.tDefense.core.tools.armor.renderers.light;
+
+import lance5057.tDefense.core.tools.armor.renderers.ArmorRenderer;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.item.ItemStack;
+
+/**
+ * ModelPlayer - Either Mojang or a mod author
+ * Created using Tabula 7.0.0
+ */
+public class ModelTinkersChausses extends ArmorRenderer {
+    public ModelRenderer Front;
+    public ModelRenderer HipGuardL;
+    public ModelRenderer HipGuardR;
+    public ModelRenderer Back;
+    public ModelRenderer HipGuardL_1;
+    public ModelRenderer HipGuardR_1;
+    public ModelRenderer Belt;
+    public ModelRenderer BeltR;
+    public ModelRenderer BeltL;
+
+    public ModelTinkersChausses(ItemStack stack) {
+    	super(0.25f, 0, 96, 64, stack);
+        this.textureWidth = 96;
+        this.textureHeight = 64;
+        
+        this.HipGuardL = new ModelRenderer(this, 74, 37);
+        this.HipGuardL.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.HipGuardL.addBox(-1.5F, 0.0F, -2.6F, 4, 6, 5, 0.0F);
+        this.setRotateAngle(HipGuardL, 0.0F, -0.0F, -0.17453292519943295F);
+        this.bipedLeftLeg.addChild(HipGuardL);
+        
+        this.BeltR = new ModelRenderer(this, 62, 10);
+        this.BeltR.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.BeltR.addBox(-9.5F, 12.5F, -3.0F, 11, 2, 6, -0.2F);
+        this.setRotateAngle(BeltR, 0.0F, -0.0F, -0.27052603405912107F);
+        this.bipedBody.addChild(BeltR);
+        
+        this.Back = new ModelRenderer(this, 64, 40);
+        this.Back.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.Back.addBox(-2.0F, 0.0F, 1.9F, 4, 7, 1, 0.0F);
+        this.bipedBody.addChild(Back);
+        
+        this.Front = new ModelRenderer(this, 64, 40);
+        this.Front.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.Front.addBox(-2.0F, 0.0F, -2.7F, 4, 7, 1, 0.0F);
+        this.bipedBody.addChild(Front);
+        
+        this.BeltL = new ModelRenderer(this, 62, 10);
+        this.BeltL.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.BeltL.addBox(-1.5F, 12.5F, -3.0F, 11, 2, 6, -0.19F);
+        this.setRotateAngle(BeltL, 0.0F, -0.0F, 0.27052603405912107F);
+        this.bipedBody.addChild(BeltL);
+        
+        this.HipGuardR = new ModelRenderer(this, 74, 37);
+        this.HipGuardR.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.HipGuardR.addBox(-2.5F, 0.0F, -2.6F, 4, 6, 5, 0.0F);
+        this.setRotateAngle(HipGuardR, 0.0F, -0.0F, 0.17453292519943295F);
+        this.bipedRightLeg.addChild(HipGuardR);
+        
+        this.HipGuardR_1 = new ModelRenderer(this, 64, 49);
+        this.HipGuardR_1.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.HipGuardR_1.addBox(-2.5F, 0.0F, -2.6F, 4, 10, 5, 0.0F);
+        this.setRotateAngle(HipGuardR_1, 0.0F, -0.0F, 0.08726646259971647F);
+        this.bipedRightLeg.addChild(HipGuardR_1);
+        
+        this.Belt = new ModelRenderer(this, 64, 0);
+        this.Belt.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.Belt.addBox(-5.0F, 10.5F, -3.0F, 10, 2, 6, -0.2F);
+        this.bipedBody.addChild(Belt);
+        
+        this.HipGuardL_1 = new ModelRenderer(this, 64, 49);
+        this.HipGuardL_1.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.HipGuardL_1.addBox(-1.5F, 0.0F, -2.6F, 4, 10, 5, 0.0F);
+        this.setRotateAngle(HipGuardL_1, 0.0F, -0.0F, -0.08726646259971647F);
+        this.bipedLeftLeg.addChild(HipGuardL_1);
+    }
+
+    @Override
+    public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { 
+        this.HipGuardL.render(f5);
+        this.BeltR.render(f5);
+        this.Back.render(f5);
+        this.Front.render(f5);
+        this.BeltL.render(f5);
+        this.HipGuardR.render(f5);
+        this.HipGuardR_1.render(f5);
+        this.Belt.render(f5);
+        this.HipGuardL_1.render(f5);
+    }
+
+    /**
+     * 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/core/tools/armor/renderers/light/ModelTinkersCoif.java b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/light/ModelTinkersCoif.java
index d0af22d..e23ae0d 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/light/ModelTinkersCoif.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/light/ModelTinkersCoif.java
@@ -1,100 +1,40 @@
-//package lance5057.tDefense.armor.renderers.light;
-//
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import net.minecraft.client.model.ModelRenderer;
-//
-///**
-// * ModelBiped - Either Mojang or a mod author
-// * Created using Tabula 4.1.1
-// */
-//public class ModelTinkersCoif extends ArmorRenderer
-//{
-//	public ModelRenderer	Coif;
-//	public ModelRenderer	WingR;
-//	public ModelRenderer	Mask;
-//	public ModelRenderer	Overlay;
-//	public ModelRenderer	WingL;
-//	public ModelRenderer	Mohawk;
-//	public ModelRenderer	MohawkR;
-//	public ModelRenderer	MohawkL;
-//
-//	public ModelTinkersCoif()
-//	{
-//		super(0.1f, 0, 128, 64);
-//
-//		textureWidth = 128;
-//		textureHeight = 64;
-//
-//		Overlay = new ModelRenderer(this, "Overlay");
-//		Overlay.setTextureOffset(32, 32);
-//		Overlay.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Overlay.addBox(-4.0F, -10.0F, -4.0F, 8, 10, 8, 0.7F);
-//		bipedHead.addChild(Overlay);
-//
-//		WingL = new ModelRenderer(this, "WingL");
-//		WingL.setTextureOffset(64, 0);
-//		WingL.setRotationPoint(-0.7F, 0.0F, 0.0F);
-//		WingL.addBox(2.3F, -13.5F, -6.6F, 8, 18, 0, 0.0F);
-//		setRotateAngle(WingL, 0.0F, -0.5235987755982988F, 0.0F);
-//		bipedHead.addChild(WingL);
-//
-//		MohawkR = new ModelRenderer(this, "MohawkR");
-//		MohawkR.setTextureOffset(80, -14);
-//		MohawkR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		MohawkR.addBox(-3.0F, -14.0F, -3.6F, 0, 18, 14, 0.0F);
-//		setRotateAngle(MohawkR, 0.0F, -0.4363323129985824F, 0.0F);
-//		bipedHead.addChild(MohawkR);
-//
-//		Mohawk = new ModelRenderer(this, "Mohawk");
-//		Mohawk.setTextureOffset(64, 4);
-//		Mohawk.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Mohawk.addBox(0.0F, -14.0F, -4.6F, 0, 18, 14, 0.0F);
-//		bipedHead.addChild(Mohawk);
-//
-//		Mask = new ModelRenderer(this, "Mask");
-//		Mask.setTextureOffset(0, 43);
-//		Mask.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Mask.addBox(-4.5F, -8.0F, -5.0F, 9, 10, 4, 0.11F);
-//		bipedHead.addChild(Mask);
-//
-//		WingR = new ModelRenderer(this, "WingR");
-//		WingR.setTextureOffset(64, 0);
-//		WingR.mirror = true;
-//		WingR.setRotationPoint(-0.5F, 0.0F, 0.0F);
-//		WingR.addBox(-9.2F, -13.5F, -6.0F, 8, 18, 0, 0.0F);
-//		setRotateAngle(WingR, 0.0F, 0.5235987755982988F, 0.0F);
-//		bipedHead.addChild(WingR);
-//
-//		MohawkL = new ModelRenderer(this, "MohawkL");
-//		MohawkL.setTextureOffset(80, -14);
-//		MohawkL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		MohawkL.addBox(3.0F, -14.0F, -3.6F, 0, 18, 14, 0.0F);
-//		setRotateAngle(MohawkL, 0.0F, 0.4363323129985824F, 0.0F);
-//		bipedHead.addChild(MohawkL);
-//
-//		Coif = new ModelRenderer(this, "Coif");
-//		Coif.setTextureOffset(0, 32);
-//		Coif.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Coif.addBox(-4.0F, 1.0F, -4.0F, 8, 3, 8, 0.6F);
-//		bipedHead.addChild(Coif);
-//
-//		Mask.isHidden = true;
-//		Mohawk.isHidden = true;
-//		MohawkL.isHidden = true;
-//		MohawkR.isHidden = true;
-//		WingL.isHidden = true;
-//		WingR.isHidden = true;
-//
-//		init();
-//	}
-//
-//	/**
-//	 * 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;
-//	}
-//}
+package lance5057.tDefense.core.tools.armor.renderers.light;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+/**
+ * ModelTinkersCoif - Either Mojang or a mod author
+ * Created using Tabula 7.0.0
+ */
+public class ModelTinkersCoif extends ModelBase {
+    public ModelRenderer Coif;
+    public ModelRenderer Mask;
+
+    public ModelTinkersCoif() {
+        this.textureWidth = 96;
+        this.textureHeight = 64;
+        this.Mask = new ModelRenderer(this, 64, 11);
+        this.Mask.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.Mask.addBox(-4.5F, -8.0F, -5.0F, 9, 10, 4, 0.11F);
+        this.Coif = new ModelRenderer(this, 64, 0);
+        this.Coif.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.Coif.addBox(-4.0F, 1.0F, -4.0F, 8, 3, 8, 0.5F);
+    }
+
+    @Override
+    public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { 
+        this.Mask.render(f5);
+        this.Coif.render(f5);
+    }
+
+    /**
+     * 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/core/tools/armor/renderers/light/ModelTinkersHauberk.java b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/light/ModelTinkersHauberk.java
index d30b478..481fab6 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/light/ModelTinkersHauberk.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/light/ModelTinkersHauberk.java
@@ -1,198 +1,105 @@
-//package lance5057.tDefense.armor.renderers.light;
-//
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import net.minecraft.client.model.ModelRenderer;
-//
-///**
-// * ModelTinkersHauberk - Either Mojang or a mod author
-// * Created using Tabula 4.1.1
-// */
-//public class ModelTinkersHauberk extends ArmorRenderer
-//{
-//	public ModelRenderer	ChestBeltR;
-//	public ModelRenderer	ChestBelt;
-//	public ModelRenderer	ChestBeltR_1;
-//	public ModelRenderer	ChestBelt_1;
-//	public ModelRenderer	ChestBeltL;
-//	public ModelRenderer	ChestBeltL_1;
-//	public ModelRenderer	ChestBelt_2;
-//	public ModelRenderer	Pauldron1;
-//	public ModelRenderer	Pauldron2;
-//	public ModelRenderer	PauldronStudR;
-//	public ModelRenderer	Pauldron3R;
-//	public ModelRenderer	PauldronFlairR;
-//	public ModelRenderer	Pauldron1L;
-//	public ModelRenderer	Pauldron2L;
-//	public ModelRenderer	PauldronStudL;
-//	public ModelRenderer	Pauldron3L;
-//	public ModelRenderer	PauldronFlairL;
-//
-//	public ModelTinkersHauberk()
-//	{
-//		super(0.1f, 0, 64, 64);
-//
-//		textureWidth = 64;
-//		textureHeight = 64;
-//
-//		bipedBody = new ModelRenderer(this, "Body");
-//		bipedBody.setTextureOffset(16, 16);
-//		bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, 0.05f);
-//		bipedBody.setRotationPoint(0.0F, 0.0F + 0, 0.0F);
-//
-//		bipedRightArm = new ModelRenderer(this, "Right Arm");
-//		bipedRightArm.setTextureOffset(40, 16);
-//		bipedRightArm.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, 0.05f);
-//		bipedRightArm.setRotationPoint(-5.0F, 2.0F + 0, 0.0F);
-//
-//		bipedLeftArm = new ModelRenderer(this, "Left Arm");
-//		bipedLeftArm.setTextureOffset(40, 16);
-//		bipedLeftArm.mirror = true;
-//		bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, 0.05f);
-//		bipedLeftArm.setRotationPoint(5.0F, 2.0F + 0, 0.0F);
-//
-//		ChestBelt_1 = new ModelRenderer(this, "ChestBelt_1");
-//		ChestBelt_1.setTextureOffset(0, 57);
-//		ChestBelt_1.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ChestBelt_1.addBox(-4.5F, 9.0F, -2.5F, 9, 2, 5, -0.19F);
-//		bipedBody.addChild(ChestBelt_1);
-//
-//		ChestBelt_2 = new ModelRenderer(this, "ChestBelt_2");
-//		ChestBelt_2.setTextureOffset(28, 32);
-//		ChestBelt_2.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ChestBelt_2.addBox(-4.5F, 5.0F, -2.5F, 9, 2, 5, -0.19F);
-//		bipedBody.addChild(ChestBelt_2);
-//
-//		Pauldron3R = new ModelRenderer(this, "Pauldron3R");
-//		Pauldron3R.setTextureOffset(0, 32);
-//		Pauldron3R.setRotationPoint(-0.0F, 0.0F, 0.0F);
-//		Pauldron3R.addBox(-3.2F, -0.5F, -2.0F, 3, 4, 4, 0.1F);
-//		setRotateAngle(Pauldron3R, 0.0F, 0.0F, 0.08726646259971647F);
-//		bipedRightArm.addChild(Pauldron3R);
-//
-//		Pauldron2L = new ModelRenderer(this, "Pauldron2L");
-//		Pauldron2L.setTextureOffset(0, 49);
-//		Pauldron2L.mirror = true;
-//		Pauldron2L.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Pauldron2L.addBox(-1.0F, -3.0F, -2.0F, 3, 3, 4, 0.1F);
-//		setRotateAngle(Pauldron2L, 0.0F, 0.0F, 0.2617993877991494F);
-//		bipedLeftArm.addChild(Pauldron2L);
-//
-//		Pauldron3L = new ModelRenderer(this, "Pauldron3L");
-//		Pauldron3L.setTextureOffset(0, 32);
-//		Pauldron3L.mirror = true;
-//		Pauldron3L.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Pauldron3L.addBox(0.2F, -0.5F, -2.0F, 3, 4, 4, 0.1F);
-//		setRotateAngle(Pauldron3L, 0.0F, 0.0F, -0.08726646259971647F);
-//		bipedLeftArm.addChild(Pauldron3L);
-//
-//		ChestBeltR = new ModelRenderer(this, "ChestBeltR");
-//		ChestBeltR.setTextureOffset(0, 57);
-//		ChestBeltR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ChestBeltR.addBox(-1.7F, 5.7F, -2.5F, 11, 2, 5, -0.2F);
-//		setRotateAngle(ChestBeltR, 0.0F, 0.0F, 0.5235987755982988F);
-//		bipedBody.addChild(ChestBeltR);
-//
-//		ChestBeltL = new ModelRenderer(this, "ChestBeltL");
-//		ChestBeltL.setTextureOffset(0, 57);
-//		ChestBeltL.mirror = true;
-//		ChestBeltL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ChestBeltL.addBox(-7.5F, 2.3F, -2.5F, 11, 2, 5, -0.2F);
-//		setRotateAngle(ChestBeltL, 0.0F, 0.0F, -0.5235987755982988F);
-//		bipedBody.addChild(ChestBeltL);
-//
-//		ChestBeltL_1 = new ModelRenderer(this, "ChestBeltL_1");
-//		ChestBeltL_1.setTextureOffset(0, 57);
-//		ChestBeltL_1.mirror = true;
-//		ChestBeltL_1.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ChestBeltL_1.addBox(-9.3F, 5.7F, -2.5F, 11, 2, 5, -0.21F);
-//		setRotateAngle(ChestBeltL_1, 0.0F, 0.0F, -0.5235987755982988F);
-//		bipedBody.addChild(ChestBeltL_1);
-//
-//		PauldronStudR = new ModelRenderer(this, "PauldronStudR");
-//		PauldronStudR.setTextureOffset(14, 32);
-//		PauldronStudR.setRotationPoint(-0.0F, 0.0F, 0.0F);
-//		PauldronStudR.addBox(-1.0F, -1.5F, -2.5F, 2, 2, 5, 0.1F);
-//		setRotateAngle(PauldronStudR, 0.0F, 0.0F, -0.2617993877991494F);
-//		bipedRightArm.addChild(PauldronStudR);
-//
-//		Pauldron1 = new ModelRenderer(this, "Pauldron1");
-//		Pauldron1.setTextureOffset(0, 40);
-//		Pauldron1.setRotationPoint(-0.0F, 0.0F, 0.0F);
-//		Pauldron1.addBox(-3.5F, -1.9F, -2.5F, 4, 4, 5, 0.0F);
-//		setRotateAngle(Pauldron1, 0.0F, 0.0F, 0.2617993877991494F);
-//		bipedRightArm.addChild(Pauldron1);
-//
-//		ChestBeltR_1 = new ModelRenderer(this, "ChestBeltR_1");
-//		ChestBeltR_1.setTextureOffset(0, 57);
-//		ChestBeltR_1.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ChestBeltR_1.addBox(-3.5F, 2.3F, -2.5F, 11, 2, 5, -0.21F);
-//		setRotateAngle(ChestBeltR_1, 0.0F, 0.0F, 0.5235987755982988F);
-//		bipedBody.addChild(ChestBeltR_1);
-//
-//		PauldronFlairR = new ModelRenderer(this, "PauldronFlairR");
-//		PauldronFlairR.setTextureOffset(18, 39);
-//		PauldronFlairR.mirror = true;
-//		PauldronFlairR.setRotationPoint(-0.0F, 0.0F, 0.0F);
-//		PauldronFlairR.addBox(-8.5F, -4.5F, 0.0F, 7, 9, 0, 0.0F);
-//		setRotateAngle(PauldronFlairR, 0.0F, 0.0F, 0.2617993877991494F);
-//		bipedRightArm.addChild(PauldronFlairR);
-//
-//		PauldronFlairL = new ModelRenderer(this, "PauldronFlairL");
-//		PauldronFlairL.setTextureOffset(18, 39);
-//		PauldronFlairL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		PauldronFlairL.addBox(1.5F, -4.5F, 0.0F, 7, 9, 0, 0.0F);
-//		setRotateAngle(PauldronFlairL, 0.0F, 0.0F, -0.2617993877991494F);
-//		bipedLeftArm.addChild(PauldronFlairL);
-//
-//		Pauldron2 = new ModelRenderer(this, "Pauldron2");
-//		Pauldron2.setTextureOffset(0, 49);
-//		Pauldron2.setRotationPoint(-0.0F, 0.0F, 0.0F);
-//		Pauldron2.addBox(-2.0F, -3.0F, -2.0F, 3, 3, 4, 0.1F);
-//		setRotateAngle(Pauldron2, 0.0F, 0.0F, -0.2617993877991494F);
-//		bipedRightArm.addChild(Pauldron2);
-//
-//		PauldronStudL = new ModelRenderer(this, "PauldronStudL");
-//		PauldronStudL.setTextureOffset(14, 32);
-//		PauldronStudL.mirror = true;
-//		PauldronStudL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		PauldronStudL.addBox(-1.0F, -1.5F, -2.5F, 2, 2, 5, 0.1F);
-//		setRotateAngle(PauldronStudL, 0.0F, 0.0F, 0.2617993877991494F);
-//		bipedLeftArm.addChild(PauldronStudL);
-//
-//		Pauldron1L = new ModelRenderer(this, "Pauldron1L");
-//		Pauldron1L.setTextureOffset(0, 40);
-//		Pauldron1L.mirror = true;
-//		Pauldron1L.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Pauldron1L.addBox(-0.5F, -1.9F, -2.5F, 4, 4, 5, 0.0F);
-//		setRotateAngle(Pauldron1L, 0.0F, 0.0F, -0.2617993877991494F);
-//		bipedLeftArm.addChild(Pauldron1L);
-//
-//		ChestBelt = new ModelRenderer(this, "ChestBelt");
-//		ChestBelt.setTextureOffset(28, 32);
-//		ChestBelt.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ChestBelt.addBox(-4.5F, 3.0F, -2.5F, 9, 2, 5, -0.19F);
-//		bipedBody.addChild(ChestBelt);
-//
-//		//ChestBelt.isHidden = true;
-//		ChestBelt_1.isHidden = true;
-//		ChestBelt_2.isHidden = true;
-//		ChestBeltL.isHidden = true;
-//		ChestBeltL_1.isHidden = true;
-//		ChestBeltR.isHidden = true;
-//		ChestBeltR_1.isHidden = true;
-//		PauldronFlairL.isHidden = true;
-//		PauldronFlairR.isHidden = true;
-//
-//		init();
-//	}
-//
-//	/**
-//	 * 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;
-//	}
-//}
+package lance5057.tDefense.core.tools.armor.renderers.light;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+/**
+ * TinkersHauberk - Either Mojang or a mod author
+ * Created using Tabula 7.0.0
+ */
+public class ModelTinkersHauberk extends ModelBase {
+    public ModelRenderer ChestBelt;
+    public ModelRenderer ChestBeltR;
+    public ModelRenderer ChestBelt2;
+    public ModelRenderer ChestBeltL;
+    public ModelRenderer Pauldron1;
+    public ModelRenderer Pauldron2;
+    public ModelRenderer PauldronStudR;
+    public ModelRenderer Pauldron3R;
+    public ModelRenderer Pauldron1L;
+    public ModelRenderer Pauldron2L;
+    public ModelRenderer PauldronStudL;
+    public ModelRenderer Pauldron3L;
+
+    public ModelTinkersHauberk() {
+        this.textureWidth = 96;
+        this.textureHeight = 64;
+        this.ChestBelt = new ModelRenderer(this, 64, 17);
+        this.ChestBelt.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.ChestBelt.addBox(-4.5F, 3.0F, -2.5F, 9, 2, 5, -0.19F);
+        this.Pauldron3R = new ModelRenderer(this, 78, 9);
+        this.Pauldron3R.setRotationPoint(-5.0F, 2.0F, 0.0F);
+        this.Pauldron3R.addBox(-3.2F, -0.5F, -2.0F, 3, 4, 4, 0.1F);
+        this.setRotateAngle(Pauldron3R, 0.0F, 0.0F, 0.08726646259971647F);
+        this.Pauldron1 = new ModelRenderer(this, 64, 0);
+        this.Pauldron1.setRotationPoint(-5.0F, 2.0F, 0.0F);
+        this.Pauldron1.addBox(-3.5F, -1.9F, -2.5F, 4, 4, 5, 0.0F);
+        this.setRotateAngle(Pauldron1, 0.0F, 0.0F, 0.2617993877991494F);
+        this.PauldronStudL = new ModelRenderer(this, 64, 9);
+        this.PauldronStudL.mirror = true;
+        this.PauldronStudL.setRotationPoint(5.0F, 2.0F, 0.0F);
+        this.PauldronStudL.addBox(-1.0F, -1.5F, -2.5F, 2, 2, 5, 0.1F);
+        this.setRotateAngle(PauldronStudL, 0.0F, 0.0F, 0.2617993877991494F);
+        this.Pauldron3L = new ModelRenderer(this, 78, 9);
+        this.Pauldron3L.mirror = true;
+        this.Pauldron3L.setRotationPoint(5.0F, 2.0F, 0.0F);
+        this.Pauldron3L.addBox(0.2F, -0.5F, -2.0F, 3, 4, 4, 0.1F);
+        this.setRotateAngle(Pauldron3L, 0.0F, 0.0F, -0.08726646259971647F);
+        this.Pauldron2 = new ModelRenderer(this, 81, 0);
+        this.Pauldron2.setRotationPoint(-5.0F, 2.0F, 0.0F);
+        this.Pauldron2.addBox(-2.0F, -3.0F, -2.0F, 3, 3, 4, 0.1F);
+        this.setRotateAngle(Pauldron2, 0.0F, 0.0F, -0.2617993877991494F);
+        this.PauldronStudR = new ModelRenderer(this, 64, 9);
+        this.PauldronStudR.setRotationPoint(-5.0F, 2.0F, 0.0F);
+        this.PauldronStudR.addBox(-1.0F, -1.5F, -2.5F, 2, 2, 5, 0.1F);
+        this.setRotateAngle(PauldronStudR, 0.0F, 0.0F, -0.2617993877991494F);
+        this.ChestBeltR = new ModelRenderer(this, 64, 24);
+        this.ChestBeltR.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.ChestBeltR.addBox(-3.5F, 2.3F, -2.5F, 11, 2, 5, -0.21F);
+        this.setRotateAngle(ChestBeltR, 0.0F, 0.0F, 0.5235987755982988F);
+        this.ChestBelt2 = new ModelRenderer(this, 64, 17);
+        this.ChestBelt2.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.ChestBelt2.addBox(-4.5F, 5.0F, -2.5F, 9, 2, 5, -0.19F);
+        this.Pauldron2L = new ModelRenderer(this, 81, 0);
+        this.Pauldron2L.mirror = true;
+        this.Pauldron2L.setRotationPoint(5.0F, 2.0F, 0.0F);
+        this.Pauldron2L.addBox(-1.0F, -3.0F, -2.0F, 3, 3, 4, 0.1F);
+        this.setRotateAngle(Pauldron2L, 0.0F, 0.0F, 0.2617993877991494F);
+        this.ChestBeltL = new ModelRenderer(this, 64, 24);
+        this.ChestBeltL.mirror = true;
+        this.ChestBeltL.setRotationPoint(0.0F, 0.0F, 0.0F);
+        this.ChestBeltL.addBox(-7.5F, 2.3F, -2.5F, 11, 2, 5, 0.0F);
+        this.setRotateAngle(ChestBeltL, 0.0F, 0.0F, -0.5235987755982988F);
+        this.Pauldron1L = new ModelRenderer(this, 64, 0);
+        this.Pauldron1L.mirror = true;
+        this.Pauldron1L.setRotationPoint(5.0F, 2.0F, 0.0F);
+        this.Pauldron1L.addBox(-0.5F, -1.9F, -2.5F, 4, 4, 5, 0.0F);
+        this.setRotateAngle(Pauldron1L, 0.0F, 0.0F, -0.2617993877991494F);
+    }
+
+    @Override
+    public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { 
+        this.ChestBelt.render(f5);
+        this.Pauldron3R.render(f5);
+        this.Pauldron1.render(f5);
+        this.PauldronStudL.render(f5);
+        this.Pauldron3L.render(f5);
+        this.Pauldron2.render(f5);
+        this.PauldronStudR.render(f5);
+        this.ChestBeltR.render(f5);
+        this.ChestBelt2.render(f5);
+        this.Pauldron2L.render(f5);
+        this.ChestBeltL.render(f5);
+        this.Pauldron1L.render(f5);
+    }
+
+    /**
+     * 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/core/tools/armor/straps/ItemStraps.java b/src/main/java/lance5057/tDefense/core/tools/armor/straps/ItemStraps.java
index 2c5d0af..d784530 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/straps/ItemStraps.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/straps/ItemStraps.java
@@ -50,11 +50,11 @@ public class ItemStraps extends ItemArmor implements ISpecialArmor
 	@SideOnly(Side.CLIENT)
 	public final String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type)
 	{
-		ItemStack in = stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).getStackInSlot(0);
-		if(in.getItem() instanceof ArmorCore)
-		{
-			return ((ArmorCore)in.getItem()).getArmorTexture(stack, 0);
-		}
+//		ItemStack in = stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).getStackInSlot(0);
+//		if(in.getItem() instanceof ArmorCore)
+//		{
+//			return ((ArmorCore)in.getItem()).getArmorTexture(stack, 0);
+//		}
 		return null;
 	}
 	
diff --git a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
index d1df248..5771f6e 100644
--- a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
@@ -163,6 +163,8 @@ public class ClientProxy extends CommonProxy {
 		robeGUI = new ToolBuildGuiInfo(TDTools.robe);
 		shoesGUI = new ToolBuildGuiInfo(TDTools.shoes);
 		
+		bootsGUI = new ToolBuildGuiInfo(TDTools.boots);
+		
 		helmGUI = new ToolBuildGuiInfo(TDTools.helm);
 		breastplateGUI = new ToolBuildGuiInfo(TDTools.breastplate);
 		grievesGUI = new ToolBuildGuiInfo(TDTools.grieves);
@@ -210,6 +212,10 @@ public class ClientProxy extends CommonProxy {
 		shoesGUI.addSlotPosition(25, 33 + 8);
 		shoesGUI.addSlotPosition(43, 51 + 8);
 		shoesGUI.addSlotPosition(34, 51 + 8);
+		
+		bootsGUI.addSlotPosition(34, 15 + 8);
+		bootsGUI.addSlotPosition(43, 33 + 8);
+		bootsGUI.addSlotPosition(34, 51 + 8);
 
 		shearsGUI.addSlotPosition(34, 15 + 8);
 		shearsGUI.addSlotPosition(43, 33 + 8);
@@ -242,6 +248,8 @@ public class ClientProxy extends CommonProxy {
 		TinkerRegistryClient.addToolBuilding(shawlGUI);
 		TinkerRegistryClient.addToolBuilding(robeGUI);
 		TinkerRegistryClient.addToolBuilding(shoesGUI);
+		
+		TinkerRegistryClient.addToolBuilding(bootsGUI);
 
 		TinkerRegistryClient.addToolBuilding(sheatheGUI);
 		TinkerRegistryClient.addToolBuilding(ringGUI);
@@ -315,6 +323,11 @@ public class ClientProxy extends CommonProxy {
 		shoesGUI.addSlotPosition(43, 51 + 8);
 		shoesGUI.addSlotPosition(34, 51 + 8);
 		
+		bootsGUI.positions.clear();
+		bootsGUI.addSlotPosition(34, 15 + 8);
+		bootsGUI.addSlotPosition(43, 33 + 8);
+		bootsGUI.addSlotPosition(34, 51 + 8);
+		
 		breastplateGUI.positions.clear();
 		breastplateGUI.addSlotPosition(34, 15 + 8);
 		breastplateGUI.addSlotPosition(43, 33 + 8);
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_caps.png b/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_caps.png
index 342232c..5bb5a0f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_caps.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_caps.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_plates.png b/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_plates.png
index 208faa1..4072c56 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_plates.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_plates.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_soles.png b/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_soles.png
index b3d9ade..fbf6e71 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_soles.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_soles.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_trim.png
index 69f4694..6eeb772 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_trim.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_chain.png b/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_chain.png
index e20e07b..efeceac 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_chain.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_cloth.png b/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_cloth.png
index 719730a..396f51d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_cloth.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_rivet.png b/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_rivet.png
index 834b37b..b2bcf16 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_rivet.png
+++ b/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_rivet.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_caps.png b/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_caps.png
deleted file mode 100644
index 5bb5a0f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_caps.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_plates.png b/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_plates.png
deleted file mode 100644
index 4072c56..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_plates.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_soles.png b/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_soles.png
deleted file mode 100644
index fbf6e71..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_soles.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_trim.png
deleted file mode 100644
index 6eeb772..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_sabatons_trim.png
+++ /dev/null