Worked on armor. Straps eat items placed in them...

33 files changed, 1 insertions, 4462 deletions

diff --git a/src/main/java/lance5057/tDefense/armor/ArmorCore.java b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
deleted file mode 100644
index 0af81d8..0000000
--- a/src/main/java/lance5057/tDefense/armor/ArmorCore.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package lance5057.tDefense.armor;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import javax.annotation.Nonnull;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Sets;
-
-import gnu.trove.set.hash.THashSet;
-import lance5057.tDefense.armor.events.ArmorBaseEvents;
-import lance5057.tDefense.armor.materials.MaterialArmor;
-import lance5057.tDefense.armor.materials.MaterialCloth;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.EntityEquipmentSlot;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.ItemArmor.ArmorMaterial;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.nbt.NBTTagString;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
-import net.minecraft.world.World;
-import net.minecraftforge.common.ISpecialArmor;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-import slimeknights.mantle.util.RecipeMatch;
-import slimeknights.tconstruct.common.ClientProxy;
-import slimeknights.tconstruct.common.config.Config;
-import slimeknights.tconstruct.library.Util;
-import slimeknights.tconstruct.library.materials.HeadMaterialStats;
-import slimeknights.tconstruct.library.materials.Material;
-import slimeknights.tconstruct.library.materials.MaterialTypes;
-import slimeknights.tconstruct.library.modifiers.TinkerGuiException;
-import slimeknights.tconstruct.library.tinkering.Category;
-import slimeknights.tconstruct.library.tinkering.IModifyable;
-import slimeknights.tconstruct.library.tinkering.IRepairable;
-import slimeknights.tconstruct.library.tinkering.ITinkerable;
-import slimeknights.tconstruct.library.tinkering.IToolStationDisplay;
-import slimeknights.tconstruct.library.tinkering.IndestructibleEntityItem;
-import slimeknights.tconstruct.library.tinkering.PartMaterialType;
-import slimeknights.tconstruct.library.tools.ToolCore;
-import slimeknights.tconstruct.library.tools.ToolNBT;
-import slimeknights.tconstruct.library.traits.ITrait;
-import slimeknights.tconstruct.library.utils.TagUtil;
-import slimeknights.tconstruct.library.utils.Tags;
-import slimeknights.tconstruct.library.utils.TinkerUtil;
-import slimeknights.tconstruct.library.utils.ToolBuilder; 
-import slimeknights.tconstruct.library.utils.ToolHelper;
-import slimeknights.tconstruct.library.utils.TooltipBuilder;
-
-public abstract class ArmorCore extends ToolCore
-{
-	public float reductionPercent = 0f;
-	public int maxReduction = 100;
-
-	public ArmorCore(PartMaterialType... rc) {
-		super(rc);
-	}
-	
-	@Override
-	public NBTTagCompound buildTag(List<Material> materials) {
-		ToolNBT data = buildDefaultTag(materials);
-	    data.durability *= 1;
-	    return data.get();
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/armor/events/ArmorBaseEvents.java b/src/main/java/lance5057/tDefense/armor/events/ArmorBaseEvents.java
index d35a37a..4f00ee9 100644
--- a/src/main/java/lance5057/tDefense/armor/events/ArmorBaseEvents.java
+++ b/src/main/java/lance5057/tDefense/armor/events/ArmorBaseEvents.java
@@ -2,13 +2,11 @@ package lance5057.tDefense.armor.events;
 
 import com.google.common.collect.ImmutableList;
 
-import lance5057.tDefense.armor.ArmorCore;
+import lance5057.tDefense.core.tools.bases.ArmorCore;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.eventhandler.Event;
-import slimeknights.tconstruct.library.events.TinkerEvent.OnItemBuilding;
 import slimeknights.tconstruct.library.materials.Material;
-import slimeknights.tconstruct.library.tinkering.TinkersItem;
 
 public abstract class ArmorBaseEvents extends Event {
 	public static class OnArmorBuilding extends ArmorBaseEvents {
diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
deleted file mode 100644
index 03f5202..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package lance5057.tDefense.armor.items.cloth;
-
-import lance5057.tDefense.armor.ArmorCore;
-import lance5057.tDefense.core.parts.TDParts;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-public class TinkersHood extends ArmorCore
-{
-	int	induceDamage	= 0;
-	
-
-	public TinkersHood()
-	{
-	    super(TDParts.ClothMat,
-	    		TDParts.ClothMat,
-	    		TDParts.RivetMat);
-		setUnlocalizedName("tinkerhood");
-	}
-
-	@Override
-	public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5)
-	{
-		super.onUpdate(stack, world, entity, par4, par5);
-
-	}
-
-	@Override
-	public float damagePotential() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public double attackSpeed() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	
-}
diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java
deleted file mode 100644
index 905e415..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package lance5057.tDefense.armor.items.cloth;
-
-import lance5057.tDefense.armor.ArmorCore;
-import lance5057.tDefense.core.parts.TDParts;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-public class TinkersRobe extends ArmorCore
-{
-	int	induceDamage	= 0;
-	
-
-	public TinkersRobe()
-	{
-	    super(TDParts.ClothMat,
-	    		TDParts.ClothMat,
-	    		TDParts.ClaspMat);
-		setUnlocalizedName("tinkerrobe");
-	}
-
-	@Override
-	public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5)
-	{
-		super.onUpdate(stack, world, entity, par4, par5);
-
-	}
-
-	@Override
-	public float damagePotential() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public double attackSpeed() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	
-}
diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java
deleted file mode 100644
index 47bbd7c..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package lance5057.tDefense.armor.items.cloth;
-
-import lance5057.tDefense.armor.ArmorCore;
-import lance5057.tDefense.core.parts.TDParts;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-public class TinkersShawl extends ArmorCore
-{
-	int	induceDamage	= 0;
-	
-
-	public TinkersShawl()
-	{
-	    super(TDParts.ClothMat,
-	    		TDParts.ClothMat,
-	    		TDParts.ArmorplateMat);
-		setUnlocalizedName("tinkershawl");
-	}
-
-	@Override
-	public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5)
-	{
-		super.onUpdate(stack, world, entity, par4, par5);
-
-	}
-
-	@Override
-	public float damagePotential() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public double attackSpeed() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	
-}
diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java
deleted file mode 100644
index b0ff8e5..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package lance5057.tDefense.armor.items.cloth;
-
-import lance5057.tDefense.armor.ArmorCore;
-import lance5057.tDefense.core.parts.TDParts;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-public class TinkersShoes extends ArmorCore
-{
-	int	induceDamage	= 0;
-	
-
-	public TinkersShoes()
-	{
-	    super(TDParts.ClothMat,
-	    		TDParts.ArmorplateMat,
-	    		TDParts.ClaspMat);
-		setUnlocalizedName("tinkershoes");
-	}
-
-	@Override
-	public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5)
-	{
-		super.onUpdate(stack, world, entity, par4, par5);
-
-	}
-
-	@Override
-	public float damagePotential() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public double attackSpeed() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	
-}
diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersBreastplate.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersBreastplate.java
deleted file mode 100644
index d738cac..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersBreastplate.java
+++ /dev/null
@@ -1,64 +0,0 @@
-//package lance5057.tDefense.armor.items.heavy;
-//
-//import java.util.List;
-//
-//import lance5057.tDefense.armor.ArmorCore;
-//import net.minecraft.entity.EntityLivingBase;
-//import net.minecraft.inventory.EntityEquipmentSlot;
-//import net.minecraft.item.ItemStack;
-//import net.minecraft.nbt.NBTTagCompound;
-//import net.minecraft.util.DamageSource;
-//import slimeknights.tconstruct.library.materials.Material;
-//import slimeknights.tconstruct.library.tinkering.PartMaterialType;
-//import slimeknights.tconstruct.tools.TinkerTools;
-//
-//public class TinkersBreastplate extends ArmorCore
-//{
-//	public TinkersBreastplate()
-//	{
-//		super(EntityEquipmentSlot.CHEST,
-//				PartMaterialType.head(TinkerTools.largePlate), 
-//				PartMaterialType.head(TinkerTools.largePlate), 
-//				PartMaterialType.handle(TinkerTools.toughToolRod),
-//				PartMaterialType.extra(TinkerTools.bowString));
-//		setUnlocalizedName("tinkersbreastplate");
-//		maxReduction = 100;
-//		reductionPercent = 8 * 0.04f;
-//	}
-//
-//	@Override
-//	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
-//		// TODO Auto-generated method stub
-//		
-//	}
-//
-//	@Override
-//	public float damagePotential() {
-//		// TODO Auto-generated method stub
-//		return 0;
-//	}
-//
-//	@Override
-//	public double attackSpeed() {
-//		// TODO Auto-generated method stub
-//		return 0;
-//	}
-//
-//	@Override
-//	public NBTTagCompound buildTag(List<Material> materials) {
-//		// TODO Auto-generated method stub
-//		return null;
-//	}
-//
-////	@Override
-////	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
-////	{
-////		return "tinkersdefense:textures/armor/Tinkersbreastplate.png";
-////	}
-////
-////	@Override
-////	public ArmorRenderer getRenderer()
-////	{
-////		return ClientProxy.breastplate;
-////	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java
deleted file mode 100644
index e763ff8..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java
+++ /dev/null
@@ -1,132 +0,0 @@
-//package lance5057.tDefense.armor.items.heavy;
-//
-//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.item.Item;
-//import net.minecraft.item.ItemStack;
-//import tconstruct.tools.TinkerTools;
-//
-//public class TinkersGrieves extends ArmorCore
-//{
-//	public TinkersGrieves()
-//	{
-//		super(2, 2);
-//		setUnlocalizedName("tinkergrieves");
-//		maxReduction = 100;
-//		reductionPercent = 6 * 0.04f;
-//	}
-//
-//	@Override
-//	public Item getHeadItem()
-//	{
-//		return TinkersDefense.partArmorplate;
-//	}
-//
-//	@Override
-//	public Item getHandleItem()
-//	{
-//		return TinkerTools.toughRod;
-//	}
-//
-//	@Override
-//	public Item getAccessoryItem()
-//	{
-//		return TinkersDefense.partChainmaille;
-//	}
-//
-//	@Override
-//	public Item getExtraItem()
-//	{
-//		return TinkersDefense.partCloth;
-//	}
-//
-//	@Override
-//	public int durabilityTypeAccessory()
-//	{
-//		return 2;
-//	}
-//
-//	@Override
-//	public float getRepairCost()
-//	{
-//		return 4.0f;
-//	}
-//
-//	@Override
-//	public float getDurabilityModifier()
-//	{
-//		return 2.5f;
-//	}
-//
-//	@Override
-//	public float getDamageModifier()
-//	{
-//		return 1.4f;
-//	}
-//
-//	@Override
-//	public int getPartAmount()
-//	{
-//		return 4;
-//	}
-//
-//	@Override
-//	public String getIconSuffix(int partType)
-//	{
-//		switch(partType)
-//		{
-//			case 0:
-//				return "_grieves_plate";
-//			case 1:
-//				return "_grieves_plate_broken";
-//			case 2:
-//				return "_grieves_trim";
-//			case 3:
-//				return "_grieves_chain";
-//			case 4:
-//				return "_grieves_cloth";
-//			default:
-//				return "";
-//		}
-//	}
-//
-//	@Override
-//	public String getEffectSuffix()
-//	{
-//		return "_grieves_effect";
-//	}
-//
-//	@Override
-//	public String getDefaultFolder()
-//	{
-//		return "armor/grieves";
-//	}
-//
-//	//	@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/TinkersGrieves.png";
-//	}
-//
-//	@Override
-//	public String[] getTraits()
-//	{
-//		return new String[] {"armor", "pants", "grieves", "heavyarmor"};
-//	}
-//
-//	@Override
-//	public ArmorRenderer getRenderer()
-//	{
-//		return ClientProxy.grieves;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
deleted file mode 100644
index 8e47805..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
+++ /dev/null
@@ -1,169 +0,0 @@
-//package lance5057.tDefense.armor.items.heavy;
-//
-//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.EntityLivingBase;
-//import net.minecraft.entity.player.EntityPlayer;
-//import net.minecraft.item.Item;
-//import net.minecraft.item.ItemStack;
-//import net.minecraft.world.World;
-//import tconstruct.tools.TinkerTools;
-//import thaumcraft.api.IGoggles;
-//import thaumcraft.api.nodes.IRevealer;
-//import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
-//import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge;
-//import cpw.mods.fml.common.Optional;
-//
-//@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles", striprefs = true)})
-//public class TinkersHelm extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles
-//{
-//	public TinkersHelm()
-//	{
-//		super(2, 0);
-//		setUnlocalizedName("tinkershelm");
-//		maxReduction = 100;
-//		reductionPercent = 3 * 0.04f;
-//	}
-//
-//	@Override
-//	public Item getHeadItem()
-//	{
-//		return TinkerTools.frypanHead;
-//	}
-//
-//	@Override
-//	public Item getHandleItem()
-//	{
-//		return TinkerTools.toughRod;
-//	}
-//
-//	@Override
-//	public Item getAccessoryItem()
-//	{
-//		return TinkersDefense.partArmorplate;
-//	}
-//
-//	@Override
-//	public Item getExtraItem()
-//	{
-//		return TinkersDefense.partChainmaille;
-//	}
-//
-//	@Override
-//	public int durabilityTypeAccessory()
-//	{
-//		return 2;
-//	}
-//
-//	@Override
-//	public float getRepairCost()
-//	{
-//		return 4.0f;
-//	}
-//
-//	@Override
-//	public float getDurabilityModifier()
-//	{
-//		return 2.5f;
-//	}
-//
-//	@Override
-//	public float getDamageModifier()
-//	{
-//		return 1.4f;
-//	}
-//
-//	@Override
-//	public int getPartAmount()
-//	{
-//		return 4;
-//	}
-//
-//	@Override
-//	public String getIconSuffix(int partType)
-//	{
-//		switch(partType)
-//		{
-//			case 0:
-//				return "_helm_top";
-//			case 1:
-//				return "_helm_top_broken";
-//			case 2:
-//				return "_helm_chain";
-//			case 3:
-//				return "_helm_plate";
-//			case 4:
-//				return "_helm_visor";
-//			default:
-//				return "";
-//		}
-//	}
-//
-//	@Override
-//	public String getEffectSuffix()
-//	{
-//		return "_helm_effect";
-//	}
-//
-//	@Override
-//	public String getDefaultFolder()
-//	{
-//		return "armor/helm";
-//	}
-//
-//	//	@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/TinkersHelm.png";
-//	}
-//
-//	@Override
-//	public String[] getTraits()
-//	{
-//		return new String[] {"armor", "head", "helm", "heavyarmor"};
-//	}
-//
-//	@Override
-//	public ArmorRenderer getRenderer()
-//	{
-//		return ClientProxy.helm;
-//	}
-//
-//	@Optional.Method(modid = "Thaumcraft")
-//	@Override
-//	public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
-//	{
-//		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
-//	}
-//
-//	@Optional.Method(modid = "Thaumcraft")
-//	@Override
-//	public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
-//	{
-//		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
-//	}
-//
-//	@Optional.Method(modid = "AWWayofTime")
-//	@Override
-//	public boolean canSeeLPBar(ItemStack stack)
-//	{
-//		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
-//	}
-//
-//	@Optional.Method(modid = "AWWayofTime")
-//	@Override
-//	public boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player)
-//	{
-//		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java
deleted file mode 100644
index 47bcc77..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java
+++ /dev/null
@@ -1,132 +0,0 @@
-//package lance5057.tDefense.armor.items.heavy;
-//
-//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.item.Item;
-//import net.minecraft.item.ItemStack;
-//import tconstruct.tools.TinkerTools;
-//
-//public class TinkersSabatons extends ArmorCore
-//{
-//	public TinkersSabatons()
-//	{
-//		super(2, 3);
-//		setUnlocalizedName("tinkersabatons");
-//		maxReduction = 100;
-//		reductionPercent = 3 * 0.04f;
-//	}
-//
-//	@Override
-//	public Item getHeadItem()
-//	{
-//		return TinkersDefense.partArmorplate;
-//	}
-//
-//	@Override
-//	public Item getHandleItem()
-//	{
-//		return TinkerTools.toughRod;
-//	}
-//
-//	@Override
-//	public Item getAccessoryItem()
-//	{
-//		return TinkersDefense.partArmorplate;
-//	}
-//
-//	@Override
-//	public Item getExtraItem()
-//	{
-//		return TinkersDefense.partCloth;
-//	}
-//
-//	@Override
-//	public int durabilityTypeAccessory()
-//	{
-//		return 2;
-//	}
-//
-//	@Override
-//	public float getRepairCost()
-//	{
-//		return 4.0f;
-//	}
-//
-//	@Override
-//	public float getDurabilityModifier()
-//	{
-//		return 2.5f;
-//	}
-//
-//	@Override
-//	public float getDamageModifier()
-//	{
-//		return 1.4f;
-//	}
-//
-//	@Override
-//	public int getPartAmount()
-//	{
-//		return 4;
-//	}
-//
-//	@Override
-//	public String getIconSuffix(int partType)
-//	{
-//		switch(partType)
-//		{
-//			case 0:
-//				return "_sabatons_plates";
-//			case 1:
-//				return "_sabatons_plate_broken";
-//			case 2:
-//				return "_sabatons_trim";
-//			case 3:
-//				return "_sabatons_caps";
-//			case 4:
-//				return "_sabatons_soles";
-//			default:
-//				return "";
-//		}
-//	}
-//
-//	@Override
-//	public String getEffectSuffix()
-//	{
-//		return "_sabatons_effect";
-//	}
-//
-//	@Override
-//	public String getDefaultFolder()
-//	{
-//		return "armor/sabatons";
-//	}
-//
-//	//	@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/TinkersSabatons.png";
-//	}
-//
-//	@Override
-//	public String[] getTraits()
-//	{
-//		return new String[] {"armor", "feet", "sabatons", "heavyarmor"};
-//	}
-//
-//	@Override
-//	public ArmorRenderer getRenderer()
-//	{
-//		return ClientProxy.sabatons;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java
deleted file mode 100644
index 9bc9a4f..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java
+++ /dev/null
@@ -1,130 +0,0 @@
-//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;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java
deleted file mode 100644
index 41b189c..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java
+++ /dev/null
@@ -1,140 +0,0 @@
-//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.EntityLivingBase;
-//import net.minecraft.entity.player.EntityPlayer;
-//import net.minecraft.item.Item;
-//import net.minecraft.item.ItemStack;
-//import net.minecraft.util.DamageSource;
-//
-//public class TinkersChausses extends ArmorCore
-//{
-//	public TinkersChausses()
-//	{
-//		super(1, 2);
-//		setUnlocalizedName("tinkerschausses");
-//		maxReduction = 100;
-//		reductionPercent = 0.2f;
-//	}
-//
-//	@Override
-//	public Item getHeadItem()
-//	{
-//		return TinkersDefense.partChainmaille;
-//	}
-//
-//	@Override
-//	public Item getHandleItem()
-//	{
-//		return TinkersDefense.partArmorplate;
-//	}
-//
-//	@Override
-//	public Item getAccessoryItem()
-//	{
-//		return TinkersDefense.partCloth;
-//	}
-//
-//	@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 "_chausses_chain";
-//			case 1:
-//				return "_chausses_chain_broken";
-//			case 2:
-//				return "_chausses_plate";
-//			case 3:
-//				return "_chausses_cloth";
-//			default:
-//				return "";
-//		}
-//	}
-//
-//	@Override
-//	public String getEffectSuffix()
-//	{
-//		return "_chausses_effect";
-//	}
-//
-//	@Override
-//	public String getDefaultFolder()
-//	{
-//		return "armor/chausses";
-//	}
-//
-//	//	@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/TinkersChausses.png";
-//	}
-//
-//	@Override
-//	public String[] getTraits()
-//	{
-//		return new String[] {"armor", "pants", "chausses", "lightarmor"};
-//	}
-//
-//	@Override
-//	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
-//	{
-//		return 5;
-//	}
-//
-//	@Override
-//	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot)
-//	{
-//		final ArmorProperties armorp = new ArmorProperties(0, 0.2, 100); //0.04 per half shirt
-//		//((EntityPlayer)player).addChatComponentMessage(new ChatComponentText(Double.toString(damage)));
-//		return armorp;
-//	}
-//
-//	@Override
-//	public ArmorRenderer getRenderer()
-//	{
-//		return ClientProxy.chausses;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
deleted file mode 100644
index 26c6581..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
+++ /dev/null
@@ -1,177 +0,0 @@
-//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.EntityLivingBase;
-//import net.minecraft.entity.player.EntityPlayer;
-//import net.minecraft.item.Item;
-//import net.minecraft.item.ItemStack;
-//import net.minecraft.util.DamageSource;
-//import net.minecraft.world.World;
-//import tconstruct.tools.TinkerTools;
-//import thaumcraft.api.IGoggles;
-//import thaumcraft.api.nodes.IRevealer;
-//import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
-//import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge;
-//import cpw.mods.fml.common.Optional;
-//
-//@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles", striprefs = true)})
-//public class TinkersCoif extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles
-//{
-//	public TinkersCoif()
-//	{
-//		super(1, 0);
-//		setUnlocalizedName("tinkerscoif");
-//		maxReduction = 100;
-//		reductionPercent = 0.08f;
-//	}
-//
-//	@Override
-//	public Item getHeadItem()
-//	{
-//		return TinkersDefense.partChainmaille;
-//	}
-//
-//	@Override
-//	public Item getHandleItem()
-//	{
-//		return TinkerTools.toughRod;
-//	}
-//
-//	@Override
-//	public Item getAccessoryItem()
-//	{
-//		return TinkersDefense.partCloth;
-//	}
-//
-//	@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 "_coif_chain";
-//			case 1:
-//				return "_coif_chain_broken";
-//			case 2:
-//				return "_coif_circlet";
-//			case 3:
-//				return "_coif_cloth";
-//			default:
-//				return "";
-//		}
-//	}
-//
-//	@Override
-//	public String getEffectSuffix()
-//	{
-//		return "_coif_effect";
-//	}
-//
-//	@Override
-//	public String getDefaultFolder()
-//	{
-//		return "armor/coif";
-//	}
-//
-//	//	@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/TinkersCoif.png";
-//	}
-//
-//	@Override
-//	public String[] getTraits()
-//	{
-//		return new String[] {"armor", "head", "coif", "lightarmor"};
-//	}
-//
-//	@Override
-//	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
-//	{
-//		return 2;
-//	}
-//
-//	@Override
-//	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot)
-//	{
-//		final ArmorProperties armorp = new ArmorProperties(0, 0.08, 100); //0.04 per half shirt
-//		//((EntityPlayer)player).addChatComponentMessage(new ChatComponentText(Double.toString(damage)));
-//		return armorp;
-//	}
-//
-//	@Override
-//	public ArmorRenderer getRenderer()
-//	{
-//		// TODO Auto-generated method stub
-//		return ClientProxy.coif;
-//	}
-//
-//	@Optional.Method(modid = "Thaumcraft")
-//	@Override
-//	public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
-//	{
-//		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
-//	}
-//
-//	@Optional.Method(modid = "Thaumcraft")
-//	@Override
-//	public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
-//	{
-//		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
-//	}
-//
-//	@Optional.Method(modid = "AWWayofTime")
-//	@Override
-//	public boolean canSeeLPBar(ItemStack stack)
-//	{
-//		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
-//	}
-//
-//	@Optional.Method(modid = "AWWayofTime")
-//	@Override
-//	public boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player)
-//	{
-//		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java
deleted file mode 100644
index b6ca11c..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//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;
-//import tconstruct.tools.TinkerTools;
-//
-//public class TinkersHauberk extends ArmorCore
-//{
-//	public TinkersHauberk()
-//	{
-//		super(1, 1);
-//		setUnlocalizedName("tinkershauberk");
-//		maxReduction = 100;
-//		reductionPercent = 0.24f;
-//	}
-//
-//	@Override
-//	public Item getHeadItem()
-//	{
-//		return TinkersDefense.partChainmaille;
-//	}
-//
-//	@Override
-//	public Item getHandleItem()
-//	{
-//		return TinkerTools.largePlate;
-//	}
-//
-//	@Override
-//	public Item getAccessoryItem()
-//	{
-//		return TinkersDefense.partCloth;
-//	}
-//
-//	@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 "_hauberk_chain";
-//			case 1:
-//				return "_hauberk_chain_broken";
-//			case 2:
-//				return "_hauberk_plate";
-//			case 3:
-//				return "_hauberk_cloth";
-//			default:
-//				return "";
-//		}
-//	}
-//
-//	@Override
-//	public String getEffectSuffix()
-//	{
-//		return "_hauberk_effect";
-//	}
-//
-//	@Override
-//	public String getDefaultFolder()
-//	{
-//		return "armor/hauberk";
-//	}
-//
-//	//	@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/TinkersHauberk.png";
-//	}
-//
-//	@Override
-//	public String[] getTraits()
-//	{
-//		return new String[] {"armor", "chest", "hauberk", "lightarmor"};
-//	}
-//
-//	@Override
-//	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
-//	{
-//		return 6;
-//	}
-//
-//	@Override
-//	public ArmorRenderer getRenderer()
-//	{
-//		return ClientProxy.hauberk;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/items/straps/ItemStraps.java b/src/main/java/lance5057/tDefense/armor/items/straps/ItemStraps.java
deleted file mode 100644
index a236fc0..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/straps/ItemStraps.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package lance5057.tDefense.armor.items.straps;
-
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.core.CoreBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.EntityEquipmentSlot;
-import net.minecraft.item.ItemArmor;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumHand;
-import net.minecraft.world.World;
-
-public class ItemStraps extends ItemArmor
-{
-	public ItemStraps()
-	{
-		super(ArmorMaterial.LEATHER, 0, EntityEquipmentSlot.HEAD);
-		// ItemStacks that store an NBT Tag Compound are limited to stack size of 1
-		setMaxStackSize(1);
-		// you'll want to set a creative tab as well, so you can get your item
-		setCreativeTab(CoreBase.tab);
-	}
-
-	// Without this method, your inventory will NOT work!!!
-	@Override
-	public int getMaxItemUseDuration(ItemStack stack) {
-		return 1; // return any value greater than zero
-	}
-   
-    	@Override
-	public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn)
-	{
-		if (!worldIn.isRemote)
-		{
-			// If player not sneaking, open the inventory gui
-			if (!playerIn.isSneaking()) {
-				playerIn.openGui(TinkersDefense.instance, TinkersDefense.GUI_STRAPS_INV, worldIn, 0, 0, 0);
-			}
-		}
-		
-		return new ActionResult(EnumActionResult.PASS, playerIn.getHeldItem(handIn));
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/armor/items/straps/ItemStrapsInv.java b/src/main/java/lance5057/tDefense/armor/items/straps/ItemStrapsInv.java
deleted file mode 100644
index 95b8036..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/straps/ItemStrapsInv.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package lance5057.tDefense.armor.items.straps;
-
-import lance5057.tDefense.armor.ArmorCore;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.EntityEquipmentSlot;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemArmor.ArmorMaterial;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
-import net.minecraftforge.common.ISpecialArmor.ArmorProperties;
-
-public class ItemStrapsInv implements IInventory {
-
-	private final ItemStack invItem;
-	public static final int INVSIZE = 1;
-	private final String name = "ArmorHolder";
-
-	private ItemStack[] inventory = new ItemStack[INVSIZE];
-
-	public ItemStrapsInv(ItemStack stack) {
-		invItem = stack;
-
-		if (!stack.hasTagCompound()) {
-			stack.setTagCompound(new NBTTagCompound());
-		}
-
-		readFromNBT(stack.getTagCompound());
-	}
-
-	/**
-	 * A custom method to read our inventory from an ItemStack's NBT compound
-	 */
-	public void readFromNBT(NBTTagCompound compound) {
-		// Gets the custom taglist we wrote to this compound, if any
-		// 1.7.2+ change to compound.getTagList("ItemInventory",
-		// Constants.NBT.TAG_COMPOUND);
-		NBTTagList items = compound.getTagList("ItemInventory", 9);
-
-		for (int i = 0; i < items.tagCount(); ++i) {
-			// 1.7.2+ change to items.getCompoundTagAt(i)
-			NBTTagCompound item = (NBTTagCompound) items.getCompoundTagAt(i);
-			int slot = item.getInteger("Slot");
-
-			// Just double-checking that the saved slot index is within our
-			// inventory array bounds
-			if (slot >= 0 && slot < getSizeInventory()) {
-				inventory[slot] = new ItemStack(item);
-			}
-		}
-	}
-
-	/**
-	 * A custom method to write our inventory to an ItemStack's NBT compound
-	 */
-	public void writeToNBT(NBTTagCompound tagcompound) {
-		// Create a new NBT Tag List to store itemstacks as NBT Tags
-		NBTTagList items = new NBTTagList();
-
-		for (int i = 0; i < getSizeInventory(); ++i) {
-			// Only write stacks that contain items
-			if (getStackInSlot(i) != null) {
-				// Make a new NBT Tag Compound to write the itemstack and slot
-				// index to
-				NBTTagCompound item = new NBTTagCompound();
-				item.setInteger("Slot", i);
-				// Writes the itemstack in slot(i) to the Tag Compound we just
-				// made
-				getStackInSlot(i).writeToNBT(item);
-
-				// add the tag compound to our tag list
-				items.appendTag(item);
-			}
-		}
-		// Add the TagList to the ItemStack's Tag Compound with the name
-		// "ItemInventory"
-		tagcompound.setTag("ItemInventory", items);
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public boolean hasCustomName() {
-		return true;
-	}
-
-	@Override
-	public ITextComponent getDisplayName() {
-		return new TextComponentString(name);
-	}
-
-	@Override
-	public int getSizeInventory() {
-		// TODO Auto-generated method stub
-		return INVSIZE;
-	}
-
-	@Override
-	public ItemStack getStackInSlot(int index) {
-		return inventory[index];
-	}
-
-	@Override
-	public ItemStack decrStackSize(int index, int count) {
-		ItemStack stack = getStackInSlot(index);
-		if (stack != null) {
-			if (stack.getCount() > count) {
-				stack = stack.splitStack(count);
-				// Don't forget this line or your inventory will not be saved!
-				markDirty();
-			} else {
-				// this method also calls onInventoryChanged, so we don't need
-				// to call it again
-				setInventorySlotContents(index, null);
-			}
-		}
-		return stack;
-	}
-
-	@Override
-	public ItemStack removeStackFromSlot(int index) {
-		ItemStack stack = getStackInSlot(index);
-		setInventorySlotContents(index, null);
-		return stack;
-	}
-
-	@Override
-	public void setInventorySlotContents(int index, ItemStack stack) {
-		inventory[index] = stack;
-
-		if (stack != null && stack.getCount() > getInventoryStackLimit()) {
-			stack.setCount(getInventoryStackLimit());
-		}
-
-		// Don't forget this line or your inventory will not be saved!
-		markDirty();
-	}
-
-	@Override
-	public int getInventoryStackLimit() {
-		return 64;
-	}
-
-	@Override
-	public void markDirty() {
-		for (int i = 0; i < getSizeInventory(); ++i) {
-			if (getStackInSlot(i) != null && getStackInSlot(i).getCount() == 0) {
-				inventory[i] = null;
-			}
-		}
-
-		// This line here does the work:
-		writeToNBT(invItem.getTagCompound());
-	}
-
-	@Override
-	public boolean isUsableByPlayer(EntityPlayer player) {
-		return true;
-	}
-
-	@Override
-	public void openInventory(EntityPlayer player) {
-
-	}
-
-	@Override
-	public void closeInventory(EntityPlayer player) {
-
-	}
-
-	@Override
-	public boolean isItemValidForSlot(int index, ItemStack stack) {
-		return (stack.getItem() instanceof ArmorCore);
-	}
-
-	@Override
-	public int getField(int id) {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public void setField(int id, int value) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public int getFieldCount() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public void clear() {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public boolean isEmpty() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/armor/items/straps/StrapsContainer.java b/src/main/java/lance5057/tDefense/armor/items/straps/StrapsContainer.java
deleted file mode 100644
index e4c59c4..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/straps/StrapsContainer.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package lance5057.tDefense.armor.items.straps;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.ClickType;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumHand;
-
-public class StrapsContainer extends Container
-{
-	/** The Item Inventory for this Container, only needed if you want to reference isUseableByPlayer */
-	public final ItemStrapsInv inventory;
-
-	/** Using these will make transferStackInSlot easier to understand and implement
-	 * INV_START is the index of the first slot in the Player's Inventory, so our
-	 * InventoryItem's number of slots (e.g. 5 slots is array indices 0-4, so start at 5)
-	 * Notice how we don't have to remember how many slots we made? We can just use
-	 * InventoryItem.INV_SIZE and if we ever change it, the Container updates automatically. */
-	private static final int INV_START = ItemStrapsInv.INVSIZE, INV_END = INV_START+26,
-			HOTBAR_START = INV_END+1, HOTBAR_END = HOTBAR_START+8;
-
-	// If you're planning to add armor slots, put those first like this:
-	// ARMOR_START = InventoryItem.INV_SIZE, ARMOR_END = ARMOR_START+3,
-	// INV_START = ARMOR_END+1, and then carry on like above.
-
-	public StrapsContainer(EntityPlayer par1Player, InventoryPlayer inventoryPlayer, ItemStrapsInv inventoryItem)
-	{
-		this.inventory = inventoryItem;
-
-		int i;
-
-		// ITEM INVENTORY - you'll need to adjust the slot locations to match your texture file
-		// I have them set vertically in columns of 4 to the right of the player model
-		this.addSlotToContainer(new Slot(this.inventory, 0, 80, 8+23));
-
-		// If you want, you can add ARMOR SLOTS here as well, but you need to
-		// make a public version of SlotArmor. I won't be doing that in this tutorial.
-		/*
-		for (i = 0; i < 4; ++i)
-		{
-			// These are the standard positions for survival inventory layout
-			this.addSlotToContainer(new SlotArmor(this.player, inventoryPlayer, inventoryPlayer.getSizeInventory() - 1 - i, 8, 8 + i * 18, i));
-		}
-		*/
-
-		// PLAYER INVENTORY - uses default locations for standard inventory texture file
-		for (i = 0; i < 3; ++i)
-		{
-			for (int j = 0; j < 9; ++j)
-			{
-				this.addSlotToContainer(new Slot(inventoryPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
-			}
-		}
-
-		// PLAYER ACTION BAR - uses default locations for standard action bar texture file
-		for (i = 0; i < 9; ++i)
-		{
-			this.addSlotToContainer(new Slot(inventoryPlayer, i, 8 + i * 18, 142));
-		}
-	}
-
-	@Override
-	public boolean canInteractWith(EntityPlayer entityplayer)
-	{
-		// be sure to return the inventory's isUseableByPlayer method
-		// if you defined special behavior there:
-		return inventory.isUsableByPlayer(entityplayer);
-	}
-
-	/**
-	 * Called when a player shift-clicks on a slot. You must override this or you will crash when someone does that.
-	 */
-	public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int index)
-	{
-		ItemStack itemstack = null;
-		Slot slot = (Slot) this.inventorySlots.get(index);
-
-		if (slot != null && slot.getHasStack())
-		{
-			ItemStack itemstack1 = slot.getStack();
-			itemstack = itemstack1.copy();
-
-			// If item is in our custom Inventory or armor slot
-			if (index < INV_START)
-			{
-				// try to place in player inventory / action bar
-				if (!this.mergeItemStack(itemstack1, INV_START, HOTBAR_END+1, true))
-				{
-					return null;
-				}
-
-				slot.onSlotChange(itemstack1, itemstack);
-			}
-			// Item is in inventory / hotbar, try to place in custom inventory or armor slots
-			else
-			{
-				/*
-				If your inventory only stores certain instances of Items,
-				you can implement shift-clicking to your inventory like this:
-				
-				// Check that the item is the right type
-				if (itemstack1.getItem() instanceof ItemCustom)
-				{
-					// Try to merge into your custom inventory slots
-					// We use 'InventoryItem.INV_SIZE' instead of INV_START just in case
-					// you also add armor or other custom slots
-					if (!this.mergeItemStack(itemstack1, 0, InventoryItem.INV_SIZE, false))
-					{
-						return null;
-					}
-				}
-				// If you added armor slots, check them here as well:
-				// Item being shift-clicked is armor - try to put in armor slot
-				if (itemstack1.getItem() instanceof ItemArmor)
-				{
-					int type = ((ItemArmor) itemstack1.getItem()).armorType;
-					if (!this.mergeItemStack(itemstack1, ARMOR_START + type, ARMOR_START + type + 1, false))
-					{
-						return null;
-					}
-				}
-				Otherwise, you have basically 2 choices:
-				1. shift-clicking between player inventory and custom inventory
-				2. shift-clicking between action bar and inventory
-				 
-				Be sure to choose only ONE of the following implementations!!!
-				*/
-				/**
-				 * Implementation number 1: Shift-click into your custom inventory
-				 */
-				if (index >= INV_START)
-				{
-					// place in custom inventory
-					if (!this.mergeItemStack(itemstack1, 0, INV_START, false))
-					{
-						return null;
-					}
-				}
-				
-				/**
-				 * Implementation number 2: Shift-click items between action bar and inventory
-				 */
-				// item is in player's inventory, but not in action bar
-				if (index >= INV_START && index < HOTBAR_START)
-				{
-					// place in action bar
-					if (!this.mergeItemStack(itemstack1, HOTBAR_START, HOTBAR_END+1, false))
-					{
-						return null;
-					}
-				}
-				// item in action bar - place in player inventory
-				else if (index >= HOTBAR_START && index < HOTBAR_END+1)
-				{
-					if (!this.mergeItemStack(itemstack1, INV_START, INV_END+1, false))
-					{
-						return null;
-					}
-				}
-			}
-
-			if (itemstack1.getItemDamage() == 0)
-			{
-				slot.putStack((ItemStack) null);
-			}
-			else
-			{
-				slot.onSlotChanged();
-			}
-
-			if (itemstack1.getItemDamage() == itemstack.getItemDamage())
-			{
-				return null;
-			}
-
-			slot.onTake(par1EntityPlayer, itemstack1);
-		}
-
-		return itemstack;
-	}
-
-	/**
-	 * You should override this method to prevent the player from moving the stack that
-	 * opened the inventory, otherwise if the player moves it, the inventory will not
-	 * be able to save properly
-	 */
-	@Override
-	public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, EntityPlayer player) {
-		// this will prevent the player from interacting with the item that opened the inventory:
-		if (slotId >= 0 && getSlot(slotId) != null && (getSlot(slotId).getStack() == player.getHeldItem(EnumHand.MAIN_HAND) || getSlot(slotId).getStack() == player.getHeldItem(EnumHand.OFF_HAND))) {
-			return null;
-		}
-		return super.slotClick(slotId, dragType, clickTypeIn, player);
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/armor/items/straps/StrapsGui.java b/src/main/java/lance5057/tDefense/armor/items/straps/StrapsGui.java
deleted file mode 100644
index 5cd229e..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/straps/StrapsGui.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package lance5057.tDefense.armor.items.straps;
-
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
-import lance5057.tDefense.Reference;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.translation.I18n;
-
-public class StrapsGui extends GuiContainer
-{
-	/** x and y size of the inventory window in pixels. Defined as float, passed as int
-	 * These are used for drawing the player model. */
-	private float xSize_lo;
-	private float ySize_lo;
-
-	/** ResourceLocation takes 2 parameters: ModId, path to texture at the location:
-	 * "src/minecraft/assets/modid/"
-	 * 
-	 * I have provided a sample texture file that works with this tutorial. Download it
-	 * from Forge_Tutorials/textures/gui/
-	 */
-	private static final ResourceLocation iconLocation = new ResourceLocation(Reference.MOD_ID, "textures/gui/straps_helm.png");
-
-	/** The inventory to render on screen */
-	private final ItemStrapsInv inventory;
-
-	public StrapsGui(StrapsContainer containerItem)
-	{
-		super(containerItem);
-		this.inventory = containerItem.inventory;
-	}
-
-	/**
-	 * Draws the screen and all the components in it.
-	 */
-	public void drawScreen(int par1, int par2, float par3)
-	{
-		super.drawScreen(par1, par2, par3);
-		this.xSize_lo = (float)par1;
-		this.ySize_lo = (float)par2;
-	}
-
-	/**
-	 * Draw the foreground layer for the GuiContainer (everything in front of the items)
-	 */
-	protected void drawGuiContainerForegroundLayer(int par1, int par2)
-	{
-//		String s = this.inventory.isInvNameLocalized() ? this.inventory.getName() : I18n.getString(this.inventory.getName());
-//		this.fontRendererObj.drawString(s, this.xSize / 2 - this.fontRendererObj.getStringWidth(s) / 2, 0, 4210752);
-//		this.fontRendererObj.drawString(I18n.getString("container.inventory"), 26, this.ySize - 96 + 4, 4210752);
-	}
-
-	/**
-	 * Draw the background layer for the GuiContainer (everything behind the items)
-	 */
-	protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
-	{
-		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-		this.mc.getTextureManager().bindTexture(iconLocation);
-		int k = (this.width - this.xSize) / 2;
-		int l = (this.height - this.ySize) / 2;
-		this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
-		int i1;
-		//drawPlayerModel(k + 51, l + 75, 30, (float)(k + 51) - this.xSize_lo, (float)(l + 75 - 50) - this.ySize_lo, this.mc.player);
-	}
-
-//	/**
-//	 * This renders the player model in standard inventory position (in later versions of Minecraft / Forge, you can
-//	 * simply call GuiInventory.drawEntityOnScreen directly instead of copying this code)
-//	 */
-//	public static void drawPlayerModel(int x, int y, int scale, float yaw, float pitch, EntityLivingBase entity) {
-//		GL11.glEnable(GL11.GL_COLOR_MATERIAL);
-//		GL11.glPushMatrix();
-//		GL11.glTranslatef(x, y, 50.0F);
-//		GL11.glScalef(-scale, scale, scale);
-//		GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F);
-//		float f2 = entity.renderYawOffset;
-//		float f3 = entity.rotationYaw;
-//		float f4 = entity.rotationPitch;
-//		float f5 = entity.prevRotationYawHead;
-//		float f6 = entity.rotationYawHead;
-//		GL11.glRotatef(135.0F, 0.0F, 1.0F, 0.0F);
-//		RenderHelper.enableStandardItemLighting();
-//		GL11.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F);
-//		GL11.glRotatef(-((float) Math.atan(pitch / 40.0F)) * 20.0F, 1.0F, 0.0F, 0.0F);
-//		entity.renderYawOffset = (float) Math.atan(yaw / 40.0F) * 20.0F;
-//		entity.rotationYaw = (float) Math.atan(yaw / 40.0F) * 40.0F;
-//		entity.rotationPitch = -((float) Math.atan(pitch / 40.0F)) * 20.0F;
-//		entity.rotationYawHead = entity.rotationYaw;
-//		entity.prevRotationYawHead = entity.rotationYaw;
-//		GL11.glTranslated(0.0F, entity.getYOffset(), 0.0F);
-//		RenderManager.instance.playerViewY = 180.0F;
-//		RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F);
-//		entity.renderYawOffset = f2;
-//		entity.rotationYaw = f3;
-//		entity.rotationPitch = f4;
-//		entity.prevRotationYawHead = f5;
-//		entity.rotationYawHead = f6;
-//		GL11.glPopMatrix();
-//		RenderHelper.disableStandardItemLighting();
-//		GL11.glDisable(GL12.GL_RESCALE_NORMAL);
-//		OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
-//		GL11.glDisable(GL11.GL_TEXTURE_2D);
-//		OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
-//	}
-}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ArmorRenderer.java b/src/main/java/lance5057/tDefense/armor/renderers/ArmorRenderer.java
deleted file mode 100644
index f16df63..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/ArmorRenderer.java
+++ /dev/null
@@ -1,98 +0,0 @@
-//package lance5057.tDefense.armor.renderers;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-//import lance5057.tDefense.TinkersDefense;
-//import lance5057.tDefense.armor.ArmorCore;
-//import net.minecraft.client.model.ModelBiped;
-//import net.minecraft.client.model.ModelRenderer;
-//import net.minecraft.entity.Entity;
-//import net.minecraft.item.ItemStack;
-//import net.minecraft.nbt.NBTTagCompound;
-//
-//import org.lwjgl.opengl.GL11;
-//
-//public class ArmorRenderer extends ModelBiped 
-//{
-//	public String[]				colors;
-//
-//	public ItemStack			stack;
-//	public String				defaultFolder;
-//
-//	private final int[]			order		= new int[] {1, 2, 3, 0, 4, 5, 6, 7, 8, 9};
-//
-//	public List<ModelRenderer>	boxes		= new ArrayList<ModelRenderer>();
-//
-//	public NBTTagCompound		defaultTags	= new NBTTagCompound();
-//
-//	public ArmorRenderer(float a, float b, int c, int d)
-//	{
-//		super(a, b, c, d);
-//	}
-//
-//	public void init()
-//	{
-//		defaultTags.getCompoundTag("ArmorRenderer");
-//
-//		for(int i = 0; i < boxList.size(); i++)
-//		{
-//			final String rendertag = ((ModelRenderer) boxList.get(i)).boxName;
-//			if(rendertag != null)
-//			{
-//				defaultTags.setBoolean(rendertag, ((ModelRenderer) boxList.get(i)).isHidden);
-//			}
-//		}
-//	}
-//
-//	public void SetColors(String[] colors, String defaultFolder, ItemStack stack)
-//	{
-//		this.colors = colors;
-//		this.stack = stack;
-//		this.defaultFolder = defaultFolder;
-//	}
-//
-//	@Override
-//	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
-//	{
-//		GL11.glPushMatrix();
-//
-//		if(TinkersDefense.config.transparency)
-//		{
-//			GL11.glEnable(GL11.GL_BLEND);
-//		}
-//
-//		final NBTTagCompound tags = stack.getTagCompound().getCompoundTag("ArmorRenderer");
-//
-//		for(int j = 0; j < boxList.size(); j++)
-//		{
-//			final ModelRenderer box = (ModelRenderer) boxList.get(j);
-//			if(tags.hasKey(box.boxName))
-//			{
-//				box.isHidden = tags.getBoolean(box.boxName);
-//			}
-//		}
-//
-//		for(int i = 0; i < 10; i++)
-//		{
-//			//final String texture = ((ArmorCore) stack.getItem()).getTexture(order[i], stack);
-////			if(texture != "")
-////			{
-////				GL11.glPushMatrix();
-////
-////				//((ArmorCore) stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, order[i]);
-////				super.render(entity, f, f1, f2, f3, f4, f5);
-////
-////				GL11.glPopMatrix();
-////			}
-//		}
-//
-//		if(TinkersDefense.config.transparency)
-//		{
-//			GL11.glDisable(GL11.GL_BLEND);
-//		}
-//
-//		GL11.glPopMatrix();
-//		GL11.glColor3d(1.0, 1.0, 1.0);
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java
deleted file mode 100644
index 5eac286..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java
+++ /dev/null
@@ -1,241 +0,0 @@
-//package lance5057.tDefense.armor.renderers;
-//
-//import net.minecraft.client.model.ModelRenderer;
-//
-///**
-// * ModelTinkersGauntlet - Either Mojang or a mod author
-// * Created using Tabula 4.1.1
-// */
-//public class ModelTinkersGauntlets extends ArmorRenderer
-//{
-//	public ModelRenderer	GloveR;
-//	public ModelRenderer	VambraceR;
-//	public ModelRenderer	RebraceR;
-//	public ModelRenderer	BoltR;
-//	public ModelRenderer	KnuckleR;
-//	public ModelRenderer	SettingR;
-//	public ModelRenderer	GemR;
-//	public ModelRenderer	ArmSpikesR;
-//	public ModelRenderer	ArmSpikesBackR;
-//	public ModelRenderer	KnuckleSpikesL;
-//	public ModelRenderer	KnuckleSpikesR;
-//	public ModelRenderer	KnuckleSpikesMidR;
-//	public ModelRenderer	GloveL;
-//	public ModelRenderer	VambraceL;
-//	public ModelRenderer	RebraceL;
-//	public ModelRenderer	BoltL;
-//	public ModelRenderer	ArmSpikesL;
-//	public ModelRenderer	KnuckleSpikesBackR;
-//	public ModelRenderer	KnuckleSpikesBackL;
-//	public ModelRenderer	KnuckleSpikesMidL;
-//	public ModelRenderer	KnuckleL;
-//	public ModelRenderer	GemL;
-//	public ModelRenderer	SettingL;
-//	public ModelRenderer	ArmSpikesBackL;
-//
-//	public ModelTinkersGauntlets()
-//	{
-//		super(1.0f, 0, 64, 64);
-//
-//		textureWidth = 64;
-//		textureHeight = 64;
-//
-//		KnuckleSpikesL = new ModelRenderer(this, "Knuckle Spikes Left");
-//		KnuckleSpikesL.setTextureOffset(56, 40);
-//		KnuckleSpikesL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		KnuckleSpikesL.addBox(3.0F, 6.0F, -0.5F, 4, 8, 0, 0.0F);
-//		setRotateAngle(KnuckleSpikesL, 0.0F, 0.3490658503988659F, 0.0F);
-//		bipedLeftArm.addChild(KnuckleSpikesL);
-//
-//		KnuckleSpikesBackL = new ModelRenderer(this, "Knuckle Spikes Back Left");
-//		KnuckleSpikesBackL.setTextureOffset(56, 40);
-//		KnuckleSpikesBackL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		KnuckleSpikesBackL.addBox(3.0F, 6.0F, 0.5F, 4, 8, 0, 0.0F);
-//		setRotateAngle(KnuckleSpikesBackL, 0.0F, -0.3490658503988659F, 0.0F);
-//		bipedLeftArm.addChild(KnuckleSpikesBackL);
-//
-//		KnuckleL = new ModelRenderer(this, "Knuckle Left");
-//		KnuckleL.setTextureOffset(0, 41);
-//		KnuckleL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		KnuckleL.addBox(0.1F, 6.8F, -2.0F, 3, 3, 4, 0.4F);
-//		bipedLeftArm.addChild(KnuckleL);
-//
-//		ArmSpikesR = new ModelRenderer(this, "Arm Spikes Right");
-//		ArmSpikesR.setTextureOffset(56, 32);
-//		ArmSpikesR.mirror = true;
-//		ArmSpikesR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ArmSpikesR.addBox(-7.5F, 1.0F, 0.5F, 4, 8, 0, 0.0F);
-//		setRotateAngle(ArmSpikesR, 0.0F, -0.3490658503988659F, 0.0F);
-//		bipedRightArm.addChild(ArmSpikesR);
-//
-//		RebraceL = new ModelRenderer(this, "Rebrace Left");
-//		RebraceL.setTextureOffset(14, 40);
-//		RebraceL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		RebraceL.addBox(-1.1F, 3.0F, -2.0F, 3, 5, 4, 0.2F);
-//		bipedLeftArm.addChild(RebraceL);
-//
-//		BoltL = new ModelRenderer(this, "Bolt Left");
-//		BoltL.setTextureOffset(16, 32);
-//		BoltL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BoltL.addBox(-5.8F, 3.7F, -3.0F, 2, 2, 6, -0.3F);
-//		setRotateAngle(BoltL, 0.0F, 0.0F, -0.7853981633974483F);
-//		bipedLeftArm.addChild(BoltL);
-//
-//		KnuckleSpikesBackR = new ModelRenderer(this,
-//				"Knuckle Spikes Back Right");
-//		KnuckleSpikesBackR.setTextureOffset(56, 40);
-//		KnuckleSpikesBackR.mirror = true;
-//		KnuckleSpikesBackR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		KnuckleSpikesBackR.addBox(-7.0F, 6.0F, 0.5F, 4, 8, 0, 0.0F);
-//		setRotateAngle(KnuckleSpikesBackR, 0.0F, 0.3490658503988659F, 0.0F);
-//		bipedRightArm.addChild(KnuckleSpikesBackR);
-//
-//		GloveR = new ModelRenderer(this, "Glove Right");
-//		GloveR.setTextureOffset(0, 32);
-//		GloveR.mirror = true;
-//		GloveR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		GloveR.addBox(-3.0F, 5.0F, -2.0F, 4, 5, 4, 0.1F);
-//		bipedRightArm.addChild(GloveR);
-//
-//		BoltR = new ModelRenderer(this, "Bolt Right");
-//		BoltR.setTextureOffset(16, 32);
-//		BoltR.mirror = true;
-//		BoltR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BoltR.addBox(3.8F, 3.7F, -3.0F, 2, 2, 6, -0.3F);
-//		setRotateAngle(BoltR, 0.0F, 0.0F, 0.7853981633974483F);
-//		bipedRightArm.addChild(BoltR);
-//
-//		KnuckleR = new ModelRenderer(this, "Knuckle Right");
-//		KnuckleR.setTextureOffset(0, 41);
-//		KnuckleR.mirror = true;
-//		KnuckleR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		KnuckleR.addBox(-2.9F, 6.8F, -2.0F, 3, 3, 4, 0.4F);
-//		bipedRightArm.addChild(KnuckleR);
-//
-//		KnuckleSpikesR = new ModelRenderer(this, "Knuckle Spikes Right");
-//		KnuckleSpikesR.setTextureOffset(56, 40);
-//		KnuckleSpikesR.mirror = true;
-//		KnuckleSpikesR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		KnuckleSpikesR.addBox(-7.0F, 6.0F, -0.5F, 4, 8, 0, 0.0F);
-//		setRotateAngle(KnuckleSpikesR, 0.0F, -0.3490658503988659F, 0.0F);
-//		bipedRightArm.addChild(KnuckleSpikesR);
-//
-//		KnuckleSpikesMidL = new ModelRenderer(this, "Knuckle Spikes Mid Left");
-//		KnuckleSpikesMidL.setTextureOffset(54, 48);
-//		KnuckleSpikesMidL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		KnuckleSpikesMidL.addBox(3.0F, 1.0F, 0.0F, 5, 13, 0, 0.0F);
-//		bipedLeftArm.addChild(KnuckleSpikesMidL);
-//
-//		ArmSpikesBackL = new ModelRenderer(this, "Arm Spikes Back Left");
-//		ArmSpikesBackL.setTextureOffset(56, 32);
-//		ArmSpikesBackL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ArmSpikesBackL.addBox(3.5F, 1.0F, -0.5F, 4, 8, 0, 0.0F);
-//		setRotateAngle(ArmSpikesBackL, 0.0F, -0.3490658503988659F, 0.0F);
-//		bipedLeftArm.addChild(ArmSpikesBackL);
-//
-//		ArmSpikesBackR = new ModelRenderer(this, "Arm Spikes Back Right");
-//		ArmSpikesBackR.setTextureOffset(56, 32);
-//		ArmSpikesBackR.mirror = true;
-//		ArmSpikesBackR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ArmSpikesBackR.addBox(-7.5F, 1.0F, -0.5F, 4, 8, 0, 0.0F);
-//		setRotateAngle(ArmSpikesBackR, 0.0F, 0.3490658503988659F, 0.0F);
-//		bipedRightArm.addChild(ArmSpikesBackR);
-//
-//		VambraceR = new ModelRenderer(this, "Vambrace Right");
-//		VambraceR.setTextureOffset(0, 56);
-//		VambraceR.mirror = true;
-//		VambraceR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		VambraceR.addBox(-3.6F, 2.8F, -2.0F, 3, 4, 4, 0.3F);
-//		setRotateAngle(VambraceR, 0.0F, 0.0F, -0.08726646259971647F);
-//		bipedRightArm.addChild(VambraceR);
-//
-//		GemR = new ModelRenderer(this, "Gem Right");
-//		GemR.setTextureOffset(0, 48);
-//		GemR.mirror = true;
-//		GemR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		GemR.addBox(-4.2F, 5.0F, -2.0F, 2, 4, 4, -0.3F);
-//		bipedRightArm.addChild(GemR);
-//
-//		RebraceR = new ModelRenderer(this, "Rebrace Right");
-//		RebraceR.setTextureOffset(14, 40);
-//		RebraceR.mirror = true;
-//		RebraceR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		RebraceR.addBox(-1.9F, 3.0F, -2.0F, 3, 5, 4, 0.2F);
-//		bipedRightArm.addChild(RebraceR);
-//
-//		SettingR = new ModelRenderer(this, "Setting Right");
-//		SettingR.setTextureOffset(12, 49);
-//		SettingR.mirror = true;
-//		SettingR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		SettingR.addBox(-3.7F, 5.0F, -2.0F, 1, 4, 4, 0.0F);
-//		bipedRightArm.addChild(SettingR);
-//
-//		GloveL = new ModelRenderer(this, "Glove Left");
-//		GloveL.setTextureOffset(0, 32);
-//		GloveL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		GloveL.addBox(-1.0F, 5.0F, -2.0F, 4, 5, 4, 0.1F);
-//		bipedLeftArm.addChild(GloveL);
-//
-//		GemL = new ModelRenderer(this, "Gem Left");
-//		GemL.setTextureOffset(0, 48);
-//		GemL.mirror = true;
-//		GemL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		GemL.addBox(2.4F, 5.0F, -2.0F, 2, 4, 4, -0.3F);
-//		bipedLeftArm.addChild(GemL);
-//
-//		VambraceL = new ModelRenderer(this, "Vambrace Left");
-//		VambraceL.setTextureOffset(0, 56);
-//		VambraceL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		VambraceL.addBox(0.8F, 2.8F, -2.0F, 3, 4, 4, 0.3F);
-//		setRotateAngle(VambraceL, 0.0F, 0.0F, 0.08726646259971647F);
-//		bipedLeftArm.addChild(VambraceL);
-//
-//		KnuckleSpikesMidR = new ModelRenderer(this, "Knuckle Spikes Mid Right");
-//		KnuckleSpikesMidR.setTextureOffset(54, 48);
-//		KnuckleSpikesMidR.mirror = true;
-//		KnuckleSpikesMidR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		KnuckleSpikesMidR.addBox(-8.0F, 1.0F, 0.0F, 5, 13, 0, 0.0F);
-//		bipedRightArm.addChild(KnuckleSpikesMidR);
-//
-//		SettingL = new ModelRenderer(this, "Setting Left");
-//		SettingL.setTextureOffset(12, 49);
-//		SettingL.mirror = true;
-//		SettingL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		SettingL.addBox(2.9F, 5.0F, -2.0F, 1, 4, 4, 0.0F);
-//		bipedLeftArm.addChild(SettingL);
-//
-//		ArmSpikesL = new ModelRenderer(this, "Arm Spikes Left");
-//		ArmSpikesL.setTextureOffset(56, 32);
-//		ArmSpikesL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ArmSpikesL.addBox(3.5F, 1.0F, 0.5F, 4, 8, 0, 0.0F);
-//		setRotateAngle(ArmSpikesL, 0.0F, 0.3490658503988659F, 0.0F);
-//		bipedLeftArm.addChild(ArmSpikesL);
-//
-//		ArmSpikesBackL.isHidden = true;
-//		ArmSpikesBackR.isHidden = true;
-//		ArmSpikesL.isHidden = true;
-//		ArmSpikesR.isHidden = true;
-//		GemL.isHidden = true;
-//		GemR.isHidden = true;
-//		KnuckleSpikesBackL.isHidden = true;
-//		KnuckleSpikesBackR.isHidden = true;
-//		KnuckleSpikesL.isHidden = true;
-//		KnuckleSpikesMidL.isHidden = true;
-//		KnuckleSpikesMidR.isHidden = true;
-//		KnuckleSpikesR.isHidden = true;
-//		SettingL.isHidden = true;
-//		SettingR.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;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java
deleted file mode 100644
index f061b78..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java
+++ /dev/null
@@ -1,72 +0,0 @@
-//package lance5057.tDefense.armor.renderers;
-//
-//import lance5057.tDefense.armor.ArmorCore;
-//import net.minecraft.client.model.ModelRenderer;
-//import net.minecraft.entity.Entity;
-//
-//import org.lwjgl.opengl.GL11;
-//
-///**
-// * ModelBiped - Either Mojang or a mod author
-// * Created using Tabula 4.1.1
-// */
-//public class ModelTinkersTabard extends ArmorRenderer
-//{
-//	public ModelRenderer	Tabard;
-//	public ModelRenderer	TabardBottomF;
-//	public ModelRenderer	TabardBottomB;
-//
-//	public ModelTinkersTabard()
-//	{
-//		super(0.5f, 0, 64, 64);
-//
-//		textureWidth = 64;
-//		textureHeight = 64;
-//
-//		Tabard = new ModelRenderer(this, 0, 32);
-//		Tabard.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Tabard.addBox(-4.0F, 0.0F, -2.5F, 8, 12, 5, 0.1F);
-//
-//		TabardBottomF = new ModelRenderer(this, 26, 32);
-//		TabardBottomF.setRotationPoint(0.0F, 12.0F, 0.0F);
-//		TabardBottomF.addBox(-4.0F, 0.2F, -2.5F, 8, 8, 1, 0.1F);
-//		TabardBottomB = new ModelRenderer(this, 26, 32);
-//		TabardBottomB.mirror = true;
-//
-//		TabardBottomB.setRotationPoint(0.0F, 12.0F, 0.0F);
-//		TabardBottomB.addBox(-4.0F, 0.2F, 1.5F, 8, 8, 1, 0.1F);
-//	}
-//
-//	@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 < 10; i++)
-//		{
-//			final String texture = ((ArmorCore) stack.getItem()).getTexture(i, stack);
-//			if(texture != "")
-//			{
-//
-//				GL11.glPushMatrix();
-//
-//				((ArmorCore) stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
-//				super.render(entity, f, f1, f2, f3, f4, f5);
-//
-//				GL11.glPopMatrix();
-//			}
-//		}
-//
-//		GL11.glPopMatrix();
-//	}
-//
-//	/**
-//	 * 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/cloth/ModelTinkersHood.java b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
deleted file mode 100644
index ba5db86..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
+++ /dev/null
@@ -1,169 +0,0 @@
-//package lance5057.tDefense.armor.renderers.cloth;
-//
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import net.minecraft.client.model.ModelRenderer;
-//
-///**
-// * TinkersHood - Either Mojang or a mod author
-// * Created using Tabula 4.1.1
-// */
-//public class ModelTinkersHood extends ArmorRenderer
-//{
-//	public ModelRenderer	Flop;
-//	public ModelRenderer	Flop_1;
-//	public ModelRenderer	Flop_2;
-//	public ModelRenderer	ScarfNeck;
-//	public ModelRenderer	Band;
-//	public ModelRenderer	BandTilted;
-//	public ModelRenderer	Rim;
-//	public ModelRenderer	HatTop;
-//	public ModelRenderer	HatTopTall;
-//	public ModelRenderer	Tip;
-//	public ModelRenderer	Tip_1;
-//	public ModelRenderer	Tip_2;
-//	public ModelRenderer	ScarfExtra;
-//	public ModelRenderer	ScarfExtra_1;
-//	public ModelRenderer	BandExtra;
-//	public ModelRenderer	BandExtra_1;
-//
-//	public ModelTinkersHood()
-//	{
-//		super(0.2f, 0, 128, 64);
-//
-//		textureWidth = 128;
-//		textureHeight = 64;
-//
-//		bipedHeadwear = new ModelRenderer(this, "Headwear");
-//		bipedHeadwear.setTextureOffset(32, 0);
-//		bipedHeadwear.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, 0.2f + 0.5F);
-//		bipedHeadwear.setRotationPoint(0.0F, 0.0F + 0, 0.0F);
-//
-//		Flop = new ModelRenderer(this, "Flop");
-//		Flop.setTextureOffset(64, 0);
-//		Flop.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Flop.addBox(-3.0F, -7.6F, 1.0F, 6, 6, 3, 0.5F);
-//		setRotateAngle(Flop, -0.3490658503988659F, 0.0F, 0.0F);
-//		bipedHead.addChild(Flop);
-//
-//		Flop_1 = new ModelRenderer(this, "Flop 1");
-//		Flop_1.setTextureOffset(82, 0);
-//		Flop_1.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Flop_1.addBox(-2.0F, -6.8F, -0.1F, 4, 4, 5, 0.5F);
-//		setRotateAngle(Flop_1, -0.6981317007977318F, 0.0F, 0.0F);
-//		bipedHead.addChild(Flop_1);
-//
-//		Flop_2 = new ModelRenderer(this, "Flop 2");
-//		Flop_2.setTextureOffset(64, 25);
-//		Flop_2.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Flop_2.addBox(-1.0F, -6.6F, 2.0F, 2, 2, 4, 0.5F);
-//		setRotateAngle(Flop_2, -1.0471975511965976F, 0.0F, 0.0F);
-//		bipedHead.addChild(Flop_2);
-//
-//		ScarfExtra = new ModelRenderer(this, "ScarfExtra");
-//		ScarfExtra.setTextureOffset(44, 32);
-//		ScarfExtra.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ScarfExtra.addBox(0.0F, 0.0F, 2.0F, 3, 7, 1, 0.0F);
-//		setRotateAngle(ScarfExtra, 0.0F, 0.0F, -0.17453292519943295F);
-//		bipedBody.addChild(ScarfExtra);
-//
-//		ScarfExtra_1 = new ModelRenderer(this, "ScarfExtra 1");
-//		ScarfExtra_1.setTextureOffset(36, 32);
-//		ScarfExtra_1.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ScarfExtra_1.addBox(-3.0F, 0.0F, 2.0F, 3, 11, 1, 0.0F);
-//		setRotateAngle(ScarfExtra_1, 0.0F, 0.0F, 0.17453292519943295F);
-//		bipedBody.addChild(ScarfExtra_1);
-//
-//		ScarfNeck = new ModelRenderer(this, "ScarfNeck");
-//		ScarfNeck.setTextureOffset(0, 32);
-//		ScarfNeck.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ScarfNeck.addBox(-4.5F, -2.0F, -4.5F, 9, 3, 9, 0.3F);
-//		bipedHead.addChild(ScarfNeck);
-//
-//		HatTop = new ModelRenderer(this, "HatTop");
-//		HatTop.setTextureOffset(52, 33);
-//		HatTop.addBox(-4.0F, -8.0F, -4.0F, 8, 3, 8, 0.1f + 0.5F);
-//		HatTop.setRotationPoint(0.0F, 0.0F + 0, 0.0F);
-//		bipedHead.addChild(HatTop);
-//
-//		HatTopTall = new ModelRenderer(this, "HatTopTall");
-//		HatTopTall.setTextureOffset(96, 4);
-//		HatTopTall.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		HatTopTall.addBox(-4.0F, -14.0F, -4.0F, 8, 5, 8, 0.5F);
-//		bipedHead.addChild(HatTopTall);
-//
-//		Rim = new ModelRenderer(this, "Rim");
-//		Rim.setTextureOffset(65, 20);
-//		Rim.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Rim.addBox(-6.0F, -5.5F, -6.0F, 12, 1, 12, 0.1F);
-//		bipedHead.addChild(Rim);
-//
-//		BandTilted = new ModelRenderer(this, "BandTilted");
-//		BandTilted.setTextureOffset(64, 9);
-//		BandTilted.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BandTilted.addBox(-4.5F, -2.7F, -8.5F, 9, 2, 9, 0.0F);
-//		setRotateAngle(BandTilted, -1.2f, 0.0F, 0.0F);
-//		bipedHead.addChild(BandTilted);
-//
-//		Band = new ModelRenderer(this, "Band");
-//		Band.setTextureOffset(64, 9);
-//		Band.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Band.addBox(-4.5F, -7F, -4.5F, 9, 3, 9, -0.3F);
-//		bipedHead.addChild(Band);
-//
-//		BandExtra = new ModelRenderer(this, "BandExtra");
-//		BandExtra.setTextureOffset(44, 32);
-//		BandExtra.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BandExtra.addBox(0.2F, -6.0F, 3.4F, 3, 5, 1, -0.3F);
-//		setRotateAngle(BandExtra, 0.0F, 0.0F, -0.17453292519943295F);
-//		bipedHead.addChild(BandExtra);
-//
-//		BandExtra_1 = new ModelRenderer(this, "BandExtra 1");
-//		BandExtra_1.setTextureOffset(36, 32);
-//		BandExtra_1.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BandExtra_1.addBox(-3.2F, -6.0F, 3.4F, 3, 7, 1, -0.3F);
-//		setRotateAngle(BandExtra_1, 0.0F, 0.0F, 0.17453292519943295F);
-//		bipedHead.addChild(BandExtra_1);
-//
-//		Tip = new ModelRenderer(this, "Tip");
-//		Tip.setTextureOffset(0, 44);
-//		Tip.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Tip.addBox(-3.0F, -10.8F, -5.0F, 6, 3, 6, 0.5F);
-//		setRotateAngle(Tip, -0.2617993877991494F, 0.0F, 0.0F);
-//		bipedHead.addChild(Tip);
-//
-//		Tip_1 = new ModelRenderer(this, "Tip 1");
-//		Tip_1.setTextureOffset(0, 53);
-//		Tip_1.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Tip_1.addBox(-2.0F, -12.9F, -6.7F, 4, 3, 4, 0.5F);
-//		setRotateAngle(Tip_1, -0.5235987755982988F, 0.0F, 0.0F);
-//		bipedHead.addChild(Tip_1);
-//
-//		Tip_2 = new ModelRenderer(this, "Tip 2");
-//		Tip_2.setTextureOffset(18, 45);
-//		Tip_2.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Tip_2.addBox(-1.0F, -14.6F, -8.8F, 2, 3, 2, 0.5F);
-//		setRotateAngle(Tip_2, -0.7853981633974483F, 0.0F, 0.0F);
-//		bipedHead.addChild(Tip_2);
-//
-//		Rim.isHidden = true;
-//		Band.isHidden = true;
-//		HatTop.isHidden = true;
-//		HatTopTall.isHidden = true;
-//		BandTilted.isHidden = true;
-//		Tip.isHidden = true;
-//		Tip_1.isHidden = true;
-//		Tip_2.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;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java
deleted file mode 100644
index 5494518..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java
+++ /dev/null
@@ -1,379 +0,0 @@
-//package lance5057.tDefense.armor.renderers.cloth;
-//
-//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 ModelTinkersRobe extends ArmorRenderer
-//{
-//	public ModelRenderer	LeftFrontL;
-//	public ModelRenderer	LeftBackL;
-//	public ModelRenderer	CenterBackL;
-//	public ModelRenderer	RightFronL;
-//	public ModelRenderer	RightBackL;
-//	public ModelRenderer	CenterFrontL;
-//	public ModelRenderer	CenterFrontR;
-//	public ModelRenderer	CenterBackR;
-//	public ModelRenderer	FrontMidL;
-//	public ModelRenderer	FrontRightMid;
-//	public ModelRenderer	BackMidR;
-//	public ModelRenderer	BackRightMid;
-//	public ModelRenderer	FrontLeftMid;
-//	public ModelRenderer	UnderFrontLeftMid;
-//	public ModelRenderer	UnderBackRightMid;
-//	public ModelRenderer	UnderBackLeftMid;
-//	public ModelRenderer	UnderFrontRightMid;
-//	public ModelRenderer	UnderLeftMid;
-//	public ModelRenderer	UnderRightMid;
-//	public ModelRenderer	FrontMidR;
-//	public ModelRenderer	BackLeftMid;
-//	public ModelRenderer	BackMidL;
-//	public ModelRenderer	FrontLHigh;
-//	public ModelRenderer	UnderFrontRightHigh;
-//	public ModelRenderer	UnderBackRightHigh;
-//	public ModelRenderer	BackUnderHigh;
-//	public ModelRenderer	UnderBackLeftHigh;
-//	public ModelRenderer	RightHigh;
-//	public ModelRenderer	LeftHigh;
-//	public ModelRenderer	FrontRightHigh;
-//	public ModelRenderer	BackRightHigh;
-//	public ModelRenderer	UnderFrontHigh;
-//	public ModelRenderer	UnderFrontLeftHigh;
-//	public ModelRenderer	BackLHigh;
-//	public ModelRenderer	BeltLHip;
-//	public ModelRenderer	BeltStraight;
-//	public ModelRenderer	BeltRHip;
-//
-//	//public ModelRenderer	BeltStraightSmall;
-//
-//	public ModelTinkersRobe()
-//	{
-//		super(0.1f, 0, 64, 64);
-//
-//		textureWidth = 64;
-//		textureHeight = 64;
-//
-//		//High
-//
-//		LeftHigh = new ModelRenderer(this, "Left Skirt");
-//		LeftHigh.setTextureOffset(52, 38);
-//		LeftHigh.mirror = true;
-//		LeftHigh.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		LeftHigh.addBox(-7.5F, 8.0F, -2.0F, 2, 7, 4, -0.01F);
-//		setRotateAngle(LeftHigh, 0.0F, 0.0F, -0.9599310885968813F);
-//		bipedBody.addChild(LeftHigh);
-//
-//		UnderBackLeftHigh = new ModelRenderer(this, "Underside BackLeft Skirt");
-//		UnderBackLeftHigh.setTextureOffset(8, 57);
-//		UnderBackLeftHigh.mirror = true;
-//		UnderBackLeftHigh.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		UnderBackLeftHigh.addBox(-0.2F, 8.5F, -7.5F, 4, 6, 1, 0.0F);
-//		setRotateAngle(UnderBackLeftHigh, 0.9599310885968813F, 0.7853981633974483F, 0.0F);
-//		bipedBody.addChild(UnderBackLeftHigh);
-//
-//		FrontRightHigh = new ModelRenderer(this, "Front Right Skirt");
-//		FrontRightHigh.setTextureOffset(18, 55);
-//		FrontRightHigh.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		FrontRightHigh.addBox(-3.3F, 6.6F, 6.1F, 4, 7, 2, 0.0F);
-//		setRotateAngle(FrontRightHigh, -0.9599310885968813F, 0.2617993877991494F, 0.0F);
-//		bipedBody.addChild(FrontRightHigh);
-//
-//		RightHigh = new ModelRenderer(this, "Right Skirt");
-//		RightHigh.setTextureOffset(52, 38);
-//		RightHigh.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		RightHigh.addBox(5.5F, 8.0F, -2.0F, 2, 7, 4, -0.01F);
-//		setRotateAngle(RightHigh, 0.0F, 0.0F, 0.9599310885968813F);
-//		bipedBody.addChild(RightHigh);
-//
-//		BackUnderHigh = new ModelRenderer(this, "Underside Back Skirt");
-//		BackUnderHigh.setTextureOffset(8, 57);
-//		BackUnderHigh.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BackUnderHigh.addBox(-2.0F, 8.0F, -8.0F, 4, 6, 1, 0.0F);
-//		setRotateAngle(BackUnderHigh, 0.9599310885968813F, 0.0F, 0.0F);
-//		bipedBody.addChild(BackUnderHigh);
-//
-//		UnderFrontHigh = new ModelRenderer(this, "Underside Front Skirt");
-//		UnderFrontHigh.setTextureOffset(8, 57);
-//		UnderFrontHigh.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		UnderFrontHigh.addBox(-2.0F, 8.0F, 7.0F, 4, 6, 1, 0.0F);
-//		setRotateAngle(UnderFrontHigh, -0.9599310885968813F, 0.0F, 0.0F);
-//		bipedBody.addChild(UnderFrontHigh);
-//
-//		UnderBackRightHigh = new ModelRenderer(this,
-//				"Underside BackRight Skirt");
-//		UnderBackRightHigh.setTextureOffset(8, 57);
-//		UnderBackRightHigh.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		UnderBackRightHigh.addBox(-3.8F, 8.5F, -7.5F, 4, 6, 1, 0.0F);
-//		setRotateAngle(UnderBackRightHigh, 0.9599310885968813F, -0.7853981633974483F, 0.0F);
-//		bipedBody.addChild(UnderBackRightHigh);
-//
-//		BackLHigh = new ModelRenderer(this, "Back Left Skirt");
-//		BackLHigh.setTextureOffset(18, 55);
-//		BackLHigh.mirror = true;
-//		BackLHigh.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BackLHigh.addBox(-0.7F, 6.6F, -8.1F, 4, 7, 2, 0.0F);
-//		setRotateAngle(BackLHigh, 0.9599310885968813F, 0.2617993877991494F, 0.0F);
-//		bipedBody.addChild(BackLHigh);
-//
-//		BackRightHigh = new ModelRenderer(this, "Back Right Skirt");
-//		BackRightHigh.setTextureOffset(18, 55);
-//		BackRightHigh.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BackRightHigh.addBox(-3.3F, 6.6F, -8.1F, 4, 7, 2, 0.0F);
-//		setRotateAngle(BackRightHigh, 0.9599310885968813F, -0.2617993877991494F, 0.0F);
-//		bipedBody.addChild(BackRightHigh);
-//
-//		UnderFrontRightHigh = new ModelRenderer(this,
-//				"Underside FrontRight Skirt");
-//		UnderFrontRightHigh.setTextureOffset(8, 57);
-//		UnderFrontRightHigh.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		UnderFrontRightHigh.addBox(-3.8F, 8.5F, 6.5F, 4, 6, 1, 0.0F);
-//		setRotateAngle(UnderFrontRightHigh, -0.9599310885968813F, 0.7853981633974483F, 0.0F);
-//		bipedBody.addChild(UnderFrontRightHigh);
-//
-//		FrontLHigh = new ModelRenderer(this, "Front Left Skirt");
-//		FrontLHigh.setTextureOffset(18, 55);
-//		FrontLHigh.mirror = true;
-//		FrontLHigh.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		FrontLHigh.addBox(-0.7F, 6.6F, 6.1F, 4, 7, 2, 0.0F);
-//		setRotateAngle(FrontLHigh, -0.9599310885968813F, -0.2617993877991494F, 0.0F);
-//		bipedBody.addChild(FrontLHigh);
-//
-//		UnderFrontLeftHigh = new ModelRenderer(this, "Under FrontLeft Skirt");
-//		UnderFrontLeftHigh.setTextureOffset(8, 57);
-//		UnderFrontLeftHigh.mirror = true;
-//		UnderFrontLeftHigh.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		UnderFrontLeftHigh.addBox(-0.2F, 8.5F, 6.5F, 4, 6, 1, 0.0F);
-//		setRotateAngle(UnderFrontLeftHigh, -0.9599310885968813F, -0.7853981633974483F, 0.0F);
-//		bipedBody.addChild(UnderFrontLeftHigh);
-//
-//		//Mid
-//		FrontMidL = new ModelRenderer(this, "Front Left Dress");
-//		FrontMidL.setTextureOffset(16, 32);
-//		FrontMidL.mirror = true;
-//		FrontMidL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		FrontMidL.addBox(-1.9F, -0.6F, -3.2F, 4, 8, 2, 0.0F);
-//		setRotateAngle(FrontMidL, -0.4363323129985824F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(FrontMidL);
-//
-//		UnderBackRightMid = new ModelRenderer(this, "Underside BackRight Dress");
-//		UnderBackRightMid.setTextureOffset(34, 42);
-//		UnderBackRightMid.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		UnderBackRightMid.addBox(-3.0F, 3.0F, 0.2F, 6, 8, 2, 0.0F);
-//		setRotateAngle(UnderBackRightMid, 0.4363323129985824F, -0.3490658503988659F, 0.0F);
-//		bipedRightLeg.addChild(UnderBackRightMid);
-//
-//		BackMidR = new ModelRenderer(this, "BackRight Dress");
-//		BackMidR.setTextureOffset(28, 32);
-//		BackMidR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BackMidR.addBox(-2.1F, -0.7F, 1.1F, 4, 8, 2, 0.0F);
-//		setRotateAngle(BackMidR, 0.4363323129985824F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(BackMidR);
-//
-//		UnderLeftMid = new ModelRenderer(this, "Underside Left Dress");
-//		UnderLeftMid.setTextureOffset(18, 42);
-//		UnderLeftMid.mirror = true;
-//		UnderLeftMid.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		UnderLeftMid.addBox(0.0F, 3.8F, -3.0F, 2, 7, 6, 0.0F);
-//		setRotateAngle(UnderLeftMid, 0.0F, 0.0F, -0.4363323129985824F);
-//		bipedLeftLeg.addChild(UnderLeftMid);
-//
-//		UnderFrontLeftMid = new ModelRenderer(this, "Underside FrontLeft Dress");
-//		UnderFrontLeftMid.setTextureOffset(40, 32);
-//		UnderFrontLeftMid.mirror = true;
-//		UnderFrontLeftMid.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		UnderFrontLeftMid.addBox(-3.0F, 3.0F, -2.3F, 6, 8, 2, 0.0F);
-//		setRotateAngle(UnderFrontLeftMid, -0.4363323129985824F, -0.3490658503988659F, 0.0F);
-//		bipedLeftLeg.addChild(UnderFrontLeftMid);
-//
-//		BackLeftMid = new ModelRenderer(this, "Back Left Dress");
-//		BackLeftMid.setTextureOffset(8, 47);
-//		BackLeftMid.mirror = true;
-//		BackLeftMid.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BackLeftMid.addBox(-1.3F, -0.4F, 1.5F, 3, 8, 2, 0.0F);
-//		setRotateAngle(BackLeftMid, 0.4363323129985824F, 1.0471975511965976F, 0.0F);
-//		bipedLeftLeg.addChild(BackLeftMid);
-//
-//		UnderBackLeftMid = new ModelRenderer(this, "Underside BackLeft Dress");
-//		UnderBackLeftMid.setTextureOffset(34, 42);
-//		UnderBackLeftMid.mirror = true;
-//		UnderBackLeftMid.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		UnderBackLeftMid.addBox(-3.0F, 3.0F, 0.2F, 6, 8, 2, 0.0F);
-//		setRotateAngle(UnderBackLeftMid, 0.4363323129985824F, 0.3490658503988659F, 0.0F);
-//		bipedLeftLeg.addChild(UnderBackLeftMid);
-//
-//		UnderFrontRightMid = new ModelRenderer(this,
-//				"Underside FrontRight Dress");
-//		UnderFrontRightMid.setTextureOffset(40, 32);
-//		UnderFrontRightMid.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		UnderFrontRightMid.addBox(-3.0F, 3.0F, -2.3F, 6, 8, 2, 0.0F);
-//		setRotateAngle(UnderFrontRightMid, -0.4363323129985824F, 0.3490658503988659F, 0.0F);
-//		bipedRightLeg.addChild(UnderFrontRightMid);
-//
-//		FrontRightMid = new ModelRenderer(this, "Front Right Dress");
-//		FrontRightMid.setTextureOffset(8, 47);
-//		FrontRightMid.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		FrontRightMid.addBox(-1.7F, -0.4F, -3.5F, 3, 8, 2, 0.0F);
-//		setRotateAngle(FrontRightMid, -0.4363323129985824F, 1.0471975511965976F, 0.0F);
-//		bipedRightLeg.addChild(FrontRightMid);
-//
-//		FrontLeftMid = new ModelRenderer(this, "Front Left Dress");
-//		FrontLeftMid.setTextureOffset(8, 47);
-//		FrontLeftMid.mirror = true;
-//		FrontLeftMid.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		FrontLeftMid.addBox(-1.3F, -0.4F, -3.5F, 3, 8, 2, 0.0F);
-//		setRotateAngle(FrontLeftMid, -0.4363323129985824F, -1.0471975511965976F, 0.0F);
-//		bipedLeftLeg.addChild(FrontLeftMid);
-//
-//		UnderRightMid = new ModelRenderer(this, "Under Right Dress");
-//		UnderRightMid.setTextureOffset(18, 42);
-//		UnderRightMid.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		UnderRightMid.addBox(-2.0F, 3.8F, -3.0F, 2, 7, 6, 0.0F);
-//		setRotateAngle(UnderRightMid, 0.0F, 0.0F, 0.4363323129985824F);
-//		bipedRightLeg.addChild(UnderRightMid);
-//
-//		BackRightMid = new ModelRenderer(this, "Back Right Dress");
-//		BackRightMid.setTextureOffset(8, 47);
-//		BackRightMid.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BackRightMid.addBox(-1.7F, -0.4F, 1.5F, 3, 8, 2, 0.0F);
-//		setRotateAngle(BackRightMid, 0.4363323129985824F, -1.0471975511965976F, 0.0F);
-//		bipedRightLeg.addChild(BackRightMid);
-//
-//		FrontMidR = new ModelRenderer(this, "Front Right Dress");
-//		FrontMidR.setTextureOffset(16, 32);
-//		FrontMidR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		FrontMidR.addBox(-2.1F, -0.6F, -3.2F, 4, 8, 2, 0.0F);
-//		setRotateAngle(FrontMidR, -0.4363323129985824F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(FrontMidR);
-//
-//		BackMidL = new ModelRenderer(this, "BackLeft Dress");
-//		BackMidL.setTextureOffset(28, 32);
-//		BackMidL.mirror = true;
-//		BackMidL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BackMidL.addBox(-1.9F, -0.7F, 1.1F, 4, 8, 2, 0.0F);
-//		setRotateAngle(BackMidL, 0.4363323129985824F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(BackMidL);
-//
-//		//Low
-//		CenterBackL = new ModelRenderer(this, "Center BackLeft Robe");
-//		CenterBackL.setTextureOffset(0, 49);
-//		CenterBackL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		CenterBackL.addBox(-2.9F, -0.2F, 0.5F, 2, 11, 2, 0.0F);
-//		setRotateAngle(CenterBackL, 0.08726646259971647F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(CenterBackL);
-//
-//		CenterFrontR = new ModelRenderer(this, "Center FrontRight Robe");
-//		CenterFrontR.setTextureOffset(0, 49);
-//		CenterFrontR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		CenterFrontR.addBox(0.9F, -0.2F, -2.5F, 2, 11, 2, 0.0F);
-//		setRotateAngle(CenterFrontR, -0.08726646259971647F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(CenterFrontR);
-//
-//		CenterFrontL = new ModelRenderer(this, "Center FrontLeft Robe");
-//		CenterFrontL.setTextureOffset(0, 49);
-//		CenterFrontL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		CenterFrontL.addBox(-2.9F, -0.2F, -2.5F, 2, 11, 2, 0.0F);
-//		setRotateAngle(CenterFrontL, -0.08726646259971647F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(CenterFrontL);
-//
-//		RightBackL = new ModelRenderer(this, "Right Back Robe");
-//		RightBackL.setTextureOffset(0, 32);
-//		RightBackL.mirror = true;
-//		RightBackL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		RightBackL.addBox(-2.2F, -0.3F, -1.5F, 4, 11, 4, 0.0F);
-//		setRotateAngle(RightBackL, 0.08726646259971647F, 0.0F, 0.08726646259971647F);
-//		bipedRightLeg.addChild(RightBackL);
-//
-//		CenterBackR = new ModelRenderer(this, "Center BackRight Robe");
-//		CenterBackR.setTextureOffset(0, 49);
-//		CenterBackR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		CenterBackR.addBox(0.9F, -0.2F, 0.5F, 2, 11, 2, 0.0F);
-//		setRotateAngle(CenterBackR, 0.08726646259971647F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(CenterBackR);
-//
-//		LeftBackL = new ModelRenderer(this, "Left Back Robe");
-//		LeftBackL.setTextureOffset(0, 32);
-//		LeftBackL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		LeftBackL.addBox(-1.8F, -0.3F, -1.5F, 4, 11, 4, 0.0F);
-//		setRotateAngle(LeftBackL, 0.08726646259971647F, 0.0F, -0.08726646259971647F);
-//		bipedLeftLeg.addChild(LeftBackL);
-//
-//		RightFronL = new ModelRenderer(this, "Right Front Robe");
-//		RightFronL.setTextureOffset(0, 32);
-//		RightFronL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		RightFronL.addBox(-2.2F, -0.3F, -2.5F, 4, 11, 4, 0.01F);
-//		setRotateAngle(RightFronL, -0.08726646259971647F, 0.0F, 0.08726646259971647F);
-//		bipedRightLeg.addChild(RightFronL);
-//
-//		LeftFrontL = new ModelRenderer(this, "Left Front Robe");
-//		LeftFrontL.setTextureOffset(0, 32);
-//		LeftFrontL.mirror = true;
-//		LeftFrontL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		LeftFrontL.addBox(-1.8F, -0.3F, -2.5F, 4, 11, 4, 0.01F);
-//		setRotateAngle(LeftFrontL, -0.08726646259971647F, 0.0F, -0.08726646259971647F);
-//		bipedLeftLeg.addChild(LeftFrontL);
-//
-//		//Belts
-//		BeltRHip = new ModelRenderer(this, "Belt Right Hip");
-//		BeltRHip.setTextureOffset(32, 55);
-//		BeltRHip.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BeltRHip.addBox(-3.3F, 0.0F, -3.0F, 10, 3, 6, -0.11F);
-//		setRotateAngle(BeltRHip, 0.0F, 0.0F, -0.13962634015954636F);
-//		bipedRightLeg.addChild(BeltRHip);
-//
-//		BeltLHip = new ModelRenderer(this, "Belt Left Hip");
-//		BeltLHip.setTextureOffset(32, 55);
-//		BeltLHip.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BeltLHip.addBox(-6.7F, 0.0F, -3.0F, 10, 3, 6, -0.1F);
-//		setRotateAngle(BeltLHip, 0.0F, 0.0F, 0.13962634015954636F);
-//		bipedLeftLeg.addChild(BeltLHip);
-//
-//		BeltStraight = new ModelRenderer(this, "Belt Straight");
-//		BeltStraight.setTextureOffset(34, 55);
-//		BeltStraight.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BeltStraight.addBox(-4.5F, 10.5F, -3.0F, 9, 3, 6, -0.1F);
-//		bipedBody.addChild(BeltStraight);
-//
-//		BackLHigh.isHidden = true;
-//		BackRightHigh.isHidden = true;
-//		BackUnderHigh.isHidden = true;
-//		FrontLHigh.isHidden = true;
-//		FrontRightHigh.isHidden = true;
-//		LeftHigh.isHidden = true;
-//		RightHigh.isHidden = true;
-//		UnderBackLeftHigh.isHidden = true;
-//		UnderBackRightHigh.isHidden = true;
-//		UnderFrontHigh.isHidden = true;
-//		UnderFrontLeftHigh.isHidden = true;
-//		UnderFrontRightHigh.isHidden = true;
-//
-//		BackLeftMid.isHidden = true;
-//		BackMidL.isHidden = true;
-//		BackMidR.isHidden = true;
-//		BackRightMid.isHidden = true;
-//		FrontLeftMid.isHidden = true;
-//		FrontMidL.isHidden = true;
-//		FrontMidR.isHidden = true;
-//		FrontRightMid.isHidden = true;
-//		UnderBackLeftMid.isHidden = true;
-//		UnderBackRightMid.isHidden = true;
-//		UnderFrontLeftMid.isHidden = true;
-//		UnderFrontRightMid.isHidden = true;
-//		UnderLeftMid.isHidden = true;
-//		UnderRightMid.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;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java
deleted file mode 100644
index 888843e..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java
+++ /dev/null
@@ -1,176 +0,0 @@
-//package lance5057.tDefense.armor.renderers.cloth;
-//
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import net.minecraft.client.model.ModelRenderer;
-//
-///**
-// * ModelTinkersShawl - Either Mojang or a mod author
-// * Created using Tabula 4.1.1
-// */
-//public class ModelTinkersShawl extends ArmorRenderer
-//{
-//	public ModelRenderer	Button;
-//	public ModelRenderer	Zipper;
-//	public ModelRenderer	ArmTrimL;
-//	public ModelRenderer	ArmTrimR;
-//	public ModelRenderer	TrimNeck;
-//	public ModelRenderer	ButtonArmL;
-//	public ModelRenderer	ButtonArmR;
-//	public ModelRenderer	ShawlLeftShort;
-//	public ModelRenderer	ShawlRightShort;
-//	public ModelRenderer	ShawlLeftTrim;
-//	public ModelRenderer	TrimShawl;
-//	public ModelRenderer	ShawlRightTrim;
-//	public ModelRenderer	ZipperShort;
-//	public ModelRenderer	ShawlLeftLong;
-//	public ModelRenderer	ShawlLeftTrimLong;
-//	public ModelRenderer	ShawlRightLong;
-//	public ModelRenderer	ShawlRightTrimLong;
-//
-//	public ModelTinkersShawl()
-//	{
-//		super(0.1f, 0, 64, 64);
-//
-//		textureWidth = 64;
-//		textureHeight = 64;
-//
-//		TrimNeck = new ModelRenderer(this, "Collar");
-//		TrimNeck.setTextureOffset(20, 32);
-//		TrimNeck.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		TrimNeck.addBox(-4.5F, -0.5F, -2.5F, 9, 2, 5, -0.3F);
-//		bipedBody.addChild(TrimNeck);
-//
-//		Button = new ModelRenderer(this, "Collar Button");
-//		Button.setTextureOffset(15, 32);
-//		Button.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Button.addBox(-1.5F, -0.5F, -2.5F, 2, 2, 1, -0.2F);
-//		setRotateAngle(Button, 0.0F, 0.0F, -0.7853981633974483F);
-//		bipedBody.addChild(Button);
-//
-//		ButtonArmL = new ModelRenderer(this, "Button Arm Left");
-//		ButtonArmL.setTextureOffset(23, 39);
-//		ButtonArmL.mirror = true;
-//		ButtonArmL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ButtonArmL.addBox(2.5F, 3.0F, -5.0F, 1, 2, 2, -0.2F);
-//		setRotateAngle(ButtonArmL, 0.7853981633974483F, 0.0F, 0.0F);
-//		bipedLeftArm.addChild(ButtonArmL);
-//
-//		ButtonArmR = new ModelRenderer(this, "Button Arm Right");
-//		ButtonArmR.setTextureOffset(23, 39);
-//		ButtonArmR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ButtonArmR.addBox(-3.5F, 3.0F, -5.0F, 1, 2, 2, -0.2F);
-//		setRotateAngle(ButtonArmR, 0.7853981633974483F, 0.0F, 0.0F);
-//		bipedRightArm.addChild(ButtonArmR);
-//
-//		ArmTrimR = new ModelRenderer(this, "Arm Trim Right");
-//		ArmTrimR.setTextureOffset(0, 32);
-//		ArmTrimR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ArmTrimR.addBox(-3.5F, 5.0F, -2.5F, 5, 2, 5, -0.3F);
-//		bipedRightArm.addChild(ArmTrimR);
-//
-//		ArmTrimL = new ModelRenderer(this, "Arm Trim Left");
-//		ArmTrimL.setTextureOffset(0, 32);
-//		ArmTrimL.mirror = true;
-//		ArmTrimL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ArmTrimL.addBox(-1.5F, 5.0F, -2.5F, 5, 2, 5, -0.3F);
-//		bipedLeftArm.addChild(ArmTrimL);
-//
-//		ZipperShort = new ModelRenderer(this, "Zipper Bottom");
-//		ZipperShort.setTextureOffset(30, 53);
-//		ZipperShort.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ZipperShort.addBox(-1.0F, 6.3F, -2.5F, 2, 5, 1, -0.3F);
-//		bipedBody.addChild(ZipperShort);
-//
-//		Zipper = new ModelRenderer(this, "Zipper Top");
-//		Zipper.setTextureOffset(30, 52);
-//		Zipper.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Zipper.addBox(-1.0F, 0.2F, -2.5F, 2, 7, 1, -0.3F);
-//		bipedBody.addChild(Zipper);
-//
-//		ShawlLeftTrim = new ModelRenderer(this, "Shawl Left Trim");
-//		ShawlLeftTrim.setTextureOffset(28, 39);
-//		ShawlLeftTrim.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ShawlLeftTrim.addBox(-5.1F, 2.45F, -2.5F, 9, 2, 5, -0.29F);
-//		setRotateAngle(ShawlLeftTrim, 0.0F, 0.0F, -0.2792526803190927F);
-//		bipedLeftArm.addChild(ShawlLeftTrim);
-//
-//		ShawlRightTrim = new ModelRenderer(this, "Shawl Right Trim Short");
-//		ShawlRightTrim.setTextureOffset(28, 39);
-//		ShawlRightTrim.mirror = true;
-//		ShawlRightTrim.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ShawlRightTrim.addBox(-3.95F, 2.45F, -2.5F, 9, 2, 5, -0.29F);
-//		setRotateAngle(ShawlRightTrim, 0.0F, 0.0F, 0.2792526803190927F);
-//		bipedRightArm.addChild(ShawlRightTrim);
-//
-//		ShawlRightTrimLong = new ModelRenderer(this, "Shawl Right Trim Long");
-//		ShawlRightTrimLong.setTextureOffset(0, 39);
-//		ShawlRightTrimLong.mirror = true;
-//		ShawlRightTrimLong.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ShawlRightTrimLong.addBox(-3.95F, 7.85F, -2.5F, 9, 2, 5, -0.29F);
-//		setRotateAngle(ShawlRightTrimLong, 0.0F, 0.0F, 0.2792526803190927F);
-//		bipedRightArm.addChild(ShawlRightTrimLong);
-//
-//		ShawlLeftTrimLong = new ModelRenderer(this, "Shawl Left Trim Long");
-//		ShawlLeftTrimLong.setTextureOffset(0, 39);
-//		ShawlLeftTrimLong.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ShawlLeftTrimLong.addBox(-5.1F, 7.85F, -2.5F, 9, 2, 5, -0.29F);
-//		setRotateAngle(ShawlLeftTrimLong, 0.0F, 0.0F, -0.2792526803190927F);
-//		bipedLeftArm.addChild(ShawlLeftTrimLong);
-//
-//		ShawlLeftLong = new ModelRenderer(this, "Shawl Left Long");
-//		ShawlLeftLong.setTextureOffset(38, 50);
-//		ShawlLeftLong.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ShawlLeftLong.addBox(-4.55F, -1.05F, -2.0F, 8, 10, 4, 0.11F);
-//		setRotateAngle(ShawlLeftLong, 0.0F, 0.0F, -0.2792526803190927F);
-//		bipedLeftArm.addChild(ShawlLeftLong);
-//
-//		ShawlRightLong = new ModelRenderer(this, "Shawl Right Long");
-//		ShawlRightLong.setTextureOffset(38, 50);
-//		ShawlRightLong.mirror = true;
-//		ShawlRightLong.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ShawlRightLong.addBox(-3.45F, -1.05F, -2.0F, 8, 10, 4, 0.11F);
-//		setRotateAngle(ShawlRightLong, 0.0F, 0.0F, 0.2792526803190927F);
-//		bipedRightArm.addChild(ShawlRightLong);
-//
-//		ShawlLeftShort = new ModelRenderer(this, "Shawl Left Short");
-//		ShawlLeftShort.setTextureOffset(38, 50);
-//		ShawlLeftShort.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ShawlLeftShort.addBox(-1.55F, -1.05F, -2.0F, 5, 5, 4, 0.01F);
-//		setRotateAngle(ShawlLeftShort, 0.0F, 0.0F, -0.2792526803190927F);
-//		bipedLeftArm.addChild(ShawlLeftShort);
-//
-//		ShawlRightShort = new ModelRenderer(this, "Shawl Right Short");
-//		ShawlRightShort.setTextureOffset(38, 50);
-//		ShawlRightShort.mirror = true;
-//		ShawlRightShort.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ShawlRightShort.addBox(-3.45F, -1.05F, -2.0F, 5, 5, 4, 0.01F);
-//		setRotateAngle(ShawlRightShort, 0.0F, 0.0F, 0.2792526803190927F);
-//		bipedRightArm.addChild(ShawlRightShort);
-//
-//		TrimShawl = new ModelRenderer(this, "Trim Shawl Short");
-//		TrimShawl.setTextureOffset(20, 32);
-//		TrimShawl.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		TrimShawl.addBox(-4.5F, 5.5F, -2.5F, 9, 2, 5, -0.31F);
-//		bipedBody.addChild(TrimShawl);
-//
-//		ArmTrimL.isHidden = true;
-//		ArmTrimR.isHidden = true;
-//		ShawlLeftTrim.isHidden = true;
-//		ShawlRightTrim.isHidden = true;
-//		TrimShawl.isHidden = true;
-//		Zipper.isHidden = true;
-//		ZipperShort.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;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShoes.java b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShoes.java
deleted file mode 100644
index d751ded..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShoes.java
+++ /dev/null
@@ -1,79 +0,0 @@
-//package lance5057.tDefense.armor.renderers.cloth;
-//
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import net.minecraft.client.model.ModelRenderer;
-//
-///**
-// * ModelTinkersShoes - Either Mojang or a mod author
-// * Created using Tabula 4.1.1
-// */
-//public class ModelTinkersShoes extends ArmorRenderer
-//{
-//	public ModelRenderer	FootL;
-//	public ModelRenderer	FootR;
-//	public ModelRenderer	OverLegL;
-//	public ModelRenderer	OverLegR;
-//	public ModelRenderer	ShoeL;
-//	public ModelRenderer	ShoeR;
-//
-//	public ModelTinkersShoes()
-//	{
-//		super(0.1f, 0, 64, 64);
-//
-//		textureWidth = 64;
-//		textureHeight = 64;
-//
-//		FootL = new ModelRenderer(this, "Foot Left");
-//		FootL.setTextureOffset(16, 41);
-//		FootL.setRotationPoint(0F, 0F, 0F);
-//		FootL.addBox(-2F, 10.1F, -3.0F, 4, 2, 1, 0.2F);
-//		bipedLeftLeg.addChild(FootL);
-//
-//		FootR = new ModelRenderer(this, "Foot Right");
-//		FootR.setTextureOffset(16, 41);
-//		FootR.setRotationPoint(0F, 0F, 0F);
-//		FootR.addBox(-2F, 10.1F, -3.0F, 4, 2, 1, 0.2F);
-//		bipedRightLeg.addChild(FootR);
-//
-//		OverLegL = new ModelRenderer(this, "Over Leg Left");
-//		OverLegL.setTextureOffset(0, 32);
-//		OverLegL.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.2F);
-//		OverLegL.setRotationPoint(0F, 0F, 0F);
-//		bipedLeftLeg.addChild(OverLegL);
-//
-//		OverLegR = new ModelRenderer(this, "Over Leg Right");
-//		OverLegR.setTextureOffset(0, 32);
-//		OverLegR.mirror = true;
-//		OverLegR.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.2F);
-//		OverLegR.setRotationPoint(0F, 0F, 0F);
-//		bipedRightLeg.addChild(OverLegR);
-//
-//		ShoeL = new ModelRenderer(this, "Shoe Left");
-//		ShoeL.setTextureOffset(16, 32);
-//		ShoeL.addBox(-2.0F, 7.0F, -2.0F, 4, 5, 4, 0.21F);
-//		ShoeL.setRotationPoint(0F, 0F, 0F);
-//		bipedLeftLeg.addChild(ShoeL);
-//
-//		ShoeR = new ModelRenderer(this, "Shoe Right");
-//		ShoeR.setTextureOffset(16, 32);
-//		ShoeR.mirror = true;
-//		ShoeR.addBox(-2.0F, 7.0F, -2.0F, 4, 5, 4, 0.21F);
-//		ShoeR.setRotationPoint(0F, 0F, 0F);
-//		bipedRightLeg.addChild(ShoeR);
-//
-//		OverLegL.isHidden = true;
-//		OverLegR.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;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersBreastplate.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersBreastplate.java
deleted file mode 100644
index fded61d..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersBreastplate.java
+++ /dev/null
@@ -1,176 +0,0 @@
-//package lance5057.tDefense.armor.renderers.heavy;
-//
-//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 ModelTinkersBreastplate extends ArmorRenderer 
-//{
-//	public ModelRenderer	BackPlate;
-//	public ModelRenderer	BreastPlate;
-//	public ModelRenderer	Plackart;
-//	public ModelRenderer	WingR;
-//	public ModelRenderer	WingL;
-//	public ModelRenderer	PauldronR;
-//	public ModelRenderer	PauldronL;
-//	public ModelRenderer	ArmR;
-//	public ModelRenderer	ArmL;
-//	public ModelRenderer	PauldronExtraR;
-//	public ModelRenderer	PauldronExtraL;
-//	public ModelRenderer	PauldronR_1;
-//	public ModelRenderer	ArmR_1;
-//	public ModelRenderer	PauldronL_1;
-//	public ModelRenderer	ArmL_1;
-//
-//	public ModelTinkersBreastplate()
-//	{
-//		super(0.1f, 0, 128, 64);
-//
-//		textureWidth = 128;
-//		textureHeight = 64;
-//
-//		bipedBody = new ModelRenderer(this, "Body");
-//		bipedBody.setTextureOffset(16, 16);
-//		bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, 0.1f);
-//		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.1f);
-//		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.1f);
-//		bipedLeftArm.setRotationPoint(5.0F, 2.0F + 0, 0.0F);
-//
-//		ArmR = new ModelRenderer(this, "Arm Right Overlay");
-//		ArmR.setTextureOffset(28, 44);
-//		ArmR.mirror = true;
-//		ArmR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ArmR.addBox(-4.0F, -2.2F, -3.0F, 5, 6, 6, 0.0F);
-//		bipedRightArm.addChild(ArmR);
-//
-//		ArmR_1 = new ModelRenderer(this, "Arm Overlay Right 2");
-//		ArmR_1.setTextureOffset(94, 0);
-//		ArmR_1.mirror = true;
-//		ArmR_1.setRotationPoint(-0.0F, 0.0F, 0.0F);
-//		ArmR_1.addBox(-4.5F, -2.0F, -3.0F, 6, 7, 6, 0.1F);
-//		setRotateAngle(ArmR_1, 0.0F, -0.0F, -0.17453292519943295F);
-//		bipedRightArm.addChild(ArmR_1);
-//
-//		ArmL = new ModelRenderer(this, "Arm Overlay Left");
-//		ArmL.setTextureOffset(28, 44);
-//		ArmL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ArmL.addBox(-1.0F, -2.2F, -3.0F, 5, 6, 6, 0.0F);
-//		bipedLeftArm.addChild(ArmL);
-//
-//		ArmL_1 = new ModelRenderer(this, "Arm Left Overlay 2");
-//		ArmL_1.setTextureOffset(94, 0);
-//		ArmL_1.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ArmL_1.addBox(-1.0F, -2.0F, -3.0F, 6, 7, 6, 0.1F);
-//		setRotateAngle(ArmL_1, 0.0F, -0.0F, 0.17453292519943295F);
-//		bipedLeftArm.addChild(ArmL_1);
-//
-//		PauldronL = new ModelRenderer(this, "Pauldron Left");
-//		PauldronL.setTextureOffset(24, 32);
-//		PauldronL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		PauldronL.addBox(0.6F, -2.0F, -3.5F, 4, 5, 7, 0.0F);
-//		setRotateAngle(PauldronL, 0.0F, -0.0F, -0.4363323129985824F);
-//		bipedLeftArm.addChild(PauldronL);
-//
-//		PauldronR = new ModelRenderer(this, "Pauldron Right");
-//		PauldronR.setTextureOffset(24, 32);
-//		PauldronR.mirror = true;
-//		PauldronR.setRotationPoint(-0.0F, 0.0F, 0.0F);
-//		PauldronR.addBox(-4.8F, -2.0F, -3.5F, 4, 5, 7, 0.0F);
-//		setRotateAngle(PauldronR, 0.0F, -0.0F, 0.4363323129985824F);
-//		bipedRightArm.addChild(PauldronR);
-//
-//		PauldronExtraL = new ModelRenderer(this, "Pauldron Extra Left");
-//		PauldronExtraL.setTextureOffset(56, 19);
-//		PauldronExtraL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		PauldronExtraL.addBox(0.0F, -12.0F, 0.0F, 13, 18, 0, 0.0F);
-//		bipedLeftArm.addChild(PauldronExtraL);
-//
-//		PauldronExtraR = new ModelRenderer(this, "Pauldron Extra Right");
-//		PauldronExtraR.setTextureOffset(56, 19);
-//		PauldronExtraR.mirror = true;
-//		PauldronExtraR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		PauldronExtraR.addBox(-12.0F, -12.0F, 0.0F, 13, 18, 0, 0.0F);
-//		bipedRightArm.addChild(PauldronExtraR);
-//
-//		PauldronR_1 = new ModelRenderer(this, "Pauldron Right 2");
-//		PauldronR_1.setTextureOffset(64, 0);
-//		PauldronR_1.mirror = true;
-//		PauldronR_1.setRotationPoint(-0.0F, 0.0F, 0.0F);
-//		PauldronR_1.addBox(-5.5F, -8.0F, -4.0F, 7, 11, 8, 0.1F);
-//		setRotateAngle(PauldronR_1, 0.0F, -0.0F, 0.2617993877991494F);
-//		bipedRightArm.addChild(PauldronR_1);
-//
-//		PauldronL_1 = new ModelRenderer(this, "Pauldron Left 2");
-//		PauldronL_1.setTextureOffset(64, 0);
-//		PauldronL_1.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		PauldronL_1.addBox(-1.5F, -8.0F, -4.0F, 7, 11, 8, 0.1F);
-//		setRotateAngle(PauldronL_1, 0.0F, -0.0F, -0.2617993877991494F);
-//		bipedLeftArm.addChild(PauldronL_1);
-//
-//		WingL = new ModelRenderer(this, "Wing Left");
-//		WingL.setTextureOffset(82, 5);
-//		WingL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		WingL.addBox(0.0F, -6.0F, 3.0F, 0, 28, 14, 0.0F);
-//		setRotateAngle(WingL, 0.0F, -0.2617993877991494F, 0.0F);
-//		bipedBody.addChild(WingL);
-//
-//		WingR = new ModelRenderer(this, "Wing Right");
-//		WingR.setTextureOffset(82, 5);
-//		WingR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		WingR.addBox(0.0F, -6.0F, 3.0F, 0, 28, 14, 0.0F);
-//		setRotateAngle(WingR, 0.0F, 0.2617993877991494F, 0.0F);
-//		bipedBody.addChild(WingR);
-//
-//		Plackart = new ModelRenderer(this, "Plackart");
-//		Plackart.setTextureOffset(0, 42);
-//		Plackart.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Plackart.addBox(-4.0F, 5.0F, -3.0F, 8, 7, 6, 0.0F);
-//		bipedBody.addChild(Plackart);
-//
-//		BreastPlate = new ModelRenderer(this, "BreastPlate");
-//		BreastPlate.setTextureOffset(0, 32);
-//		BreastPlate.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BreastPlate.addBox(-4.0F, 0.1F, -3.6F, 8, 6, 4, 0.1F);
-//		bipedBody.addChild(BreastPlate);
-//
-//		BackPlate = new ModelRenderer(this, "Back Plate");
-//		BackPlate.setTextureOffset(0, 56);
-//		BackPlate.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BackPlate.addBox(-4.0F, 0.0F, 1.0F, 8, 5, 3, 0.0F);
-//		setRotateAngle(BackPlate, -0.08726646006107329F, -0.0F, 0.0F);
-//		bipedBody.addChild(BackPlate);
-//
-//		WingL.isHidden = true;
-//		WingR.isHidden = true;
-//		PauldronL_1.isHidden = true;
-//		PauldronR_1.isHidden = true;
-//		ArmL_1.isHidden = true;
-//		ArmR_1.isHidden = true;
-//		PauldronExtraL.isHidden = true;
-//		PauldronExtraR.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;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
deleted file mode 100644
index bc76312..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
+++ /dev/null
@@ -1,214 +0,0 @@
-//package lance5057.tDefense.armor.renderers.heavy;
-//
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import net.minecraft.client.model.ModelRenderer;
-//
-///**
-// * TinkersGrieves - Either Mojang or a mod author
-// * Created using Tabula 4.1.1
-// */
-//public class ModelTinkersGrieves extends ArmorRenderer
-//{
-//	public ModelRenderer	LegPlateL;
-//	public ModelRenderer	CodPiece;
-//	public ModelRenderer	LegPlateBackL;
-//	public ModelRenderer	LegPlateBackR;
-//	public ModelRenderer	LegPlateR;
-//	public ModelRenderer	Belt;
-//	public ModelRenderer	BeltBuckle;
-//	public ModelRenderer	ThighR;
-//	public ModelRenderer	ThighL;
-//	public ModelRenderer	ThighRB;
-//	public ModelRenderer	ThighLB;
-//	public ModelRenderer	SecBeltR;
-//	public ModelRenderer	SecBeltL;
-//	public ModelRenderer	LeftFrontL;
-//	public ModelRenderer	LeftBackL;
-//	public ModelRenderer	CenterBackL;
-//	public ModelRenderer	CenterBackR;
-//	public ModelRenderer	RightFrontL;
-//	public ModelRenderer	RightBackL;
-//	public ModelRenderer	CenterFrontL;
-//	public ModelRenderer	CenterFrontR;
-//
-//	public ModelTinkersGrieves()
-//	{
-//		super(0.1f, 0, 64, 64);
-//
-//		textureWidth = 64;
-//		textureHeight = 64;
-//
-//		SecBeltL = new ModelRenderer(this, "Hip Belt Left");
-//		SecBeltL.setTextureOffset(12, 56);
-//		SecBeltL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		SecBeltL.addBox(-1.0F, 11.5F, -2.8F, 9, 2, 6, 0.16F);
-//		setRotateAngle(SecBeltL, 0.0F, 0.0F, 0.2617993877991494F);
-//		bipedBody.addChild(SecBeltL);
-//
-//		CodPiece = new ModelRenderer(this, "CodPiece");
-//		CodPiece.setTextureOffset(0, 49);
-//		CodPiece.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		CodPiece.addBox(-2.5F, 11.0F, -3.2F, 5, 5, 3, -0.4F);
-//		bipedBody.addChild(CodPiece);
-//
-//		ThighL = new ModelRenderer(this, "Thigh Left Front");
-//		ThighL.setTextureOffset(12, 32);
-//		ThighL.mirror = true;
-//		ThighL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ThighL.addBox(-2.0F, 0.0F, -2.5F, 4, 6, 4, 0.2F);
-//		setRotateAngle(ThighL, 0.08726646259971647F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(ThighL);
-//
-//		ThighLB = new ModelRenderer(this, "Thigh Left Back");
-//		ThighLB.setTextureOffset(13, 42);
-//		ThighLB.mirror = true;
-//		ThighLB.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ThighLB.addBox(-2.0F, 0.0F, -1.5F, 4, 6, 4, 0.1F);
-//		setRotateAngle(ThighLB, -0.08726646259971647F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(ThighLB);
-//
-//		SecBeltR = new ModelRenderer(this, "Hip Belt Right");
-//		SecBeltR.setTextureOffset(12, 56);
-//		SecBeltR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		SecBeltR.addBox(-8.0F, 11.5F, -2.8F, 9, 2, 6, 0.15F);
-//		setRotateAngle(SecBeltR, 0.0F, 0.0F, -0.2617993877991494F);
-//		bipedBody.addChild(SecBeltR);
-//
-//		CenterFrontL = new ModelRenderer(this, "Center Front");
-//		CenterFrontL.setTextureOffset(29, 43);
-//		CenterFrontL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		CenterFrontL.addBox(-2.9F, -0.2F, -2.5F, 2, 11, 2, 0.0F);
-//		setRotateAngle(CenterFrontL, -0.08726646259971647F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(CenterFrontL);
-//
-//		CenterFrontR = new ModelRenderer(this, "Center Front");
-//		CenterFrontR.setTextureOffset(29, 43);
-//		CenterFrontR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		CenterFrontR.addBox(0.9F, -0.2F, -2.5F, 2, 11, 2, 0.0F);
-//		setRotateAngle(CenterFrontR, -0.08726646259971647F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(CenterFrontR);
-//
-//		LegPlateBackR = new ModelRenderer(this, "Leg Plate Back Right");
-//		LegPlateBackR.setTextureOffset(0, 43);
-//		LegPlateBackR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		LegPlateBackR.addBox(-2.0F, 0.1F, 2.1F, 4, 5, 1, 0.0F);
-//		setRotateAngle(LegPlateBackR, 0.2617993877991494F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(LegPlateBackR);
-//
-//		Belt = new ModelRenderer(this, "Belt");
-//		Belt.setTextureOffset(12, 56);
-//		Belt.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Belt.addBox(-4.5F, 10.0F, -2.8F, 9, 2, 6, 0.25F);
-//		bipedBody.addChild(Belt);
-//
-//		ThighR = new ModelRenderer(this, "Thigh Right");
-//		ThighR.setTextureOffset(12, 32);
-//		ThighR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ThighR.addBox(-2.0F, 0.0F, -2.5F, 4, 6, 4, 0.2F);
-//		setRotateAngle(ThighR, 0.08726646259971647F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(ThighR);
-//
-//		ThighRB = new ModelRenderer(this, "Thigh Right Back");
-//		ThighRB.setTextureOffset(13, 42);
-//		ThighRB.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ThighRB.addBox(-2.0F, 0.0F, -1.5F, 4, 6, 4, 0.1F);
-//		setRotateAngle(ThighRB, -0.08726646259971647F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(ThighRB);
-//
-//		LegPlateL = new ModelRenderer(this, "Leg Plate Left");
-//		LegPlateL.setTextureOffset(0, 32);
-//		LegPlateL.mirror = true;
-//		LegPlateL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		LegPlateL.addBox(1.6F, -0.1F, -2.5F, 1, 5, 5, 0.1F);
-//		setRotateAngle(LegPlateL, 0.0F, 0.0F, -0.2617993877991494F);
-//		bipedLeftLeg.addChild(LegPlateL);
-//
-//		RightBackL = new ModelRenderer(this, "Right Back Left");
-//		RightBackL.setTextureOffset(42, 34);
-//		RightBackL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		RightBackL.addBox(-2.2F, -0.3F, -1.5F, 4, 11, 4, 0.0F);
-//		setRotateAngle(RightBackL, 0.08726646259971647F, 0.0F, 0.08726646259971647F);
-//		bipedRightLeg.addChild(RightBackL);
-//
-//		LeftBackL = new ModelRenderer(this, "Left Back Left");
-//		LeftBackL.setTextureOffset(42, 34);
-//		LeftBackL.mirror = true;
-//		LeftBackL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		LeftBackL.addBox(-1.8F, -0.3F, -1.5F, 4, 11, 4, 0.0F);
-//		setRotateAngle(LeftBackL, 0.08726646259971647F, 0.0F, -0.08726646259971647F);
-//		bipedLeftLeg.addChild(LeftBackL);
-//
-//		LegPlateR = new ModelRenderer(this, "Leg Plate Right");
-//		LegPlateR.setTextureOffset(0, 32);
-//		LegPlateR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		LegPlateR.addBox(-2.6F, -0.1F, -2.5F, 1, 5, 5, 0.1F);
-//		setRotateAngle(LegPlateR, 0.0F, 0.0F, 0.2617993877991494F);
-//		bipedRightLeg.addChild(LegPlateR);
-//
-//		RightFrontL = new ModelRenderer(this, "Right Front Left");
-//		RightFrontL.setTextureOffset(42, 49);
-//		RightFrontL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		RightFrontL.addBox(-2.2F, -0.3F, -2.5F, 4, 11, 4, 0.0F);
-//		setRotateAngle(RightFrontL, -0.08726646259971647F, 0.0F, 0.08726646259971647F);
-//		bipedRightLeg.addChild(RightFrontL);
-//
-//		BeltBuckle = new ModelRenderer(this, "Belt Buckle");
-//		BeltBuckle.setTextureOffset(0, 58);
-//		BeltBuckle.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BeltBuckle.addBox(-2.0F, 9.0F, -3.5F, 4, 4, 2, -0.3F);
-//		bipedBody.addChild(BeltBuckle);
-//
-//		LegPlateBackL = new ModelRenderer(this, "Leg Plate Back Left");
-//		LegPlateBackL.setTextureOffset(0, 43);
-//		LegPlateBackL.mirror = true;
-//		LegPlateBackL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		LegPlateBackL.addBox(-2.0F, 0.1F, 2.1F, 4, 5, 1, 0.0F);
-//		setRotateAngle(LegPlateBackL, 0.2617993877991494F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(LegPlateBackL);
-//
-//		LeftFrontL = new ModelRenderer(this, "Left Front Left");
-//		LeftFrontL.setTextureOffset(42, 49);
-//		LeftFrontL.mirror = true;
-//		LeftFrontL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		LeftFrontL.addBox(-1.8F, -0.3F, -2.5F, 4, 11, 4, 0.0F);
-//		setRotateAngle(LeftFrontL, -0.08726646259971647F, 0.0F, -0.08726646259971647F);
-//		bipedLeftLeg.addChild(LeftFrontL);
-//
-//		CenterBackL = new ModelRenderer(this, "Center Back Left");
-//		CenterBackL.setTextureOffset(29, 43);
-//		CenterBackL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		CenterBackL.addBox(-2.9F, -0.2F, 0.5F, 2, 11, 2, 0.0F);
-//		setRotateAngle(CenterBackL, 0.08726646259971647F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(CenterBackL);
-//
-//		CenterBackR = new ModelRenderer(this, "Center Back Right");
-//		CenterBackR.setTextureOffset(29, 43);
-//		CenterBackR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		CenterBackR.addBox(0.9F, -0.2F, 0.5F, 2, 11, 2, 0.0F);
-//		setRotateAngle(CenterBackR, 0.08726646259971647F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(CenterBackR);
-//
-//		SecBeltL.isHidden = true;
-//		SecBeltR.isHidden = true;
-//		CenterBackL.isHidden = true;
-//		CenterBackR.isHidden = true;
-//		CenterFrontL.isHidden = true;
-//		CenterFrontR.isHidden = true;
-//		LeftBackL.isHidden = true;
-//		LeftFrontL.isHidden = true;
-//		RightBackL.isHidden = true;
-//		RightFrontL.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;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java
deleted file mode 100644
index 5276f2e..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java
+++ /dev/null
@@ -1,235 +0,0 @@
-//package lance5057.tDefense.armor.renderers.heavy;
-//
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import net.minecraft.client.model.ModelRenderer;
-//
-///**
-// * TinkerHelm - Either Mojang or a mod author
-// * Created using Tabula 4.1.1
-// */
-//public class ModelTinkersHelm extends ArmorRenderer
-//{
-//	public ModelRenderer	Visor;
-//	public ModelRenderer	Helm2;
-//	public ModelRenderer	WingR;
-//	public ModelRenderer	WingL;
-//	public ModelRenderer	Helm;
-//	public ModelRenderer	Trim;
-//	public ModelRenderer	HornR;
-//	public ModelRenderer	HornL;
-//	public ModelRenderer	HornTipR;
-//	public ModelRenderer	HornTipL;
-//	public ModelRenderer	FeatherRod;
-//	public ModelRenderer	Feathers;
-//	public ModelRenderer	FeatherBase;
-//	public ModelRenderer	HornR_1;
-//	public ModelRenderer	HornL_1;
-//	public ModelRenderer	HornTipR_1;
-//	public ModelRenderer	HornTipL_1;
-//	public ModelRenderer	HornR_2;
-//	public ModelRenderer	HornL_2;
-//	public ModelRenderer	HornTipR_2;
-//	public ModelRenderer	HornTipL_2;
-//	public ModelRenderer	SpikeBase;
-//	public ModelRenderer	Spike2;
-//	public ModelRenderer	Spike1;
-//
-//	public ModelTinkersHelm()
-//	{
-//		super(0.1f, 0, 128, 64);
-//
-//		textureWidth = 128;
-//		textureHeight = 64;
-//
-//		HornR = new ModelRenderer(this, "Horn Right");
-//		HornR.setTextureOffset(26, 32);
-//		HornR.setRotationPoint(0.0F, -2.0F, 0.0F);
-//		HornR.addBox(-1.0F, -10.0F, -1.0F, 2, 5, 2, 0.25F);
-//		setRotateAngle(HornR, 0.0F, 0.0F, 0.7853981633974483F);
-//		bipedHead.addChild(HornR);
-//
-//		HornTipR = new ModelRenderer(this, "Horn Tip Right");
-//		HornTipR.setTextureOffset(26, 32);
-//		HornTipR.setRotationPoint(0.0F, -10.0F, 0.0F);
-//		HornTipR.addBox(-0.8F, -1.0F, -1.0F, 2, 6, 2, 0.0F);
-//		setRotateAngle(HornTipR, 0.0F, 0.0F, 2.007128639793479F);
-//
-//		HornR_1 = new ModelRenderer(this, "Horn Right 2");
-//		HornR_1.setTextureOffset(26, 32);
-//		HornR_1.setRotationPoint(2.25F, -6.0F, 2.0F);
-//		HornR_1.addBox(-1.0F, -10.0F, -1.0F, 2, 5, 2, 0.25F);
-//		setRotateAngle(HornR_1, 1.3962634015954636F, 0.2617993877991494F, 1.5707963267948966F);
-//		bipedHead.addChild(HornR_1);
-//
-//		HornTipR_1 = new ModelRenderer(this, "Horn Tip Right 2");
-//		HornTipR_1.setTextureOffset(26, 32);
-//		HornTipR_1.setRotationPoint(0.0F, -10.0F, 0.0F);
-//		HornTipR_1.addBox(-0.8F, -1.0F, -1.0F, 2, 6, 2, 0.0F);
-//		setRotateAngle(HornTipR_1, 0.0F, 0.0F, 2.007128639793479F);
-//
-//		HornR_2 = new ModelRenderer(this, "Horn Right 3");
-//		HornR_2.setTextureOffset(26, 32);
-//		HornR_2.setRotationPoint(1.75F, -3.0F, 4.0F);
-//		HornR_2.addBox(-1.0F, -10.0F, -1.0F, 2, 5, 2, 0.25F);
-//		setRotateAngle(HornR_2, 1.3962634015954636F, -0.2617993877991494F, 1.5707963267948966F);
-//		bipedHead.addChild(HornR_2);
-//
-//		HornTipR_2 = new ModelRenderer(this, "Horn Tip Right 3");
-//		HornTipR_2.setTextureOffset(26, 32);
-//		HornTipR_2.setRotationPoint(0.0F, -10.0F, 0.0F);
-//		HornTipR_2.addBox(-0.8F, -1.0F, -1.0F, 2, 6, 2, 0.0F);
-//		setRotateAngle(HornTipR_2, 0.0F, 0.0F, 2.007128639793479F);
-//
-//		HornL = new ModelRenderer(this, "Horn Left");
-//		HornL.setTextureOffset(26, 32);
-//		HornL.setRotationPoint(0.0F, -2.0F, 0.0F);
-//		HornL.addBox(-1.0F, -10.0F, -1.0F, 2, 5, 2, 0.25F);
-//		setRotateAngle(HornL, 0.0F, 0.0F, -0.7853981633974483F);
-//		bipedHead.addChild(HornL);
-//
-//		HornTipL = new ModelRenderer(this, "Horn Tip Left");
-//		HornTipL.setTextureOffset(26, 32);
-//		HornTipL.setRotationPoint(0.0F, -10.0F, 0.0F);
-//		HornTipL.addBox(-1.2F, -1.0F, -1.0F, 2, 6, 2, 0.0F);
-//		setRotateAngle(HornTipL, 0.0F, 0.0F, -2.007128639793479F);
-//
-//		HornL_1 = new ModelRenderer(this, "Horn Left 2");
-//		HornL_1.setTextureOffset(26, 32);
-//		HornL_1.setRotationPoint(-2.25F, -6.0F, 2.0F);
-//		HornL_1.addBox(-1.0F, -10.0F, -1.0F, 2, 5, 2, 0.25F);
-//		setRotateAngle(HornL_1, 1.3962634015954636F, -0.2617993877991494F, -1.5707963267948966F);
-//		bipedHead.addChild(HornL_1);
-//
-//		HornTipL_1 = new ModelRenderer(this, "Horn Tip Left 2");
-//		HornTipL_1.setTextureOffset(26, 32);
-//		HornTipL_1.setRotationPoint(0.0F, -10.0F, 0.0F);
-//		HornTipL_1.addBox(-1.2F, -1.0F, -1.0F, 2, 6, 2, 0.0F);
-//		setRotateAngle(HornTipL_1, 0.0F, 0.0F, -2.007128639793479F);
-//
-//		HornL_2 = new ModelRenderer(this, "Horn Left 3");
-//		HornL_2.setTextureOffset(26, 32);
-//		HornL_2.setRotationPoint(-1.75F, -3.0F, 4.0F);
-//		HornL_2.addBox(-1.0F, -10.0F, -1.0F, 2, 5, 2, 0.25F);
-//		setRotateAngle(HornL_2, 1.3962634015954636F, 0.2617993877991494F, -1.5707963267948966F);
-//		bipedHead.addChild(HornL_2);
-//
-//		HornTipL_2 = new ModelRenderer(this, "Horn Tip Left 3");
-//		HornTipL_2.setTextureOffset(26, 32);
-//		HornTipL_2.setRotationPoint(0.0F, -10.0F, 0.0F);
-//		HornTipL_2.addBox(-1.2F, -1.0F, -1.0F, 2, 6, 2, 0.0F);
-//		setRotateAngle(HornTipL_2, 0.0F, 0.0F, -2.007128639793479F);
-//
-//		FeatherBase = new ModelRenderer(this, "Feather Base");
-//		FeatherBase.setTextureOffset(64, 13);
-//		FeatherBase.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		FeatherBase.addBox(-2.0F, -10.0F, -5.3F, 4, 1, 9, 0.0F);
-//		setRotateAngle(FeatherBase, -0.08726646259971647F, 0.0F, 0.0F);
-//		bipedHead.addChild(FeatherBase);
-//
-//		WingL = new ModelRenderer(this, "Wing Left");
-//		WingL.setTextureOffset(0, 44);
-//		WingL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		WingL.addBox(5.7F, -11.0F, -3.5F, 0, 12, 8, 0.0F);
-//		setRotateAngle(WingL, 0.0F, 0.2617993877991494F, 0.0F);
-//		bipedHead.addChild(WingL);
-//
-//		Trim = new ModelRenderer(this, "Trim");
-//		Trim.setTextureOffset(64, 23);
-//		Trim.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Trim.addBox(-1.0F, -8.3F, -4.0F, 2, 9, 8, 0.7F);
-//		bipedHead.addChild(Trim);
-//
-//		Visor = new ModelRenderer(this, "Visor");
-//		Visor.setTextureOffset(0, 32);
-//		Visor.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Visor.addBox(-4.5F, -9.5F, -4.7F, 9, 12, 8, 0.1F);
-//		bipedHead.addChild(Visor);
-//
-//		Feathers = new ModelRenderer(this, "Feathers");
-//		Feathers.setTextureOffset(64, 0);
-//		Feathers.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Feathers.addBox(-2.0F, -12.7F, -6.1F, 4, 4, 9, -0.3F);
-//		setRotateAngle(Feathers, -0.17453292519943295F, 0.0F, 0.0F);
-//		bipedHead.addChild(Feathers);
-//
-//		FeatherRod = new ModelRenderer(this, "Feather Rod");
-//		FeatherRod.setTextureOffset(0, 32);
-//		FeatherRod.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		FeatherRod.addBox(-1.0F, -9.3F, -1.2F, 2, 1, 2, 0.2F);
-//		bipedHead.addChild(FeatherRod);
-//
-//		Helm2 = new ModelRenderer(this, "Heavy Visor");
-//		Helm2.setTextureOffset(34, 32);
-//		Helm2.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Helm2.addBox(-4.0F, -9.0F, -4.0F, 8, 10, 8, 0.6F);
-//		bipedHead.addChild(Helm2);
-//
-//		Spike1 = new ModelRenderer(this, "Spike");
-//		Spike1.setTextureOffset(16, 52);
-//		Spike1.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Spike1.addBox(-2.5F, -14.0F, 0.0F, 5, 5, 0, 0.0F);
-//		bipedHead.addChild(Spike1);
-//
-//		SpikeBase = new ModelRenderer(this, "Spike Base");
-//		SpikeBase.setTextureOffset(66, 40);
-//		SpikeBase.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		SpikeBase.addBox(-2.0F, -8.6F, -2.0F, 4, 1, 4, 0.5F);
-//		bipedHead.addChild(SpikeBase);
-//
-//		Spike2 = new ModelRenderer(this, "Spike");
-//		Spike2.setTextureOffset(16, 47);
-//		Spike2.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Spike2.addBox(0.0F, -14.0F, -2.5F, 0, 5, 5, 0.0F);
-//		bipedHead.addChild(Spike2);
-//
-//		Helm = new ModelRenderer(this, "Helm");
-//		Helm.setTextureOffset(64, 47);
-//		Helm.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		Helm.addBox(-4.0F, -8.0F, -4.0F, 8, 9, 8, 0.5F);
-//		bipedHead.addChild(Helm);
-//
-//		WingR = new ModelRenderer(this, "Wing Right");
-//		WingR.setTextureOffset(0, 44);
-//		WingR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		WingR.addBox(-5.7F, -11.0F, -3.5F, 0, 12, 8, 0.0F);
-//		setRotateAngle(WingR, 0.0F, -0.2617993877991494F, 0.0F);
-//		bipedHead.addChild(WingR);
-//
-//		HornR.addChild(HornTipR);
-//		HornL.addChild(HornTipL);
-//
-//		HornL_1.addChild(HornTipL_1);
-//		HornR_1.addChild(HornTipR_1);
-//
-//		HornL_2.addChild(HornTipL_2);
-//		HornR_2.addChild(HornTipR_2);
-//
-//		HornL.isHidden = true;
-//		HornR.isHidden = true;
-//		HornL_1.isHidden = true;
-//		HornL_2.isHidden = true;
-//		HornR_1.isHidden = true;
-//		HornR_2.isHidden = true;
-//		FeatherBase.isHidden = true;
-//		FeatherRod.isHidden = true;
-//		Feathers.isHidden = true;
-//		Spike1.isHidden = true;
-//		Spike2.isHidden = true;
-//		SpikeBase.isHidden = true;
-//		WingL.isHidden = true;
-//		WingR.isHidden = true;
-//		Helm2.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;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java
deleted file mode 100644
index 702e7d1..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java
+++ /dev/null
@@ -1,188 +0,0 @@
-//package lance5057.tDefense.armor.renderers.heavy;
-//
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import net.minecraft.client.model.ModelRenderer;
-//
-///**
-// * TinkersSabatons - Either Mojang or a mod author
-// * Created using Tabula 4.1.1
-// */
-//public class ModelTinkersSabatons extends ArmorRenderer
-//{
-//	public ModelRenderer	BootL;
-//	public ModelRenderer	FlairBackR;
-//	public ModelRenderer	ShinGuardL;
-//	public ModelRenderer	KneeGuardCapL;
-//	public ModelRenderer	LegBackL;
-//	public ModelRenderer	BootR;
-//	public ModelRenderer	ShinGuardR;
-//	public ModelRenderer	BootCapR;
-//	public ModelRenderer	BootCapL;
-//	public ModelRenderer	LegBackR;
-//	public ModelRenderer	FlairL;
-//	public ModelRenderer	KneeGuardCapR;
-//	public ModelRenderer	BootTipR;
-//	public ModelRenderer	BootTipL;
-//	public ModelRenderer	KneeGuardR;
-//	public ModelRenderer	KneeGuardL;
-//	public ModelRenderer	FlairR;
-//	public ModelRenderer	BackFlairL;
-//
-//	public ModelTinkersSabatons()
-//	{
-//		super(0.1f, 0, 64, 64);
-//
-//		textureWidth = 64;
-//		textureHeight = 64;
-//
-//		BootR = new ModelRenderer(this, "Boot Right");
-//		BootR.setTextureOffset(0, 56);
-//		BootR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BootR.addBox(-2.0F, 9.0F, -3.0F, 4, 3, 5, 0.2F);
-//		bipedRightLeg.addChild(BootR);
-//
-//		BootL = new ModelRenderer(this, "Boot Left");
-//		BootL.setTextureOffset(0, 56);
-//		BootL.mirror = true;
-//		BootL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BootL.addBox(-2.0F, 9.0F, -3.0F, 4, 3, 5, 0.2F);
-//		bipedLeftLeg.addChild(BootL);
-//
-//		KneeGuardR = new ModelRenderer(this, "Knee Guard Right");
-//		KneeGuardR.setTextureOffset(0, 32);
-//		KneeGuardR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		KneeGuardR.addBox(-2.0F, 3.1F, -2.5F, 4, 3, 4, 0.3F);
-//		bipedRightLeg.addChild(KneeGuardR);
-//
-//		KneeGuardL = new ModelRenderer(this, "Knee Guard Left");
-//		KneeGuardL.setTextureOffset(0, 32);
-//		KneeGuardL.mirror = true;
-//		KneeGuardL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		KneeGuardL.addBox(-2.0F, 3.1F, -2.5F, 4, 3, 4, 0.3F);
-//		bipedLeftLeg.addChild(KneeGuardL);
-//
-//		ShinGuardR = new ModelRenderer(this, "Shin Guard Right");
-//		ShinGuardR.setTextureOffset(0, 48);
-//		ShinGuardR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ShinGuardR.addBox(-2.0F, 4.0F, -2.5F, 4, 5, 3, 0.11F);
-//		setRotateAngle(ShinGuardR, 0.05759586531581287F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(ShinGuardR);
-//
-//		ShinGuardL = new ModelRenderer(this, "Shin Guard Left");
-//		ShinGuardL.setTextureOffset(0, 48);
-//		ShinGuardL.mirror = true;
-//		ShinGuardL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		ShinGuardL.addBox(-2.0F, 4.0F, -2.5F, 4, 5, 3, 0.11F);
-//		setRotateAngle(ShinGuardL, 0.05759586531581287F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(ShinGuardL);
-//
-//		LegBackL = new ModelRenderer(this, "Leg Back Left");
-//		LegBackL.setTextureOffset(0, 40);
-//		LegBackL.mirror = true;
-//		LegBackL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		LegBackL.addBox(-2.0F, 3.0F, 0.6F, 4, 6, 2, 0.1F);
-//		setRotateAngle(LegBackL, -0.05759586531581287F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(LegBackL);
-//
-//		LegBackR = new ModelRenderer(this, "Leg Back Right");
-//		LegBackR.setTextureOffset(0, 40);
-//		LegBackR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		LegBackR.addBox(-2.0F, 3.0F, 0.6F, 4, 6, 2, 0.1F);
-//		setRotateAngle(LegBackR, -0.05759586531581287F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(LegBackR);
-//
-//		FlairR = new ModelRenderer(this, "Flair Right");
-//		FlairR.setTextureOffset(18, 53);
-//		FlairR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		FlairR.addBox(0.9F, 0.2F, -2.5F, 5, 11, 0, 0.0F);
-//		setRotateAngle(FlairR, 0.0F, -0.6108652381980153F, 0.0F);
-//		bipedLeftLeg.addChild(FlairR);
-//
-//		FlairL = new ModelRenderer(this, "Flair Left");
-//		FlairL.setTextureOffset(18, 53);
-//		FlairL.mirror = true;
-//		FlairL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		FlairL.addBox(-5.9F, 0.2F, -2.5F, 5, 11, 0, 0.0F);
-//		setRotateAngle(FlairL, 0.0F, 0.6108652381980153F, 0.0F);
-//		bipedRightLeg.addChild(FlairL);
-//
-//		FlairBackR = new ModelRenderer(this, "Flair Back Right");
-//		FlairBackR.setTextureOffset(28, 47);
-//		FlairBackR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		FlairBackR.addBox(0.0F, 0.0F, 2.0F, 0, 12, 5, 0.0F);
-//		bipedRightLeg.addChild(FlairBackR);
-//
-//		BackFlairL = new ModelRenderer(this, "Flair Back Left");
-//		BackFlairL.setTextureOffset(28, 47);
-//		BackFlairL.mirror = true;
-//		BackFlairL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BackFlairL.addBox(0.0F, 0.0F, 2.0F, 0, 12, 5, 0.0F);
-//		bipedLeftLeg.addChild(BackFlairL);
-//
-//		KneeGuardCapR = new ModelRenderer(this, "Knee Guard Cap Right");
-//		KneeGuardCapR.setTextureOffset(16, 36);
-//		KneeGuardCapR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		KneeGuardCapR.addBox(-1.5F, 2.4F, -3.8F, 3, 2, 1, 0.2F);
-//		setRotateAngle(KneeGuardCapR, 0.17453292519943295F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(KneeGuardCapR);
-//
-//		KneeGuardCapL = new ModelRenderer(this, "Knee Guard Cap Left");
-//		KneeGuardCapL.setTextureOffset(16, 36);
-//		KneeGuardCapL.mirror = true;
-//		KneeGuardCapL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		KneeGuardCapL.addBox(-1.5F, 2.4F, -3.8F, 3, 2, 1, 0.2F);
-//		setRotateAngle(KneeGuardCapL, 0.17453292519943295F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(KneeGuardCapL);
-//
-//		BootTipR = new ModelRenderer(this, "Boot Tip Right");
-//		BootTipR.setTextureOffset(22, 32);
-//		BootTipR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BootTipR.addBox(-1.4F, 10.0F, -2.5F, 3, 2, 2, -0.1F);
-//		setRotateAngle(BootTipR, -0.3490658503988659F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(BootTipR);
-//
-//		BootCapR = new ModelRenderer(this, "Boot Cap Right");
-//		BootCapR.setTextureOffset(12, 32);
-//		BootCapR.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BootCapR.addBox(-1.5F, 10.0F, -2.5F, 3, 2, 2, 0.3F);
-//		setRotateAngle(BootCapR, -0.17453292519943295F, 0.0F, 0.0F);
-//		bipedRightLeg.addChild(BootCapR);
-//
-//		BootTipL = new ModelRenderer(this, "Boot Tip Left");
-//		BootTipL.setTextureOffset(22, 32);
-//		BootTipL.mirror = true;
-//		BootTipL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BootTipL.addBox(-1.5F, 10.0F, -2.6F, 3, 2, 2, -0.1F);
-//		setRotateAngle(BootTipL, -0.3490658503988659F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(BootTipL);
-//
-//		BootCapL = new ModelRenderer(this, "Boot Cap Left");
-//		BootCapL.setTextureOffset(12, 32);
-//		BootCapL.mirror = true;
-//		BootCapL.setRotationPoint(0.0F, 0.0F, 0.0F);
-//		BootCapL.addBox(-1.5F, 10.0F, -2.5F, 3, 2, 2, 0.3F);
-//		setRotateAngle(BootCapL, -0.17453292519943295F, 0.0F, 0.0F);
-//		bipedLeftLeg.addChild(BootCapL);
-//
-//		BootCapL.isHidden = true;
-//		BootCapR.isHidden = true;
-//		BootTipL.isHidden = true;
-//		BootTipR.isHidden = true;
-//		FlairBackR.isHidden = true;
-//		BackFlairL.isHidden = true;
-//		FlairL.isHidden = true;
-//		FlairR.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;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
deleted file mode 100644
index bc5dae3..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
+++ /dev/null
@@ -1,111 +0,0 @@
-//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;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
deleted file mode 100644
index 7381d4e..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
+++ /dev/null
@@ -1,138 +0,0 @@
-//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;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
deleted file mode 100644
index d0af22d..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
+++ /dev/null
@@ -1,100 +0,0 @@
-//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;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java
deleted file mode 100644
index d30b478..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java
+++ /dev/null
@@ -1,198 +0,0 @@
-//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;
-//	}
-//}